vxe-table 3.8.2 → 3.8.3-beta.0

package/packages/locale/lang/zh-CN.js

@@ -8,7 +8,7 @@ export default {
       text: '加载中...'
     },
     error: {
-      groupFixed: '如果使用分组表头，固定列必须按组设置',
+      groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
@@ -61,7 +61,7 @@ export default {
       customAll: '全部',
       customConfirm: '确认',
       customRestore: '重置',
-      maxFixedCol: '最大固定列的数量不能超过 {0} 个'
+      maxFixedCol: '最大冻结列的数量不能超过 {0} 个'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',
@@ -96,7 +96,7 @@ export default {
       endPageTitle: '末页'
     },
     alert: {
-      title: '消息提示'
+      title: '系统提示'
     },
     button: {
       confirm: '确认',
@@ -109,7 +109,18 @@ export default {
       cstmTitle: '列设置',
       cstmRestore: '恢复默认',
       cstmCancel: '取消',
-      cstmConfirm: '确定'
+      cstmConfirm: '确定',
+      cstmConfirmRestore: '请确认是否恢复成默认列配置？',
+      cstmDragTarget: '移动目标：{0}',
+      setting: {
+        colSort: '排序',
+        colTitle: '标题',
+        colVisible: '是否显示',
+        colFixed: '冻结列',
+        fixedLeft: '左侧',
+        fixedUnset: '不设置',
+        fixedRight: '右侧'
+      }
     },
     import: {
       modes: {
@@ -188,9 +199,9 @@ export default {
       customAll: '全部',
       customConfirm: '确认',
       customRestore: '重置',
-      fixedLeft: '固定在左侧',
-      fixedRight: '固定在右侧',
-      cancelfixed: '取消固定'
+      fixedLeft: '冻结在左侧',
+      fixedRight: '冻结在右侧',
+      cancelfixed: '取消冻结列'
     },
     input: {
       date: {

package/packages/locale/lang/zh-TC.js

@@ -8,7 +8,7 @@ export default {
       text: '加載中...'
     },
     error: {
-      groupFixed: '如果使用分組表頭，固定列必須按組設定',
+      groupFixed: '如果使用分組表頭，冻结列必須按組設定',
       groupMouseRange: '分组表頭與 "{0}" 不能同時使用，這可能會出現錯誤',
       groupTag: '分組列頭應該使用 "{0}" 而不是 "{1}"，這可能會出現錯誤',
       scrollErrProp: '啟用虛擬滾動後不支持該參數 "{0}"',
@@ -61,7 +61,7 @@ export default {
       customAll: '全部',
       customConfirm: '確認',
       customRestore: '重置',
-      maxFixedCol: '最大固定列的數量不能超過 {0} 個'
+      maxFixedCol: '最大冻结列的數量不能超過 {0} 個'
     },
     grid: {
       selectOneRecord: '請至少選擇一條記錄！',
@@ -96,7 +96,7 @@ export default {
       endPageTitle: '末頁'
     },
     alert: {
-      title: '訊息提示'
+      title: '系統提示'
     },
     button: {
       confirm: '確認',
@@ -109,7 +109,18 @@ export default {
       cstmTitle: '列設定',
       cstmRestore: '恢復默認',
       cstmCancel: '取消',
-      cstmConfirm: '確認'
+      cstmConfirm: '確認',
+      cstmConfirmRestore: '請確認是否恢復成默認列配置？',
+      cstmDragTarget: '移動目標：{0}',
+      setting: {
+        colSort: '排序',
+        colTitle: '標題',
+        colVisible: '是否顯示',
+        colFixed: '冻结列',
+        fixedLeft: '左側',
+        fixedUnset: '不設定',
+        fixedRight: '右側'
+      }
     },
     import: {
       modes: {
@@ -188,9 +199,9 @@ export default {
       customAll: '全部',
       customConfirm: '確認',
       customRestore: '重置',
-      fixedLeft: '固定在左側',
-      fixedRight: '固定在右側',
-      cancelfixed: '取消固定'
+      fixedLeft: '冻结在左側',
+      fixedRight: '冻结在右側',
+      cancelfixed: '取消冻结列'
     },
     input: {
       date: {

package/packages/radio/src/group.js

@@ -37,6 +37,9 @@ export default {
     },
     valueField () {
       return this.propsOpts.value || 'value'
+    },
+    disabledField () {
+      return this.propsOpts.disabled || 'disabled'
     }
   },
   data () {
@@ -45,7 +48,7 @@ export default {
     }
   },
   render (h) {
-    const { $scopedSlots, options, type, valueField, labelField } = this
+    const { $scopedSlots, options, type, valueField, labelField, disabledField } = this
     const defaultSlot = $scopedSlots.default
     const btnComp = type === 'button' ? 'vxe-radio-button' : 'vxe-radio'
     return h('div', {
@@ -54,7 +57,8 @@ export default {
       return h(btnComp, {
         props: {
           label: item[valueField],
-          content: item[labelField]
+          content: item[labelField],
+          disabled: item[disabledField]
         }
       })
     }) : []))

package/packages/table/src/columnInfo.js

@@ -112,9 +112,15 @@ export class ColumnInfo {
       level: 1,
       rowSpan: 1,
       colSpan: 1,
-      order: null,
-      sortTime: 0,
-      customOrder: 0,
+
+      // 数据排序
+      order: null, // 用于记录排序类型，升序和倒序
+      sortTime: 0, // 用于多列的先后顺序
+
+      // 列排序
+      sortNumber: 0, // 用于记录自定义列顺序
+      renderSortNumber: 0, // 用于记录自定义列顺序
+
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,

package/packages/table/src/methods.js

@@ -18,7 +18,7 @@ const debounceScrollYDuration = browse.msie ? 80 : 20
 const resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH'
 const visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE'
 const fixedStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_FIXED'
-const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER'
+const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT'
 
 /**
  * 生成行的唯一主键
@@ -571,7 +571,7 @@ const Methods = {
     this.collectColumn = collectColumn
     const tableFullColumn = getColumnList(collectColumn)
     this.tableFullColumn = tableFullColumn
-    this.cacheColumnMap()
+    this.cacheColumnMap(true)
     this.restoreCustomStorage()
     this.parseColumns().then(() => {
       if (this.scrollXLoad) {
@@ -699,7 +699,7 @@ const Methods = {
    * 更新数据列的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheColumnMap () {
+  cacheColumnMap (isInit) {
     const { tableFullColumn, collectColumn, fullColumnMap, showOverflow, columnOpts, rowOpts } = this
     const fullColumnIdData = this.fullColumnIdData = {}
     const fullColumnFieldData = this.fullColumnFieldData = {}
@@ -795,6 +795,9 @@ const Methods = {
       if (fullColumnIdData[colid]) {
         errLog('vxe.error.colRepet', ['colId', colid])
       }
+      if (isInit) {
+        column.sortNumber = index
+      }
       fullColumnIdData[colid] = rest
       fullColumnMap.set(column, rest)
     }
@@ -1552,7 +1555,8 @@ const Methods = {
     const opts = Object.assign({
       visible: true,
       resizable: options === true,
-      fixed: options === true
+      fixed: options === true,
+      sort: options === true
     }, options)
     XEUtils.eachTree(collectColumn, (column) => {
       if (opts.resizable) {
@@ -1561,6 +1565,9 @@ const Methods = {
       if (opts.fixed) {
         column.fixed = column.defaultFixed
       }
+      if (opts.sort) {
+        column.renderSortNumber = column.sortNumber
+      }
       if (!checkMethod || checkMethod({ column })) {
         column.visible = column.defaultVisible
       }
@@ -1576,7 +1583,7 @@ const Methods = {
   handleCustom () {
     this.saveCustomVisible()
     this.analyColumnWidth()
-    return this.refreshColumn()
+    return this.refreshColumn(true)
   },
   /**
    * 还原自定义列操作状态
@@ -1584,12 +1591,13 @@ const Methods = {
   restoreCustomStorage () {
     const { id, collectColumn, customConfig, customOpts } = this
     const { storage } = customOpts
-    const isAllStorage = customOpts.storage === true
-    const isCustomResizable = isAllStorage || (storage && storage.resizable)
-    const isCustomVisible = isAllStorage || (storage && storage.visible)
-    const isCustomFixed = storage === true || (storage && storage.fixed)
-    const isCustomOrder = storage === true || (storage && storage.order)
-    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomOrder)) {
+    const isAllStorage = storage === true
+    const storageOpts = isAllStorage ? {} : Object.assign({}, storage || {})
+    const isCustomResizable = isAllStorage || storageOpts.resizable
+    const isCustomVisible = isAllStorage || storageOpts.visible
+    const isCustomFixed = isAllStorage || storageOpts.fixed
+    const isCustomSort = isAllStorage || storageOpts.sort
+    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       const customMap = {}
       if (!id) {
         errLog('vxe.error.reqProp', ['id'])
@@ -1619,18 +1627,18 @@ const Methods = {
         }
       }
       // 自定义顺序
-      if (isCustomOrder) {
-        const columnOrderStorage = getCustomStorageMap(orderStorageKey)[id]
-        if (columnOrderStorage) {
-          // const colOrderSeqs = columnOrderStorage.split(',')
-          // colOrderSeqs.forEach((orderConf) => {
-          //   const [colKey, order] = orderConf.split('|')
-          //   if (customMap[colKey]) {
-          //     customMap[colKey].order = order
-          //   } else {
-          //     customMap[colKey] = { order }
-          //   }
-          // })
+      if (isCustomSort) {
+        const columnSortStorage = getCustomStorageMap(sortStorageKey)[id]
+        if (columnSortStorage) {
+          const colOrderSeqs = columnSortStorage.split(',')
+          colOrderSeqs.forEach((orderConf) => {
+            const [colKey, sortNumber] = orderConf.split('|')
+            if (customMap[colKey]) {
+              customMap[colKey].sortNumber = sortNumber
+            } else {
+              customMap[colKey] = { sortNumber }
+            }
+          })
         }
       }
       if (isCustomVisible) {
@@ -1662,7 +1670,7 @@ const Methods = {
           keyMap[colKey] = column
         }
       })
-      XEUtils.each(customMap, ({ visible, resizeWidth, fixed, order }, field) => {
+      XEUtils.each(customMap, ({ visible, resizeWidth, fixed, sortNumber }, field) => {
         const column = keyMap[field]
         if (column) {
           if (XEUtils.isNumber(resizeWidth)) {
@@ -1674,8 +1682,8 @@ const Methods = {
           if (fixed) {
             column.fixed = fixed
           }
-          if (order) {
-            column.colSeq = order
+          if (sortNumber) {
+            column.colSeq = Number(sortNumber)
           }
         }
       })
@@ -1684,8 +1692,9 @@ const Methods = {
   saveCustomFixed () {
     const { id, collectColumn, customConfig, customOpts } = this
     const { storage } = customOpts
-    const isAllStorage = customOpts.storage === true
-    const isCustomFixed = isAllStorage || (storage && storage.fixed)
+    const isAllStorage = storage === true
+    const storageOpts = isAllStorage ? {} : Object.assign({}, storage || {})
+    const isCustomFixed = isAllStorage || storageOpts.fixed
     if (customConfig && isCustomFixed) {
       const columnFixedStorageMap = getCustomStorageMap(fixedStorageKey)
       const colFixeds = []
@@ -1708,8 +1717,9 @@ const Methods = {
   saveCustomVisible () {
     const { id, collectColumn, customConfig, customOpts } = this
     const { checkMethod, storage } = customOpts
-    const isAllStorage = customOpts.storage === true
-    const isCustomVisible = isAllStorage || (storage && storage.visible)
+    const isAllStorage = storage === true
+    const storageOpts = isAllStorage ? {} : Object.assign({}, storage || {})
+    const isCustomVisible = isAllStorage || storageOpts.visible
     if (customConfig && isCustomVisible) {
       const columnVisibleStorageMap = getCustomStorageMap(visibleStorageKey)
       const colHides = []
@@ -1740,8 +1750,9 @@ const Methods = {
   saveCustomResizable (isReset) {
     const { id, collectColumn, customConfig, customOpts } = this
     const { storage } = customOpts
-    const isAllStorage = customOpts.storage === true
-    const isResizable = isAllStorage || (storage && storage.resizable)
+    const isAllStorage = storage === true
+    const storageOpts = isAllStorage ? {} : Object.assign({}, storage || {})
+    const isResizable = isAllStorage || storageOpts.resizable
     if (customConfig && isResizable) {
       const columnWidthStorageMap = getCustomStorageMap(resizableStorageKey)
       let columnWidthStorage
@@ -1773,7 +1784,14 @@ const Methods = {
   /**
    * 刷新列配置
    */
-  refreshColumn () {
+  refreshColumn (resiveOrder) {
+    if (resiveOrder) {
+      const columnList = XEUtils.orderBy(this.collectColumn, 'renderSortNumber')
+      this.collectColumn = columnList
+      const tableFullColumn = getColumnList(columnList)
+      this.tableFullColumn = tableFullColumn
+      this.cacheColumnMap()
+    }
     return this.parseColumns().then(() => {
       return this.refreshScroll()
     }).then(() => {

package/packages/table/src/table.js

@@ -340,6 +340,7 @@ export default {
         export: false,
         custom: false
       },
+      customColumnList: [],
       // 刷新列标识，当列筛选被改变时，触发表格刷新数据
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
@@ -605,9 +606,9 @@ export default {
       return Object.assign({}, GlobalConfig.table.customConfig, this.customConfig)
     },
     fixedColumnSize () {
-      const { tableFullColumn } = this
+      const { collectColumn } = this
       let fixedSize = 0
-      tableFullColumn.forEach((column) => {
+      collectColumn.forEach((column) => {
         if (column.fixed) {
           fixedSize++
         }