diff --git a/src/components/ContentWrap/index.vue b/src/components/ContentWrap/index.vue new file mode 100644 index 0000000..e912453 --- /dev/null +++ b/src/components/ContentWrap/index.vue @@ -0,0 +1,60 @@ + + + + + {{ title }} + + + {{ message }} + + + + + + + + + + + + + + diff --git a/src/components/xTable/index.vue b/src/components/xTable/index.vue index a2e0501..9741e1b 100644 --- a/src/components/xTable/index.vue +++ b/src/components/xTable/index.vue @@ -1,17 +1,17 @@ - - - + + + - - - - - - + + + + + + - + @@ -24,405 +24,401 @@ - - - - - - - - - - - - - - - - - - - 大 - 正常 - 小 - - - - - - - - - + - + diff --git a/src/style/global.module.scss b/src/style/global.module.scss new file mode 100644 index 0000000..8448a92 --- /dev/null +++ b/src/style/global.module.scss @@ -0,0 +1,6 @@ +@import './variables.scss'; +// 导出变量 +:export { + namespace: $namespace; + elNamespace: $elNamespace; +} diff --git a/src/style/variables.scss b/src/style/variables.scss new file mode 100644 index 0000000..00b66f1 --- /dev/null +++ b/src/style/variables.scss @@ -0,0 +1,4 @@ +// 命名空间 +$namespace: v; +// el命名空间 +$elNamespace: el; diff --git a/src/views/system/table/index.vue b/src/views/system/table/index.vue index dff20b3..38910c9 100644 --- a/src/views/system/table/index.vue +++ b/src/views/system/table/index.vue @@ -21,8 +21,7 @@ {{ s.label }} - - + diff --git a/src/views/user/index/index.vue b/src/views/user/index/index.vue index 2ff1926..8fb9fe7 100644 --- a/src/views/user/index/index.vue +++ b/src/views/user/index/index.vue @@ -1,325 +1,279 @@ + + + + + + + + + + 搜索 + + + + - + + + + + + + + + + {{ operation.edit.label || '编辑' }} + + + {{ operation.delete.label || '删除' }} + + + + + + + + + + + - - - - - - - - - - - - - - 搜索 - - - - 重置 - - - - 新增 - - - - 导出 - - - + + }) + }, + //表格选择后回调事件 + selectionChange(selection) { + this.selection = selection; + }, + } +} + + + \ No newline at end of file diff --git a/src/x.js b/src/x.js index 744600d..e2cdcf4 100644 --- a/src/x.js +++ b/src/x.js @@ -28,6 +28,7 @@ import xQrCode from './components/xQrCode' import xPageHeader from './components/xPageHeader' import xSelect from './components/xSelect' import xWaterMark from './components/xWaterMark' +import ContentWrap from './components/ContentWrap' import store from '@/store' import { Flexbox, @@ -92,6 +93,8 @@ export default { for (let icon in xIcons) { app.component(`xIcon${icon}`, xIcons[icon]) } + + app.component('ContentWrap', ContentWrap); //关闭async-validator全局控制台警告 window.ASYNC_VALIDATOR_NO_WARNING = 1 //全局代码错误捕捉