vxe-table 4.2.0-beta.2 → 4.2.0-beta.3

package/es/select/src/select.js

@@ -27,10 +27,13 @@ export default defineComponent({
         optionProps: Object,
         optionGroups: Array,
         optionGroupProps: Object,
+        optionConfig: Object,
         className: [String, Function],
         size: { type: String, default: function () { return GlobalConfig.select.size || GlobalConfig.size; } },
         emptyText: String,
+        // 已废弃，被 option-config.keyField 替换
         optionId: { type: String, default: function () { return GlobalConfig.select.optionId; } },
+        // 已废弃，被 option-config.useKey 替换
         optionKey: Boolean,
         transfer: { type: Boolean, default: function () { return GlobalConfig.select.transfer; } }
     },
@@ -95,6 +98,9 @@ export default defineComponent({
             var groupPropsOpts = computeGroupPropsOpts.value;
             return groupPropsOpts.options || 'options';
         });
+        var computeOptionOpts = computed(function () {
+            return Object.assign({}, GlobalConfig.select.optionConfig, props.optionConfig);
+        });
         var computeIsGroup = computed(function () {
             return reactData.fullGroupList.some(function (item) { return item.options && item.options.length; });
         });
@@ -151,7 +157,8 @@ export default defineComponent({
             return getSelectLabel(modelValue);
         });
         var getOptkey = function () {
-            return props.optionId || '_X_ID';
+            var optionOpts = computeOptionOpts.value;
+            return optionOpts.keyField || props.optionId || '_X_OPTION_KEY';
         };
         var getOptid = function (option) {
             var optid = option[getOptkey()];
@@ -537,9 +544,11 @@ export default defineComponent({
         var renderOption = function (list, group) {
             var optionKey = props.optionKey, modelValue = props.modelValue, multiple = props.multiple;
             var currentValue = reactData.currentValue;
+            var optionOpts = computeOptionOpts.value;
             var labelField = computeLabelField.value;
             var valueField = computeValueField.value;
             var isGroup = computeIsGroup.value;
+            var useKey = optionOpts.useKey;
             return list.map(function (option, cIndex) {
                 var slots = option.slots, className = option.className;
                 var isVisible = !isGroup || isOptionVisible(option);
@@ -548,7 +557,7 @@ export default defineComponent({
                 var optid = getOptid(option);
                 var defaultSlot = slots ? slots.default : null;
                 return isVisible ? h('div', {
-                    key: optionKey ? optid : cIndex,
+                    key: useKey || optionKey ? optid : cIndex,
                     class: ['vxe-select-option', className ? (XEUtils.isFunction(className) ? className({ option: option, $select: $xeselect }) : className) : '', {
                             'is--disabled': isDisabled,
                             'is--selected': multiple ? (modelValue && modelValue.indexOf(optionValue) > -1) : modelValue === optionValue,
@@ -579,15 +588,17 @@ export default defineComponent({
         var renderOptgroup = function () {
             var optionKey = props.optionKey;
             var visibleGroupList = reactData.visibleGroupList;
+            var optionOpts = computeOptionOpts.value;
             var groupLabelField = computeGroupLabelField.value;
             var groupOptionsField = computeGroupOptionsField.value;
+            var useKey = optionOpts.useKey;
             return visibleGroupList.map(function (group, gIndex) {
                 var slots = group.slots, className = group.className;
                 var optid = getOptid(group);
                 var isGroupDisabled = group.disabled;
                 var defaultSlot = slots ? slots.default : null;
                 return h('div', {
-                    key: optionKey ? optid : gIndex,
+                    key: useKey || optionKey ? optid : gIndex,
                     class: ['vxe-optgroup', className ? (XEUtils.isFunction(className) ? className({ option: group, $select: $xeselect }) : className) : '', {
                             'is--disabled': isGroupDisabled
                         }],

package/es/table/src/props.js

@@ -8,7 +8,7 @@ export default {
     height: [Number, String],
     // 表格的最大高度
     maxHeight: [Number, String],
-    // （即将废弃）所有列是否允许拖动列宽调整大小
+    // 已废弃，被 column-config.resizable 替换
     resizable: { type: Boolean, default: function () { return GlobalConfig.table.resizable; } },
     // 是否带有斑马纹
     stripe: { type: Boolean, default: function () { return GlobalConfig.table.stripe; } },

package/es/table/src/util.js

@@ -36,7 +36,7 @@ export function getRowkey($xetable) {
     var computeRowOpts = $xetable.getComputeMaps().computeRowOpts;
     var rowId = props.rowId;
     var rowOpts = computeRowOpts.value;
-    return rowId || rowOpts.keyField || '_X_ID';
+    return rowId || rowOpts.keyField || '_X_ROW_KEY';
 }
 // 行主键 value
 export function getRowid($xetable, row) {

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v" + process.env.VUE_APP_VXE_TABLE_VERSION + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.0-beta.3" + "] " + GlobalConfig.i18n(message, params);
 }
 function outLog(type) {
     return function (message, params) {

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: process.env.VUE_APP_VXE_TABLE_VERSION,
+    version: "4.2.0-beta.3",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

package/es/v-x-e-table/src/conf.js

@@ -26,7 +26,7 @@ var GlobalConfig = {
         //   name: ''
         // },
         // rowConfig: {
-        //   keyField: '_X_ID' // 行数据的唯一主键字段名
+        //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
         // },
         radioConfig: {
             // trigger: 'default'
@@ -269,6 +269,9 @@ var GlobalConfig = {
     select: {
         // size: null,
         // transfer: false,
+        // optionConfig: {
+        //   keyField: '_X_OPTION_KEY'
+        // },
         multiCharOverflow: 8
     },
     toolbar: {

package/lib/index.umd.js

@@ -8436,7 +8436,7 @@ var GlobalConfig = {
     //   name: ''
     // },
     // rowConfig: {
-    //   keyField: '_X_ID' // 行数据的唯一主键字段名
+    //   keyField: '_X_ROW_KEY' // 行数据的唯一主键字段名
     // },
     radioConfig: {
       // trigger: 'default'
@@ -8677,6 +8677,9 @@ var GlobalConfig = {
   select: {
     // size: null,
     // transfer: false,
+    // optionConfig: {
+    //   keyField: '_X_OPTION_KEY'
+    // },
     multiCharOverflow: 8
   },
   toolbar: {// size: null,
@@ -8751,7 +8754,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.0-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.0-beta.3", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -9420,7 +9423,7 @@ function getRowkey($xetable) {
 
   var rowId = props.rowId;
   var rowOpts = computeRowOpts.value;
-  return rowId || rowOpts.keyField || '_X_ID';
+  return rowId || rowOpts.keyField || '_X_ROW_KEY';
 } // 行主键 value
 
 function util_getRowid($xetable, row) {
@@ -10756,7 +10759,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.0-beta.2",
+  version: "4.2.0-beta.3",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -17527,6 +17530,7 @@ function getOptUniqueId() {
     optionProps: Object,
     optionGroups: Array,
     optionGroupProps: Object,
+    optionConfig: Object,
     className: [String, Function],
     size: {
       type: String,
@@ -17535,12 +17539,14 @@ function getOptUniqueId() {
       }
     },
     emptyText: String,
+    // 已废弃，被 option-config.keyField 替换
     optionId: {
       type: String,
       default: function _default() {
         return conf.select.optionId;
       }
     },
+    // 已废弃，被 option-config.useKey 替换
     optionKey: Boolean,
     transfer: {
       type: Boolean,
@@ -17609,6 +17615,9 @@ function getOptUniqueId() {
       var groupPropsOpts = computeGroupPropsOpts.value;
       return groupPropsOpts.options || 'options';
     });
+    var computeOptionOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return Object.assign({}, conf.select.optionConfig, props.optionConfig);
+    });
     var computeIsGroup = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return reactData.fullGroupList.some(function (item) {
         return item.options && item.options.length;
@@ -17686,7 +17695,8 @@ function getOptUniqueId() {
     });
 
     var getOptkey = function getOptkey() {
-      return props.optionId || '_X_ID';
+      var optionOpts = computeOptionOpts.value;
+      return optionOpts.keyField || props.optionId || '_X_OPTION_KEY';
     };
 
     var getOptid = function getOptid(option) {
@@ -18162,9 +18172,11 @@ function getOptUniqueId() {
           modelValue = props.modelValue,
           multiple = props.multiple;
       var currentValue = reactData.currentValue;
+      var optionOpts = computeOptionOpts.value;
       var labelField = computeLabelField.value;
       var valueField = computeValueField.value;
       var isGroup = computeIsGroup.value;
+      var useKey = optionOpts.useKey;
       return list.map(function (option, cIndex) {
         var slots = option.slots,
             className = option.className;
@@ -18174,7 +18186,7 @@ function getOptUniqueId() {
         var optid = getOptid(option);
         var defaultSlot = slots ? slots.default : null;
         return isVisible ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
-          key: optionKey ? optid : cIndex,
+          key: useKey || optionKey ? optid : cIndex,
           class: ['vxe-select-option', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className({
             option: option,
             $select: $xeselect
@@ -18213,8 +18225,10 @@ function getOptUniqueId() {
     var renderOptgroup = function renderOptgroup() {
       var optionKey = props.optionKey;
       var visibleGroupList = reactData.visibleGroupList;
+      var optionOpts = computeOptionOpts.value;
       var groupLabelField = computeGroupLabelField.value;
       var groupOptionsField = computeGroupOptionsField.value;
+      var useKey = optionOpts.useKey;
       return visibleGroupList.map(function (group, gIndex) {
         var slots = group.slots,
             className = group.className;
@@ -18222,7 +18236,7 @@ function getOptUniqueId() {
         var isGroupDisabled = group.disabled;
         var defaultSlot = slots ? slots.default : null;
         return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
-          key: optionKey ? optid : gIndex,
+          key: useKey || optionKey ? optid : gIndex,
           class: ['vxe-optgroup', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className({
             option: group,
             $select: $xeselect
@@ -24262,7 +24276,7 @@ var es_array_sort = __webpack_require__("4e82");
   height: [Number, String],
   // 表格的最大高度
   maxHeight: [Number, String],
-  // （即将废弃）所有列是否允许拖动列宽调整大小
+  // 已废弃，被 column-config.resizable 替换
   resizable: {
     type: Boolean,
     default: function _default() {