update

x-extends · Jun 12, 2019 · 10e2baa · 10e2baa
1 parent be27337
commit 10e2baa
Show file tree

Hide file tree

Showing 25 changed files with 1,633 additions and 284 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -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.b3635b72.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.9d232144.js rel=preload as=script><link href=/vxe-table/static/js/index.8bfbdedd.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.b3635b72.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.9d232144.js></script><script src=/vxe-table/static/js/index.8bfbdedd.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.b3635b72.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.9d232144.js rel=preload as=script><link href=/vxe-table/static/js/index.fd33727a.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.b3635b72.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.9d232144.js></script><script src=/vxe-table/static/js/index.fd33727a.js></script></body></html>
diff --git a/docs/static/js/index.8bfbdedd.js b/docs/static/js/index.8bfbdedd.js
diff --git a/docs/static/js/index.fd33727a.js b/docs/static/js/index.fd33727a.js
diff --git a/examples/api/alert.js b/examples/api/alert.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/button.js b/examples/api/button.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/checkbox.js b/examples/api/checkbox.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/excel.js b/examples/api/excel.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/grid.js b/examples/api/grid.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/input.js b/examples/api/input.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/pager.js b/examples/api/pager.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/radio.js b/examples/api/radio.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/table-column.js b/examples/api/table-column.js
@@ -1,14 +1,14 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',
     list: [
       {
         name: 'type',
-        desc: '列的类型',
+        descKey: 'app.api.tableColumn.desc.type',
         type: 'String',
         enum: 'index（序号）,selection（多选）,radio（单选）,expand（展开行）',
         defVal: '',

diff --git a/examples/api/table.js b/examples/api/table.js
@@ -111,78 +111,78 @@ const contextMenuApi = [
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',
     list: [
       {
         name: 'data',
-        desc: '显示的数据',
+        descKey: 'app.api.table.desc.data',
         type: 'Array',
         enum: '',
         defVal: '',
         list: []
       },
       {
         name: 'customs',
-        desc: '初始化绑定显示/隐藏列',
+        descKey: 'app.api.table.desc.customs',
         type: 'Array',
         enum: '',
         defVal: '',
         list: []
       },
       {
         name: 'height',
-        desc: '表格的高度',
+        descKey: 'app.api.table.desc.height',
         type: 'Number,String',
         enum: 'auto（铺满父容器高度），数值px',
         defVal: '',
         list: []
       },
       {
         name: 'max-height',
-        desc: '表格的最大高度',
+        descKey: 'app.api.table.desc.maxHeight',
         type: 'Number,String',
         enum: '数值px',
         defVal: '',
         list: []
       },
       {
         name: 'auto-resize',
-        desc: '是否自动监听父容器响应式调整表格宽高（如果需要自动跟随父容器的高度变化时可能会用到）',
+        descKey: 'app.api.table.desc.autoResize',
         type: 'Boolean',
         enum: '',
         defVal: 'false',
         list: []
       },
       {
         name: 'resizable',
-        desc: '所有的列是否允许拖动列宽调整大小',
+        descKey: 'app.api.table.desc.resizable',
         type: 'Boolean',
         enum: '',
         defVal: 'false',
         list: []
       },
       {
         name: 'stripe',
-        desc: '是否带有斑马纹',
+        descKey: 'app.api.table.desc.stripe',
         type: 'Boolean',
         enum: '',
         defVal: 'false',
         list: []
       },
       {
         name: 'border',
-        desc: '是否带有纵向边框',
+        descKey: 'app.api.table.desc.border',
         type: 'Boolean',
         enum: '',
         defVal: 'false',
         list: []
       },
       {
         name: 'size',
-        desc: '表格的尺寸',
+        descKey: 'app.api.table.desc.size',
         type: 'String',
         enum: 'medium,small,mini',
         defVal: '',

diff --git a/examples/api/toolbar.js b/examples/api/toolbar.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/api/tooltip.js b/examples/api/tooltip.js
@@ -1,7 +1,7 @@
 const apis = [
   {
     name: 'Props',
-    desc: '参数',
+    descKey: 'app.api.title.props',
     type: '',
     enum: '',
     defVal: '',

diff --git a/examples/i18n/lang/en.js b/examples/i18n/lang/en.js
@@ -135,7 +135,26 @@ module.exports = {
         desc: 'Description',
         type: 'Type / Return type',
         enum: 'Accepted Values',
-        defVal: 'Default / Arguments'
+        defVal: 'Default / Arguments',
+        props: 'Table Attributes'
+      },
+      table: {
+        desc: {
+          data: 'Table data',
+          customs: 'Initialize the binding to show/hide columns;You can modify the display or hide columns by using the visible property',
+          height: 'Table height, supports adaptive or fixed width and height',
+          maxHeight: 'Max height of the table',
+          autoResize: 'Whether to automatically listen to the parent container to adjust the table width and height in a responsive manner (this may be used if you need to automatically follow the parent container\'s height)',
+          resizable: 'Whether drag column width resizing is allowed for all columns',
+          stripe: 'Whether with zebra stripes',
+          border: 'Whether there is a vertical border',
+          size: 'Table size'
+        }
+      },
+      tableColumn: {
+        desc: {
+          type: 'The type of the column'
+        }
       }
     }
   }

diff --git a/examples/i18n/lang/zh-CN.js b/examples/i18n/lang/zh-CN.js
@@ -135,7 +135,26 @@ module.exports = {
         desc: '说明',
         type: '类型 / 返回类型',
         enum: '可选值',
-        defVal: '默认值 / 参数'
+        defVal: '默认值 / 参数',
+        props: '参数'
+      },
+      table: {
+        desc: {
+          data: '显示的数据',
+          customs: '初始化绑定显示/隐藏列；可以通过 visible 动态修改显示或隐藏',
+          height: '表格的高度；支持自适应或者固定宽高',
+          maxHeight: '表格的最大高度',
+          autoResize: '是否自动监听父容器响应式调整表格宽高（如果需要自动跟随父容器的高度变化时可能会用到）',
+          resizable: '所有的列是否允许拖动列宽调整大小',
+          stripe: '是否带有斑马纹',
+          border: '是否带有纵向边框',
+          size: '表格的尺寸'
+        }
+      },
+      tableColumn: {
+        desc: {
+          type: '列的类型'
+        }
       }
     }
   }

diff --git a/examples/mock/api/user/list.json b/examples/mock/api/user/list.json
@@ -4,6 +4,7 @@
     "name": "{{ random.repeat(['name', 'test'],1) }}_{{ $index }}",
     "nickname": "{{ random.repeat(['昵称', '名字'],1) }}_{{ $index }}",
     "password": "{{ random.repeat('abcdefgABCDEFG',6,12) }}",
+    "checked": false,
     "sex|random(1)": [null, "0", "1"],
     "role|random(1)": ["前端", "后端", "测试", "设计", "项目经理"],
     "region|random(1)": [[1, 1, 5], [19, 199, 1773], [9, 73, 719]],

diff --git a/examples/views/table/api/API.vue b/examples/views/table/api/API.vue
@@ -62,33 +62,11 @@ export default {
   data () {
     return {
       filterName: this.$route.query.filterName,
-      tableData: [],
       defaultExpandRowKeys: []
     }
   },
   computed: {
-    apiList () {
-      let filterName = XEUtils.toString(this.filterName).trim().toLowerCase()
-      if (filterName) {
-        let filterRE = new RegExp(filterName, 'gi')
-        let options = { children: 'list' }
-        let searchProps = ['name', 'desc', 'type', 'enum', 'defVal']
-        let rest = XEUtils.searchTree(this.tableData, item => searchProps.some(key => item[key].toLowerCase().indexOf(filterName) > -1), options)
-        XEUtils.eachTree(rest, item => {
-          searchProps.forEach(key => {
-            item[key] = item[key].replace(filterRE, match => `<span class="keyword-lighten">${match}</span>`)
-          })
-        }, options)
-        return rest
-      }
-      return this.tableData
-    }
-  },
-  created () {
-    this.loadAPI()
-  },
-  methods: {
-    loadAPI () {
+    tableData () {
       let apis = []
       switch (this.$route.params.name) {
         case 'table':
@@ -128,22 +106,38 @@ export default {
           apis = tooltipAPI
           break
       }
-
       // 生成唯一 id
       let index = 1
       XEUtils.eachTree(apis, item => {
         item.id = index++
+        item.desc = item.descKey ? this.$t(item.descKey) : item.desc
       }, { children: 'list' })
-
-      // 默认展开一级
-      this.defaultExpandRowKeys = apis.filter(item => item.list && item.list.length).map(item => item.id)
-      this.tableData = apis
+      return apis
+    },
+    apiList () {
+      let filterName = XEUtils.toString(this.filterName).trim().toLowerCase()
+      if (filterName) {
+        let filterRE = new RegExp(filterName, 'gi')
+        let options = { children: 'list' }
+        let searchProps = ['name', 'desc', 'type', 'enum', 'defVal']
+        let rest = XEUtils.searchTree(this.tableData, item => searchProps.some(key => item[key].toLowerCase().indexOf(filterName) > -1), options)
+        XEUtils.eachTree(rest, item => {
+          searchProps.forEach(key => {
+            item[key] = item[key].replace(filterRE, match => `<span class="keyword-lighten">${match}</span>`)
+          })
+        }, options)
+        return rest
+      }
+      return this.tableData
     }
   },
+  created () {
+    // 默认展开一级
+    this.defaultExpandRowKeys = this.tableData.filter(item => item.list && item.list.length).map(item => item.id)
+  },
   beforeRouteUpdate (to, from, next) {
     next()
     this.filterName = ''
-    this.loadAPI()
   }
 }
 </script>
diff --git a/examples/views/table/grid/FullEdit.vue b/examples/views/table/grid/FullEdit.vue
@@ -14,6 +14,7 @@
       :proxy-config="tableProxy"
       :columns="tableColumn"
       :select-config="{reserve: true}"
+      :edit-rules="validRules"
       :edit-config="{key: 'id', trigger: 'click', mode: 'row', showStatus: true}"></vxe-grid>
 
     <p class="demo-code">{{ $t('app.body.button.showCode') }}</p>
@@ -33,6 +34,15 @@ import XEUtils from 'xe-utils'
 export default {
   data () {
     return {
+      validRules: {
+        name: [
+          { required: true, message: '名称必须填写' },
+          { min: 3, max: 50, message: '名称长度在 3 到 50 个字符' }
+        ],
+        role: [
+          { required: true, message: '角色必须填写' }
+        ]
+      },
       tableProxy: {
         index: true, // 启用动态序号代理
         sort: true, // 启用排序代理
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.b3635b72.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.9d232144.js rel=preload as=script><link href=/vxe-table/static/js/index.8bfbdedd.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.b3635b72.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.9d232144.js></script><script src=/vxe-table/static/js/index.8bfbdedd.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.b3635b72.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.9d232144.js rel=preload as=script><link href=/vxe-table/static/js/index.fd33727a.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.73f3d338.css rel=stylesheet><link href=/vxe-table/static/css/index.b3635b72.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.9d232144.js></script><script src=/vxe-table/static/js/index.fd33727a.js></script></body></html>