vxe-pc-ui 4.7.17 → 4.7.18

package/lib/index.umd.js

@@ -3501,6 +3501,7 @@ setTheme();
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突，将会出现错误',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
@@ -4285,14 +4286,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.7.17"}`;
+const log_version = `ui v${"4.7.18"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.7.17";
+const ui_version = "4.7.18";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -12998,9 +12999,16 @@ function toFloatValueFixed(inputValue, digitsValue) {
       } = reactData;
       if (visiblePanel) {
         hidePanel();
+      }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
+      if (visiblePanel || isActivated) {
+        const inputElem = refInputTarget.value;
         afterCheckValue();
-      } else if (isActivated) {
-        afterCheckValue();
+        if (inputElem) {
+          inputElem.blur();
+        }
       }
     };
     const renderDateLabel = (item, label) => {
@@ -13782,7 +13790,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
       computeSize
     } = useSize(props);
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
-    const refInput = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const refInputTarget = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refOptionPanel = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refHueSliderElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refHueSliderBtnElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -14330,7 +14338,22 @@ function toFloatValueFixed(inputValue, digitsValue) {
       }
     };
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel();
+      const {
+        visiblePanel,
+        isActivated
+      } = reactData;
+      if (visiblePanel) {
+        hideOptionPanel();
+      }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
+      if (visiblePanel || isActivated) {
+        const targetElem = refInputTarget.value;
+        if (targetElem) {
+          targetElem.blur();
+        }
+      }
     };
     const handleGlobalResizeEvent = () => {
       const {
@@ -14616,7 +14639,7 @@ function toFloatValueFixed(inputValue, digitsValue) {
           'is--active': isActivated
         }]
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('input', {
-        ref: refInput,
+        ref: refInputTarget,
         class: 'vxe-color-picker--input',
         onFocus: focusEvent,
         onBlur: blurEvent
@@ -16861,7 +16884,7 @@ const DatePanel = VxeDatePanel;
     multiple: Boolean,
     limitCount: {
       type: [String, Number],
-      default: () => getConfig().upload.limitCount
+      default: () => getConfig().datePicker.limitCount
     },
     // date、week、month、quarter、year
     startDate: {
@@ -17341,12 +17364,17 @@ const DatePanel = VxeDatePanel;
       } = reactData;
       if (visiblePanel) {
         hidePanel();
+      }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
+      if (visiblePanel || isActivated) {
         if ($datePanel) {
           $datePanel.checkValue(reactData.inputLabel);
         }
-      } else if (isActivated) {
-        if ($datePanel) {
-          $datePanel.checkValue(reactData.inputLabel);
+        const targetElem = refInputTarget.value;
+        if (targetElem) {
+          targetElem.blur();
         }
       }
     };
@@ -18466,11 +18494,21 @@ const DatePicker = VxeDatePicker;
     };
     const handleGlobalBlurEvent = () => {
       const {
-        visiblePanel
+        visiblePanel,
+        isActivated
       } = reactData;
       if (visiblePanel) {
         hidePanel();
       }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
+      if (visiblePanel || isActivated) {
+        const targetElem = refInputTarget.value;
+        if (targetElem) {
+          targetElem.blur();
+        }
+      }
     };
     const handleGlobalResizeEvent = () => {
       const {
@@ -19802,6 +19840,8 @@ const Empty = VxeEmpty;
 class ItemInfo {
   constructor($xeForm, item) {
     const {
+      field,
+      itemRender,
       formatter
     } = item;
     if (formatter) {
@@ -19817,10 +19857,18 @@ class ItemInfo {
         }
       }
     }
+    if (field && itemRender) {
+      if (itemRender.startField && `${itemRender.startField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `item-render.startField=${itemRender.startField}`]);
+      }
+      if (itemRender.endField && `${itemRender.endField}`.indexOf(field) >= 0) {
+        errLog('vxe.error.modelConflicts', [`field=${field}`, `item-render.endField=${itemRender.endField}`]);
+      }
+    }
     Object.assign(this, {
       id: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('item_'),
       title: item.title,
-      field: item.field,
+      field: field,
       span: item.span,
       align: item.align,
       verticalAlign: item.verticalAlign,
@@ -19847,7 +19895,7 @@ class ItemInfo {
       contentStyle: item.contentStyle,
       titleClassName: item.titleClassName,
       titleStyle: item.titleStyle,
-      itemRender: item.itemRender,
+      itemRender: itemRender,
       rules: item.rules,
       formatter,
       // 自定义参数
@@ -22803,7 +22851,22 @@ const Icon = VxeIcon;
       }
     };
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel();
+      const {
+        visiblePanel,
+        isActivated
+      } = reactData;
+      if (visiblePanel) {
+        hideOptionPanel();
+      }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value;
+        if ($input) {
+          $input.blur();
+        }
+      }
     };
     const dispatchEvent = (type, params, evnt) => {
       emit(type, createEvent(evnt, {
@@ -29485,7 +29548,22 @@ function getOptUniqueId() {
       }
     };
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel();
+      const {
+        visiblePanel,
+        isActivated
+      } = reactData;
+      if (visiblePanel) {
+        hideOptionPanel();
+      }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value;
+        if ($input) {
+          $input.blur();
+        }
+      }
     };
     const handleGlobalResizeEvent = () => {
       const {
@@ -32112,7 +32190,7 @@ const Print = VxePrint;
     /**
      * 隐藏下拉面板
      */
-    const hidePanel = () => {
+    const hideOptionPanel = () => {
       reactData.visiblePanel = false;
       dispatchEvent('visible-change', {
         visible: false
@@ -32138,14 +32216,14 @@ const Print = VxePrint;
      */
     const togglePanel = () => {
       if (reactData.visiblePanel) {
-        return hidePanel();
+        return hideOptionPanel();
       }
       return showPanel();
     };
     const handleOptionEvent = (evnt, option) => {
       if (!option.disabled) {
         if (reactData.visiblePanel) {
-          hidePanel();
+          hideOptionPanel();
           dispatchEvent('hide-panel', {}, evnt);
         }
         dispatchEvent('option-click', {
@@ -32159,7 +32237,7 @@ const Print = VxePrint;
       } = props;
       if (trigger === 'click') {
         if (reactData.visiblePanel) {
-          hidePanel();
+          hideOptionPanel();
           dispatchEvent('hide-panel', {}, evnt);
         } else {
           showPanel();
@@ -32183,7 +32261,7 @@ const Print = VxePrint;
           if (getEventTargetNode(evnt, panelElem).flag) {
             updatePlacement();
           } else {
-            hidePanel();
+            hideOptionPanel();
             dispatchEvent('hide-panel', {}, evnt);
           }
         }
@@ -32201,17 +32279,23 @@ const Print = VxePrint;
       if (!disabled) {
         reactData.isActivated = getEventTargetNode(evnt, el).flag || getEventTargetNode(evnt, panelElem).flag;
         if (visiblePanel && !reactData.isActivated) {
-          hidePanel();
+          hideOptionPanel();
           dispatchEvent('hide-panel', {}, evnt);
         }
       }
     };
     const handleGlobalBlurEvent = evnt => {
-      if (reactData.visiblePanel) {
-        reactData.isActivated = false;
-        hidePanel();
+      const {
+        visiblePanel,
+        isActivated
+      } = reactData;
+      if (visiblePanel) {
+        hideOptionPanel();
         dispatchEvent('hide-panel', {}, evnt);
       }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
     };
     const handleGlobalResizeEvent = () => {
       const {
@@ -32231,7 +32315,7 @@ const Print = VxePrint;
       isPanelVisible,
       togglePanel,
       showPanel,
-      hidePanel
+      hidePanel: hideOptionPanel
     };
     Object.assign($xePulldown, pulldownMethods);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.modelValue, value => {
@@ -32239,7 +32323,7 @@ const Print = VxePrint;
       if (value) {
         showPanel();
       } else {
-        hidePanel();
+        hideOptionPanel();
       }
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
@@ -35302,7 +35386,22 @@ function getRowUniqueId() {
       }
     };
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel();
+      const {
+        visiblePanel,
+        isActivated
+      } = reactData;
+      if (visiblePanel) {
+        hideOptionPanel();
+      }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value;
+        if ($input) {
+          $input.blur();
+        }
+      }
     };
     const handleGlobalResizeEvent = () => {
       const {
@@ -40099,7 +40198,22 @@ function tree_select_getOptUniqueId() {
       }
     };
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel();
+      const {
+        visiblePanel,
+        isActivated
+      } = reactData;
+      if (visiblePanel) {
+        hideOptionPanel();
+      }
+      if (isActivated) {
+        reactData.isActivated = false;
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value;
+        if ($input) {
+          $input.blur();
+        }
+      }
     };
     const handleGlobalResizeEvent = () => {
       const {