Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Jun 17, 2019
1 parent 8d3de9b commit 4c529b2
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/favicon.ico><title>vxe-table 表格</title><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=preload as=style><link href=/vxe-table/static/css/index.c9c9b6b1.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.7484647a.js rel=preload as=script><link href=/vxe-table/static/js/index.0ff5b428.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.c9c9b6b1.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.7484647a.js></script><script src=/vxe-table/static/js/index.0ff5b428.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/favicon.ico><title>vxe-table 表格</title><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=preload as=style><link href=/vxe-table/static/css/index.c9c9b6b1.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.7484647a.js rel=preload as=script><link href=/vxe-table/static/js/index.b34a73ba.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.c9c9b6b1.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.7484647a.js></script><script src=/vxe-table/static/js/index.b34a73ba.js></script></body></html>
1 change: 0 additions & 1 deletion docs/static/js/index.0ff5b428.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/static/js/index.b34a73ba.js

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions examples/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -764,15 +764,6 @@ export default {
}
}
},
{
label: 'app.aside.nav.vxeTableMessage',
locat: {
name: 'TableAPI',
params: {
name: 'table-message'
}
}
},
{
label: 'app.aside.nav.vxeGrid',
locat: {
Expand Down Expand Up @@ -844,6 +835,15 @@ export default {
name: 'button'
}
}
},
{
label: 'app.aside.nav.vxeMessageBox',
locat: {
name: 'TableAPI',
params: {
name: 'message-box'
}
}
// },
// {
// label: 'app.aside.nav.vxeTooltip',
Expand Down
4 changes: 2 additions & 2 deletions examples/i18n/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ module.exports = {
api: 'API',
vxeTable: 'vxe-table',
vxeTableColumn: 'vxe-table-column',
vxeTableMessage: 'vxe-table-message',
vxeGrid: 'vxe-grid',
vxeExcel: 'vxe-excel',
vxeToolbar: 'vxe-toolbar',
Expand All @@ -121,7 +120,8 @@ module.exports = {
vxeCheckbox: 'vxe-checkbox',
vxeInput: 'vxe-input',
vxeButton: 'vxe-button',
vxeTooltip: 'vxe-tooltip'
vxeTooltip: 'vxe-tooltip',
vxeMessageBox: 'vxe-message-box'
}
},
body: {
Expand Down
4 changes: 2 additions & 2 deletions examples/i18n/lang/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ module.exports = {
vxeCheckbox: 'vxe-checkbox',
vxeInput: 'vxe-input',
vxeButton: 'vxe-button',
vxeTableMessage: 'vxe-table-message',
vxeTooltip: 'vxe-tooltip'
vxeTooltip: 'vxe-tooltip',
vxeMessageBox: 'vxe-message-box'
}
},
body: {
Expand Down
8 changes: 4 additions & 4 deletions examples/views/table/api/API.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import XEUtils from 'xe-utils'
import tableAPI from '../../../api/table'
import tableColumnAPI from '../../../api/column'
import tableMessageAPI from '../../../api/message'
import toolbarAPI from '../../../api/toolbar'
import gridAPI from '../../../api/grid'
import excelAPI from '../../../api/excel'
Expand All @@ -57,6 +56,7 @@ import checkboxAPI from '../../../api/checkbox'
import inputAPI from '../../../api/input'
import buttonAPI from '../../../api/button'
import tooltipAPI from '../../../api/tooltip'
import messageBoxAPI from '../../../api/message'
export default {
data () {
Expand All @@ -75,9 +75,6 @@ export default {
case 'table-column':
apis = tableColumnAPI
break
case 'table-message':
apis = tableMessageAPI
break
case 'toolbar':
apis = toolbarAPI
break
Expand Down Expand Up @@ -105,6 +102,9 @@ export default {
case 'tooltip':
apis = tooltipAPI
break
case 'message-box':
apis = messageBoxAPI
break
}
// 生成唯一 id
let index = 1
Expand Down
2 changes: 1 addition & 1 deletion lib/index.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -13461,7 +13461,7 @@ var Button = src_button;


/* harmony default export */ var src_message = ({
name: 'VxeTableMessage',
name: 'VxeMessageBox',
props: {
value: Boolean,
type: String,
Expand Down
2 changes: 1 addition & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13470,7 +13470,7 @@ var Button = src_button;


/* harmony default export */ var src_message = ({
name: 'VxeTableMessage',
name: 'VxeMessageBox',
props: {
value: Boolean,
type: String,
Expand Down
2 changes: 1 addition & 1 deletion lib/index.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/index.umd.js
Original file line number Diff line number Diff line change
Expand Up @@ -13470,7 +13470,7 @@ var Button = src_button;


/* harmony default export */ var src_message = ({
name: 'VxeTableMessage',
name: 'VxeMessageBox',
props: {
value: Boolean,
type: String,
Expand Down
2 changes: 1 addition & 1 deletion lib/index.umd.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/message/src/message.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

var _default2 = {
name: 'VxeTableMessage',
name: 'VxeMessageBox',
props: {
value: Boolean,
type: String,
Expand Down
2 changes: 1 addition & 1 deletion lib/message/src/message.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "1.2.1",
"version": "1.2.2",
"description": "A complete Vue Table, support most of the Table of all requirements, and perfect compatibility with any component library.",
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
4 changes: 2 additions & 2 deletions packages/message/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import VxeTableMessage from './src/message'
import VxeMessageBox from './src/message'

var AlertController = null

Expand Down Expand Up @@ -35,7 +35,7 @@ export function Message (options) {
})

Message.install = function (Vue) {
AlertController = Vue.extend(VxeTableMessage)
AlertController = Vue.extend(VxeMessageBox)
Vue.prototype.$XMsg = Message
}

Expand Down
2 changes: 1 addition & 1 deletion packages/message/src/message.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import GlobalConfig from '../../conf'

export default {
name: 'VxeTableMessage',
name: 'VxeMessageBox',
props: {
value: Boolean,
type: String,
Expand Down

0 comments on commit 4c529b2

Please sign in to comment.