3h1-ui 2.14.16 → 2.14.17

package/es/index.js

@@ -1,6 +1,6 @@
 import { h, nextTick, createVNode, defineComponent, ref, computed, unref, watchEffect, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createSlots, renderSlot, normalizeProps, guardReactiveProps, createElementVNode, onMounted, normalizeClass, createCommentVNode, normalizeStyle, Transition, toHandlers, useSlots, withDirectives, vShow, getCurrentInstance, inject, onUnmounted, provide, onBeforeUnmount, resolveDynamicComponent, reactive, toRef, toRefs, TransitionGroup, getCurrentScope, onScopeDispose, readonly, isVNode, shallowReactive, toRaw, shallowRef, withKeys, withModifiers, render as render$1, resolveDirective, useAttrs as useAttrs$2, pushScopeId, popScopeId, isRef } from "vue";
 import { Radio, Select, Tree, TreeSelect, Cascader, Transfer, Input, Tooltip, Skeleton, Popover, Pagination, Empty, Button as Button$1, Table as Table$1, Form, FormItem, DatePicker, InputNumber, AutoComplete, Switch, Checkbox, Slider, Rate, TimePicker, Col, Popconfirm, Modal as Modal$2, Row, Dropdown, Menu, MenuItem, MenuDivider, Divider as Divider$1, Spin, PageHeader, Space, CheckboxGroup, Image, Badge, Tag, FormItemRest, Drawer, Upload, Avatar } from "ant-design-vue";
-import { propTypes, isFunction as isFunction$4, isString as isString$3, isArray as isArray$3, getSlot as getSlot$1, addClass as addClass$1, removeClass as removeClass$1, getPopupContainer as getPopupContainer$1, triggerWindowResize, off, on, addResizeListener, removeResizeListener, isNumber as isNumber$2, isBoolean, isNull, extendSlots as extendSlots$1, withInstall as withInstall$4, isObject as isObject$3, dateUtil, isNullOrUnDef, isDef as isDef$1, error as error$1, deepMerge as deepMerge$1, getDynamicProps, buildProps, createBEM, forEach as forEach$1, isClient as isClient$1, filter, treeToList, eachTree, isEmpty, isServer, formatToDate, isMap as isMap$2, buildUUID, findNodeAll, getViewportOffset, warn as warn$1, isNullAndUnDef, dataURLtoBlob, deepMergeObjects } from "@shy-plugins/utils";
+import { propTypes, isFunction as isFunction$4, isString as isString$3, isArray as isArray$3, getSlot as getSlot$1, addClass as addClass$1, removeClass as removeClass$1, getPopupContainer as getPopupContainer$1, triggerWindowResize, off, on, addResizeListener, removeResizeListener, isNumber as isNumber$2, isBoolean, isNull, extendSlots as extendSlots$1, withInstall as withInstall$4, isObject as isObject$3, dateUtil, isNullOrUnDef, isDef as isDef$1, error as error$1, deepMerge as deepMerge$1, getDynamicProps, buildProps, createBEM, forEach as forEach$1, isClient as isClient$1, filter, treeToList, eachTree, isEmpty, isServer, buildUUID, formatToDate, isMap as isMap$2, findNodeAll, getViewportOffset, warn as warn$1, isNullAndUnDef, dataURLtoBlob, deepMergeObjects } from "@shy-plugins/utils";
 import { useAttrs as useAttrs$1, useRuleFormItem, useTimeoutFn as useTimeoutFn$2, useScrollTo as useScrollTo$1, useIntersectionObserver, useCopyToClipboard, useMessage, usePagination as usePagination$2, createContext as createContext$1, useContext as useContext$2, useBreakpoint, useI18n as useI18n$1, useContentHeight, useDesign as useDesign$1, useWindowSizeFn as useWindowSizeFn$1, onMountedOrActivated, useEventListener as useEventListener$1 } from "@shy-plugins/use";
 import { zxcvbn } from "@zxcvbn-ts/core";
 import Iconify from "@purge-icons/generated";
@@ -7908,9 +7908,11 @@ const _sfc_main$Z = /* @__PURE__ */ defineComponent({
           const [e] = args;
           const target = e ? e.target : null;
           const value = target ? isCheck ? target.checked : target.value : e;
+          if (props2.formModel[field] === value)
+            return;
           props2.setFormModel(field, value);
           if (propsData[eventKey] && args.length >= 1) {
-            propsData[eventKey](...args);
+            propsData[eventKey](value);
           }
         }
       };
@@ -8630,18 +8632,20 @@ function useFormEvents({
   }
   async function appendSchemaByField(schema, prefixField, first = false) {
     const schemaList = cloneDeep(unref(getSchema));
-    const index2 = schemaList.findIndex((schema2) => schema2.field === prefixField);
-    if (!prefixField || index2 === -1 || first) {
-      first ? schemaList.unshift(schema) : schemaList.push(schema);
-      schemaRef.value = schemaList;
-      _setDefaultValue(schema);
+    const addSchemaIds = Array.isArray(schema) ? schema.map((item) => item.field) : [schema.field];
+    if (schemaList.find((item) => addSchemaIds.includes(item.field))) {
+      error$1("There are schemas that have already been added");
       return;
     }
-    if (index2 !== -1) {
-      schemaList.splice(index2 + 1, 0, schema);
+    const index2 = schemaList.findIndex((schema2) => schema2.field === prefixField);
+    const _schemaList = isObject$3(schema) ? [schema] : schema;
+    if (!prefixField || index2 === -1 || first) {
+      first ? schemaList.unshift(..._schemaList) : schemaList.push(..._schemaList);
+    } else if (index2 !== -1) {
+      schemaList.splice(index2 + 1, 0, ..._schemaList);
     }
-    _setDefaultValue(schema);
     schemaRef.value = schemaList;
+    _setDefaultValue(schema);
   }
   async function resetSchema(data) {
     let updateData = [];
@@ -8680,15 +8684,19 @@ function useFormEvents({
       return;
     }
     const schema = [];
-    updateData.forEach((item) => {
-      unref(getSchema).forEach((val) => {
+    unref(getSchema).forEach((val) => {
+      let _val;
+      updateData.forEach((item) => {
         if (val.field === item.field) {
-          const newSchema = deepMerge$1(val, item);
-          schema.push(newSchema);
-        } else {
-          schema.push(val);
+          _val = item;
         }
       });
+      if (_val !== void 0 && val.field === _val.field) {
+        const newSchema = deepMerge$1(val, _val);
+        schema.push(newSchema);
+      } else {
+        schema.push(val);
+      }
     });
     _setDefaultValue(schema);
     schemaRef.value = uniqBy(schema, "field");
@@ -12381,13 +12389,16 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
       default: ""
     },
     record: {
-      type: Object,
-      default: () => ({})
+      type: Object
     },
     column: {
       type: Object,
       default: () => ({})
     },
+    uuId: {
+      type: String,
+      default: ""
+    },
     index: propTypes.number
   },
   setup(props2) {
@@ -12421,7 +12432,7 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
       const isCheckValue = unref(getIsCheckComp);
       const valueField = isCheckValue ? "checked" : "value";
       const val = unref(currentValueRef);
-      const value = isCheckValue ? isNumber$2(val) && isBoolean(val) ? val : !!val : val;
+      const value = isCheckValue ? isNumber$2(val) || isBoolean(val) ? val : !!val : val;
       let compProps = ((_a2 = props2.column) == null ? void 0 : _a2.editComponentProps) ?? {};
       const {
         record,
@@ -12549,8 +12560,6 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
     async function handleChange(e) {
       var _a2, _b;
       const component = unref(getComponent);
-      if (component === "Input" && e.type === "change")
-        ;
       if (!e) {
         currentValueRef.value = e;
       } else if (component === "Checkbox") {
@@ -12655,6 +12664,7 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
         }
       }
       set(record, dataKey, value);
+      defaultValueRef.value = value;
       needEmit && ((_a2 = table2.emit) == null ? void 0 : _a2.call(table2, "edit-end", {
         record,
         index: index2,
@@ -12734,31 +12744,38 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
         isArray$3(props2.record[cbs]) ? (_a2 = props2.record[cbs]) == null ? void 0 : _a2.push(handle) : props2.record[cbs] = [handle];
       }
     }
-    if (props2.record) {
-      initCbs("submitCbs", handleSubmit);
-      initCbs("validCbs", handleSubmitRule);
-      initCbs("cancelCbs", handleCancel);
-      if (props2.column.dataIndex) {
-        if (!props2.record.editValueRefs)
-          props2.record.editValueRefs = {};
-        props2.record.editValueRefs[props2.column.dataIndex] = currentValueRef;
-      }
-      props2.record.onCancelEdit = () => {
-        var _a2, _b;
-        isArray$3((_a2 = props2.record) == null ? void 0 : _a2.cancelCbs) && ((_b = props2.record) == null ? void 0 : _b.cancelCbs.forEach((fn) => fn()));
-      };
-      props2.record.onSubmitEdit = async () => {
-        var _a2, _b, _c, _d, _e;
-        if (isArray$3((_a2 = props2.record) == null ? void 0 : _a2.submitCbs)) {
-          if (!((_c = (_b = props2.record) == null ? void 0 : _b.onValid) == null ? void 0 : _c.call(_b)))
-            return;
-          const submitFns = ((_d = props2.record) == null ? void 0 : _d.submitCbs) || [];
-          submitFns.forEach((fn) => fn(false, false));
-          (_e = table2.emit) == null ? void 0 : _e.call(table2, "edit-row-end");
-          return true;
+    const handleRecordEdit = () => {
+      if (props2.record) {
+        initCbs("submitCbs", handleSubmit);
+        initCbs("validCbs", handleSubmitRule);
+        initCbs("cancelCbs", handleCancel);
+        if (props2.column.dataIndex) {
+          if (!props2.record.editValueRefs)
+            props2.record.editValueRefs = {};
+          props2.record.editValueRefs[props2.column.dataIndex] = currentValueRef;
         }
-      };
-    }
+        props2.record.onCancelEdit = () => {
+          var _a2, _b;
+          isArray$3((_a2 = props2.record) == null ? void 0 : _a2.cancelCbs) && ((_b = props2.record) == null ? void 0 : _b.cancelCbs.forEach((fn) => fn()));
+        };
+        props2.record.onSubmitEdit = async () => {
+          var _a2, _b, _c, _d, _e;
+          if (isArray$3((_a2 = props2.record) == null ? void 0 : _a2.submitCbs)) {
+            if (!((_c = (_b = props2.record) == null ? void 0 : _b.onValid) == null ? void 0 : _c.call(_b)))
+              return;
+            const submitFns = ((_d = props2.record) == null ? void 0 : _d.submitCbs) || [];
+            submitFns.forEach((fn) => fn(false, false));
+            (_e = table2.emit) == null ? void 0 : _e.call(table2, "edit-row-end");
+            return true;
+          }
+        };
+      }
+    };
+    watch(() => props2.uuId, () => {
+      handleRecordEdit();
+    }, {
+      immediate: true
+    });
     return {
       isEdit,
       prefixCls: prefixCls2,
@@ -12832,9 +12849,9 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
   }
 });
 const EditableCell_vue_vue_type_style_index_0_lang = "";
-let rowIndex = 0;
+const uuId = ref();
 function isNeedRefresh() {
-  rowIndex++;
+  uuId.value = buildUUID();
 }
 function renderEditCell(column) {
   return ({ text: value, record, index: index2 }) => {
@@ -12872,7 +12889,7 @@ function renderEditCell(column) {
       record,
       column,
       index: index2,
-      key: rowIndex
+      uuId: uuId.value
     });
   };
 }
@@ -13794,7 +13811,7 @@ function useCustomRow(propsRef, {
   emit
 }) {
   const customRow = (record, index2) => {
-    isNeedRefresh();
+    index2 === 0 && isNeedRefresh();
     return {
       onClick: (e) => {
         e == null ? void 0 : e.stopPropagation();
@@ -16354,6 +16371,9 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
       if (isBoolean(ifShow)) {
         isIfShow2 = ifShow;
       }
+      if (isNumber$2(ifShow) || isString$3(ifShow)) {
+        isIfShow2 = !!ifShow;
+      }
       if (isFunction$4(ifShow)) {
         isIfShow2 = ifShow(action);
       }

package/lib/index.js

@@ -7910,9 +7910,11 @@ const _sfc_main$Z = /* @__PURE__ */ vue.defineComponent({
           const [e] = args;
           const target = e ? e.target : null;
           const value = target ? isCheck ? target.checked : target.value : e;
+          if (props2.formModel[field] === value)
+            return;
           props2.setFormModel(field, value);
           if (propsData[eventKey] && args.length >= 1) {
-            propsData[eventKey](...args);
+            propsData[eventKey](value);
           }
         }
       };
@@ -8632,18 +8634,20 @@ function useFormEvents({
   }
   async function appendSchemaByField(schema, prefixField, first = false) {
     const schemaList = cloneDeep(vue.unref(getSchema));
-    const index2 = schemaList.findIndex((schema2) => schema2.field === prefixField);
-    if (!prefixField || index2 === -1 || first) {
-      first ? schemaList.unshift(schema) : schemaList.push(schema);
-      schemaRef.value = schemaList;
-      _setDefaultValue(schema);
+    const addSchemaIds = Array.isArray(schema) ? schema.map((item) => item.field) : [schema.field];
+    if (schemaList.find((item) => addSchemaIds.includes(item.field))) {
+      utils.error("There are schemas that have already been added");
       return;
     }
-    if (index2 !== -1) {
-      schemaList.splice(index2 + 1, 0, schema);
+    const index2 = schemaList.findIndex((schema2) => schema2.field === prefixField);
+    const _schemaList = utils.isObject(schema) ? [schema] : schema;
+    if (!prefixField || index2 === -1 || first) {
+      first ? schemaList.unshift(..._schemaList) : schemaList.push(..._schemaList);
+    } else if (index2 !== -1) {
+      schemaList.splice(index2 + 1, 0, ..._schemaList);
     }
-    _setDefaultValue(schema);
     schemaRef.value = schemaList;
+    _setDefaultValue(schema);
   }
   async function resetSchema(data) {
     let updateData = [];
@@ -8682,15 +8686,19 @@ function useFormEvents({
       return;
     }
     const schema = [];
-    updateData.forEach((item) => {
-      vue.unref(getSchema).forEach((val) => {
+    vue.unref(getSchema).forEach((val) => {
+      let _val;
+      updateData.forEach((item) => {
         if (val.field === item.field) {
-          const newSchema = utils.deepMerge(val, item);
-          schema.push(newSchema);
-        } else {
-          schema.push(val);
+          _val = item;
         }
       });
+      if (_val !== void 0 && val.field === _val.field) {
+        const newSchema = utils.deepMerge(val, _val);
+        schema.push(newSchema);
+      } else {
+        schema.push(val);
+      }
     });
     _setDefaultValue(schema);
     schemaRef.value = uniqBy(schema, "field");
@@ -12383,13 +12391,16 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
       default: ""
     },
     record: {
-      type: Object,
-      default: () => ({})
+      type: Object
     },
     column: {
       type: Object,
       default: () => ({})
     },
+    uuId: {
+      type: String,
+      default: ""
+    },
     index: utils.propTypes.number
   },
   setup(props2) {
@@ -12423,7 +12434,7 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
       const isCheckValue = vue.unref(getIsCheckComp);
       const valueField = isCheckValue ? "checked" : "value";
       const val = vue.unref(currentValueRef);
-      const value = isCheckValue ? utils.isNumber(val) && utils.isBoolean(val) ? val : !!val : val;
+      const value = isCheckValue ? utils.isNumber(val) || utils.isBoolean(val) ? val : !!val : val;
       let compProps = ((_a2 = props2.column) == null ? void 0 : _a2.editComponentProps) ?? {};
       const {
         record,
@@ -12551,8 +12562,6 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
     async function handleChange(e) {
       var _a2, _b;
       const component = vue.unref(getComponent);
-      if (component === "Input" && e.type === "change")
-        ;
       if (!e) {
         currentValueRef.value = e;
       } else if (component === "Checkbox") {
@@ -12657,6 +12666,7 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
         }
       }
       set(record, dataKey, value);
+      defaultValueRef.value = value;
       needEmit && ((_a2 = table2.emit) == null ? void 0 : _a2.call(table2, "edit-end", {
         record,
         index: index2,
@@ -12736,31 +12746,38 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
         utils.isArray(props2.record[cbs]) ? (_a2 = props2.record[cbs]) == null ? void 0 : _a2.push(handle) : props2.record[cbs] = [handle];
       }
     }
-    if (props2.record) {
-      initCbs("submitCbs", handleSubmit);
-      initCbs("validCbs", handleSubmitRule);
-      initCbs("cancelCbs", handleCancel);
-      if (props2.column.dataIndex) {
-        if (!props2.record.editValueRefs)
-          props2.record.editValueRefs = {};
-        props2.record.editValueRefs[props2.column.dataIndex] = currentValueRef;
-      }
-      props2.record.onCancelEdit = () => {
-        var _a2, _b;
-        utils.isArray((_a2 = props2.record) == null ? void 0 : _a2.cancelCbs) && ((_b = props2.record) == null ? void 0 : _b.cancelCbs.forEach((fn) => fn()));
-      };
-      props2.record.onSubmitEdit = async () => {
-        var _a2, _b, _c, _d, _e;
-        if (utils.isArray((_a2 = props2.record) == null ? void 0 : _a2.submitCbs)) {
-          if (!((_c = (_b = props2.record) == null ? void 0 : _b.onValid) == null ? void 0 : _c.call(_b)))
-            return;
-          const submitFns = ((_d = props2.record) == null ? void 0 : _d.submitCbs) || [];
-          submitFns.forEach((fn) => fn(false, false));
-          (_e = table2.emit) == null ? void 0 : _e.call(table2, "edit-row-end");
-          return true;
+    const handleRecordEdit = () => {
+      if (props2.record) {
+        initCbs("submitCbs", handleSubmit);
+        initCbs("validCbs", handleSubmitRule);
+        initCbs("cancelCbs", handleCancel);
+        if (props2.column.dataIndex) {
+          if (!props2.record.editValueRefs)
+            props2.record.editValueRefs = {};
+          props2.record.editValueRefs[props2.column.dataIndex] = currentValueRef;
         }
-      };
-    }
+        props2.record.onCancelEdit = () => {
+          var _a2, _b;
+          utils.isArray((_a2 = props2.record) == null ? void 0 : _a2.cancelCbs) && ((_b = props2.record) == null ? void 0 : _b.cancelCbs.forEach((fn) => fn()));
+        };
+        props2.record.onSubmitEdit = async () => {
+          var _a2, _b, _c, _d, _e;
+          if (utils.isArray((_a2 = props2.record) == null ? void 0 : _a2.submitCbs)) {
+            if (!((_c = (_b = props2.record) == null ? void 0 : _b.onValid) == null ? void 0 : _c.call(_b)))
+              return;
+            const submitFns = ((_d = props2.record) == null ? void 0 : _d.submitCbs) || [];
+            submitFns.forEach((fn) => fn(false, false));
+            (_e = table2.emit) == null ? void 0 : _e.call(table2, "edit-row-end");
+            return true;
+          }
+        };
+      }
+    };
+    vue.watch(() => props2.uuId, () => {
+      handleRecordEdit();
+    }, {
+      immediate: true
+    });
     return {
       isEdit,
       prefixCls: prefixCls2,
@@ -12834,9 +12851,9 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
   }
 });
 const EditableCell_vue_vue_type_style_index_0_lang = "";
-let rowIndex = 0;
+const uuId = vue.ref();
 function isNeedRefresh() {
-  rowIndex++;
+  uuId.value = utils.buildUUID();
 }
 function renderEditCell(column) {
   return ({ text: value, record, index: index2 }) => {
@@ -12874,7 +12891,7 @@ function renderEditCell(column) {
       record,
       column,
       index: index2,
-      key: rowIndex
+      uuId: uuId.value
     });
   };
 }
@@ -13796,7 +13813,7 @@ function useCustomRow(propsRef, {
   emit
 }) {
   const customRow = (record, index2) => {
-    isNeedRefresh();
+    index2 === 0 && isNeedRefresh();
     return {
       onClick: (e) => {
         e == null ? void 0 : e.stopPropagation();
@@ -16356,6 +16373,9 @@ const _sfc_main$p = /* @__PURE__ */ vue.defineComponent({
       if (utils.isBoolean(ifShow)) {
         isIfShow2 = ifShow;
       }
+      if (utils.isNumber(ifShow) || utils.isString(ifShow)) {
+        isIfShow2 = !!ifShow;
+      }
       if (utils.isFunction(ifShow)) {
         isIfShow2 = ifShow(action);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.14.16",
+  "version": "2.14.17",
   "description": "",
   "module": "es/index.js",
   "main": "lib/index.js",
@@ -29,7 +29,7 @@
     "vue-json-pretty": "^2.2.3",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/use": "1.0.4",
+    "@shy-plugins/use": "1.0.5",
     "@shy-plugins/utils": "1.1.0"
   },
   "types": "es/ui/index.d.ts",