vxe-table 4.5.0-beta.12 → 4.5.0-beta.13

package/lib/index.umd.js

@@ -1788,7 +1788,8 @@ __webpack_require__.d(__webpack_exports__, {
   "setup": function() { return /* reexport */ setup; },
   "t": function() { return /* reexport */ t; },
   "use": function() { return /* reexport */ use; },
-  "v": function() { return /* reexport */ v; }
+  "v": function() { return /* reexport */ v; },
+  "validators": function() { return /* reexport */ validators; }
 });
 
 // NAMESPACE OBJECT: ./packages/all.ts
@@ -1877,7 +1878,8 @@ __webpack_require__.d(all_namespaceObject, {
   "setup": function() { return setup; },
   "t": function() { return t; },
   "use": function() { return use; },
-  "v": function() { return v; }
+  "v": function() { return v; },
+  "validators": function() { return validators; }
 });
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/setPublicPath.js
@@ -3973,7 +3975,9 @@ class Store {
     _defineProperty(this, "store", {});
   }
   mixin(options) {
-    Object.assign(this.store, options);
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, (item, key) => {
+      this.add(key, item);
+    });
     return this;
   }
   has(name) {
@@ -4014,7 +4018,52 @@ if (true) {
 }
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/menus.ts
 
-const menus = new store();
+
+
+class VXEMenusStore {
+  constructor() {
+    _defineProperty(this, "store", {});
+  }
+  mixin(options) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, (item, key) => {
+      this.add(key, item);
+    });
+    return this;
+  }
+  has(name) {
+    return !!this.get(name);
+  }
+  get(name) {
+    return this.store[name];
+  }
+  add(name, render) {
+    const conf = this.store[name];
+    // 兼容
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
+      render = {
+        menuMethod: render
+      };
+    }
+    // 检测是否覆盖
+    if (true) {
+      const confKeys = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(conf);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(render, (item, key) => {
+        if (confKeys.includes(key)) {
+          warnLog('vxe.error.coverProp', [name, key]);
+        }
+      });
+    }
+    this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
+    return this;
+  }
+  delete(name) {
+    delete this.store[name];
+  }
+  forEach(callback) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(this.store, callback);
+  }
+}
+const menus = new VXEMenusStore();
 if (true) {
   Object.assign(menus, {
     _name: 'Menus'
@@ -4028,6 +4077,14 @@ if (true) {
     _name: 'Formats'
   });
 }
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/validators.ts
+
+const validators = new store();
+if (true) {
+  Object.assign(validators, {
+    _name: 'Validators'
+  });
+}
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/hooks.ts
 
 const hooks = new store();
@@ -4052,6 +4109,7 @@ const setup = options => {
 
 
 
+
 function getExportOrImpotType(types, flag) {
   const rest = [];
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(types, (val, type) => {
@@ -4114,6 +4172,7 @@ const VXETable = {
   renderer: renderer,
   commands: commands,
   formats: formats,
+  validators: validators,
   menus: menus,
   hooks: hooks,
   config,
@@ -4128,6 +4187,7 @@ const VXETable = {
 
 
 
+
 /* harmony default export */ var v_x_e_table = ((/* unused pure expression or super */ null && (VXETable)));
 ;// CONCATENATED MODULE: ./packages/filter/src/panel.ts
 
@@ -5299,15 +5359,15 @@ const tableMenuHook = {
       ctxMenuLinkEvent(evnt, menu) {
         // 如果一级菜单有配置 code 则允许点击，否则不能点击
         if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
-          const ctxMenuMethod = VXETable.menus.get(menu.code);
+          const gMenuOpts = VXETable.menus.get(menu.code);
           const params = Object.assign({}, internalData._currMenuParams, {
             menu,
             $table: $xetable,
             $grid: $xetable.xegrid,
             $event: evnt
           });
-          if (ctxMenuMethod) {
-            ctxMenuMethod(params, evnt);
+          if (gMenuOpts && gMenuOpts.menuMethod) {
+            gMenuOpts.menuMethod(params, evnt);
           }
           $xetable.dispatchEvent('menu-click', params, evnt);
           menuMethods.closeMenu();
@@ -7985,7 +8045,10 @@ const quarterSize = 8;
     },
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.input.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.input.placeholder
+    },
     maxlength: [String, Number],
     autocomplete: {
       type: String,
@@ -10616,7 +10679,10 @@ function getOptUniqueId() {
   props: {
     modelValue: null,
     clearable: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.select.placeholder) ? conf.i18n('vxe.base.pleaseSelect') : conf.select.placeholder
+    },
     loading: Boolean,
     disabled: Boolean,
     multiple: Boolean,
@@ -14648,6 +14714,8 @@ const Keyboard = VxeModuleKeyboard;
 
 
 
+
+
 /**
  * 校验规则
  */
@@ -14994,11 +15062,12 @@ const validatorHook = {
               const {
                 type,
                 trigger,
-                required
+                required,
+                validator
               } = rule;
               if (validType === 'all' || !trigger || validType === trigger) {
-                if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
-                  const customValid = rule.validator({
+                if (validator) {
+                  const validParams = {
                     cellValue,
                     rule,
                     rules,
@@ -15006,9 +15075,29 @@ const validatorHook = {
                     rowIndex: $xetable.getRowIndex(row),
                     column,
                     columnIndex: $xetable.getColumnIndex(column),
-                    field: column.property,
-                    $table: $xetable
-                  });
+                    field: column.field,
+                    $table: $xetable,
+                    $grid: $xetable.xegrid
+                  };
+                  let customValid;
+                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
+                    const gvItem = VXETable.validators.get(validator);
+                    if (gvItem) {
+                      if (gvItem.cellValidatorMethod) {
+                        customValid = gvItem.cellValidatorMethod(validParams);
+                      } else {
+                        if (true) {
+                          warnLog('vxe.error.notValidators', [validator]);
+                        }
+                      }
+                    } else {
+                      if (true) {
+                        errLog('vxe.error.notValidators', [validator]);
+                      }
+                    }
+                  } else {
+                    customValid = validator(validParams);
+                  }
                   if (customValid) {
                     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
                       validRuleErr = true;
@@ -19635,7 +19724,10 @@ let autoTxtElem;
     name: String,
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.textarea.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.textarea.placeholder
+    },
     maxlength: [String, Number],
     rows: {
       type: [String, Number],
@@ -21211,11 +21303,12 @@ function getResetValue(value, resetValue) {
               const {
                 type,
                 trigger,
-                required
+                required,
+                validator
               } = rule;
               if (validType === 'all' || !trigger || validType === trigger) {
-                if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
-                  const customValid = rule.validator({
+                if (validator) {
+                  const validParams = {
                     itemValue,
                     rule,
                     rules,
@@ -21223,7 +21316,26 @@ function getResetValue(value, resetValue) {
                     field: property,
                     property,
                     $form: $xeform
-                  });
+                  };
+                  let customValid;
+                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
+                    const gvItem = VXETable.validators.get(validator);
+                    if (gvItem) {
+                      if (gvItem.itemValidatorMethod) {
+                        customValid = gvItem.itemValidatorMethod(validParams);
+                      } else {
+                        if (true) {
+                          warnLog('vxe.error.notValidators', [validator]);
+                        }
+                      }
+                    } else {
+                      if (true) {
+                        errLog('vxe.error.notValidators', [validator]);
+                      }
+                    }
+                  } else {
+                    customValid = validator(validParams);
+                  }
                   if (customValid) {
                     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
                       errorRules.push(new form_Rule({
@@ -29715,7 +29827,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
        * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
        * 如果单元格配置了校验规则，则会进行校验
        */
-      updateStatus(scope, cellValue) {
+      updateStatus(slotParams, cellValue) {
         const customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           const {
@@ -29725,11 +29837,11 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
             validStore
           } = reactData;
           const tableBody = refTableBody.value;
-          if (!scope && tableBody && editRules) {
+          if (slotParams && tableBody && editRules) {
             const {
               row,
               column
-            } = scope;
+            } = slotParams;
             const type = 'change';
             if ($xetable.hasCellRules) {
               if ($xetable.hasCellRules(type, row, column)) {
@@ -32462,6 +32574,10 @@ dynamicApp.component(table.name, table);
 ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.ts
 /* harmony default export */ var zh_CN = ({
   vxe: {
+    base: {
+      pleaseInput: '请输入',
+      pleaseSelect: '请选择'
+    },
     loading: {
       text: '加载中...'
     },
@@ -32481,6 +32597,7 @@ dynamicApp.component(table.name, table);
       errProp: '不支持的参数 "{0}"，可能为 "{1}"',
       colRepet: 'column.{0}="{1}" 重复了，这可能会导致某些功能无法使用',
       notFunc: '方法 "{0}" 不存在',
+      notValidators: '全局校验 "{0}" 不存在',
       notSlot: '插槽 "{0}" 不存在',
       noTree: '树结构不支持 "{0}"',
       notProp: '不支持的参数 "{0}"',