vxe-pc-ui 3.3.10 → 3.3.12

package/lib/index.umd.js

@@ -12799,7 +12799,7 @@ function handleBooleanDefaultValue(value) {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.3.10");
+var log_version = "ui v".concat("3.3.12");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
@@ -12807,7 +12807,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.3.10";
+var ui_version = "3.3.12";
 core_VxeUI.version = ui_version;
 core_VxeUI.uiVersion = ui_version;
 core_VxeUI.tableVersion = '';
@@ -22506,12 +22506,12 @@ var allActiveDrawers = [];
         reactData.initialized = true;
       }
       if (!visible) {
-        $xeDrawer.recalculate();
         reactData.visible = true;
         reactData.contentVisible = false;
         $xeDrawer.updateZindex();
         allActiveDrawers.push($xeDrawer);
         setTimeout(function () {
+          $xeDrawer.recalculate();
           reactData.contentVisible = true;
           $xeDrawer.$nextTick(function () {
             if (showFooter) {
@@ -22795,7 +22795,6 @@ var allActiveDrawers = [];
       if (props.value) {
         $xeDrawer.openDrawer();
       }
-      $xeDrawer.recalculate();
     });
     if (props.escClosable) {
       globalEvents.on($xeDrawer, 'keydown', $xeDrawer.handleGlobalKeydownEvent);
@@ -23679,12 +23678,6 @@ var validErrorRuleValue = function validErrorRuleValue(rule, val) {
   }
   return false;
 };
-function getResetValue(value, resetValue) {
-  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(value)) {
-    resetValue = [];
-  }
-  return resetValue;
-}
 /* harmony default export */ var src_form = (defineVxeComponent({
   name: 'VxeForm',
   mixins: [globalMixins.sizeMixin],
@@ -23973,6 +23966,26 @@ function getResetValue(value, resetValue) {
       }
       return $xeForm.$nextTick();
     },
+    getResetValue: function getResetValue(item, data) {
+      var $xeForm = this;
+      var field = item.field,
+        resetValue = item.resetValue;
+      var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field);
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resetValue)) {
+        return resetValue({
+          field: field,
+          item: item,
+          data: data,
+          $form: $xeForm,
+          $grid: $xeForm.xegrid
+        });
+      } else if (resetValue === null) {
+        // 默认
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(itemValue)) {
+          return [];
+        }
+      }
+    },
     reset: function reset() {
       var $xeForm = this;
       var props = $xeForm;
@@ -23981,7 +23994,6 @@ function getResetValue(value, resetValue) {
       if (data) {
         itemList.forEach(function (item) {
           var field = item.field,
-            resetValue = item.resetValue,
             itemRender = item.itemRender;
           if (isEnableConf(itemRender)) {
             var compConf = renderer.get(itemRender.name);
@@ -23996,7 +24008,7 @@ function getResetValue(value, resetValue) {
                 $grid: $xeForm.xegrid
               });
             } else if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field), undefined) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(resetValue, true));
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, $xeForm.getResetValue(item, data));
             }
           }
         });