3h1-ui 2.14.17 → 2.14.19

package/es/index.js

@@ -7745,6 +7745,10 @@ const _sfc_main$Z = /* @__PURE__ */ defineComponent({
         });
       }
       if (schema2.component === "Input") {
+        const maxlength = (componentProps == null ? void 0 : componentProps.maxlength) === void 0 ? 100 : componentProps.maxlength;
+        componentProps = Object.assign({}, componentProps, {
+          maxlength
+        });
         componentProps.onInputEvent = (e) => {
           flag.value += 1;
           componentProps.maxlength = (componentProps == null ? void 0 : componentProps.maxlength) === void 0 ? 100 : componentProps.maxlength;
@@ -10261,15 +10265,19 @@ const _sfc_main$N = defineComponent({
         const {
           defaultValue,
           component,
+          componentProps,
           isHandleDateDefaultValue = true
         } = schema;
-        if (isHandleDateDefaultValue && defaultValue && dateItemType.includes(component)) {
+        if (isHandleDateDefaultValue && defaultValue && component && dateItemType.includes(component)) {
+          const valueFormat = componentProps ? componentProps["valueFormat"] : null;
           if (!Array.isArray(defaultValue)) {
-            schema.defaultValue = dateUtil(defaultValue);
+            schema.defaultValue = valueFormat ? dateUtil(defaultValue).format(valueFormat) : dateUtil(defaultValue);
           } else {
             const def = [];
             defaultValue.forEach((item) => {
-              def.push(dateUtil(item));
+              def.push(
+                valueFormat ? dateUtil(item).format(valueFormat) : dateUtil(item)
+              );
             });
             schema.defaultValue = def;
           }
@@ -12459,7 +12467,9 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
         // showCount: true,
         maxlength: 100,
         size: "small",
-        getPopupContainer: () => unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body,
+        getPopupContainer: (e) => {
+          return !!index2 ? e.parentNode : unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body;
+        },
         placeholder: createPlaceholderMessage(unref(getComponent)),
         ...apiSelectProps,
         ...compProps,
@@ -15268,30 +15278,10 @@ function useTableFooter(propsRef, scrollRef, tableElRef, getDataSourceRef) {
   }
   return { getFooterProps };
 }
-function deepCopy(obj) {
-  if (typeof obj !== "object" || obj === null) {
-    return obj;
-  }
-  let copy;
-  if (Array.isArray(obj)) {
-    copy = [];
-    for (let i = 0; i < obj.length; i++) {
-      copy[i] = deepCopy(obj[i]);
-    }
-  } else {
-    copy = {};
-    for (const key2 in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key2)) {
-        copy[key2] = deepCopy(obj[key2]);
-      }
-    }
-  }
-  return copy;
-}
 function useTableForm(propsRef, slots, fetch, getLoading) {
   const getFormConfig = computed(() => {
     const { formConfig } = unref(propsRef);
-    const temp = deepCopy(formConfig);
+    const temp = cloneDeep(formConfig);
     temp == null ? void 0 : temp.schemas.forEach((item) => {
       if (item.component === "Input") {
         item.componentProps = {
@@ -17159,9 +17149,15 @@ const Description = /* @__PURE__ */ defineComponent({
               textAlign: getProps.value.labelAlign
             },
             "class": `${prefixCls2}-label`
-          }, [slots[`${item.field}Label`] ? (_b = slots[`${item.field}Label`]) == null ? void 0 : _b.call(slots) : item.label, ((_c = getProps.value) == null ? void 0 : _c.isShowColon) ? ":" : ""]), createVNode("span", {
+          }, [slots[`${item.field}Label`] ? (_b = slots[`${item.field}Label`]) == null ? void 0 : _b.call(slots, {
+            model: getProps.value.data,
+            field: item.label
+          }) : item.label, ((_c = getProps.value) == null ? void 0 : _c.isShowColon) ? ":" : ""]), createVNode("span", {
             "class": `${prefixCls2}-value`
-          }, [slots[`${item.field}Value`] ? (_d = slots[`${item.field}Value`]) == null ? void 0 : _d.call(slots) : getProps.value.data[`${item.field}`], (item == null ? void 0 : item.isCopy) ? createVNode("span", {
+          }, [slots[`${item.field}Value`] ? (_d = slots[`${item.field}Value`]) == null ? void 0 : _d.call(slots, {
+            model: getProps.value.data,
+            field: getProps.value.data[`${item.field}`]
+          }) : getProps.value.data[`${item.field}`], (item == null ? void 0 : item.isCopy) ? createVNode("span", {
             "style": "cursor:pointer;margin-left:5px",
             "onClick": () => handleClick(getProps.value.data[`${item.field}`])
           }, [createVNode(CopyOutlined$1, {

package/lib/index.js

@@ -7747,6 +7747,10 @@ const _sfc_main$Z = /* @__PURE__ */ vue.defineComponent({
         });
       }
       if (schema2.component === "Input") {
+        const maxlength = (componentProps == null ? void 0 : componentProps.maxlength) === void 0 ? 100 : componentProps.maxlength;
+        componentProps = Object.assign({}, componentProps, {
+          maxlength
+        });
         componentProps.onInputEvent = (e) => {
           flag.value += 1;
           componentProps.maxlength = (componentProps == null ? void 0 : componentProps.maxlength) === void 0 ? 100 : componentProps.maxlength;
@@ -10263,15 +10267,19 @@ const _sfc_main$N = vue.defineComponent({
         const {
           defaultValue,
           component,
+          componentProps,
           isHandleDateDefaultValue = true
         } = schema;
-        if (isHandleDateDefaultValue && defaultValue && dateItemType.includes(component)) {
+        if (isHandleDateDefaultValue && defaultValue && component && dateItemType.includes(component)) {
+          const valueFormat = componentProps ? componentProps["valueFormat"] : null;
           if (!Array.isArray(defaultValue)) {
-            schema.defaultValue = utils.dateUtil(defaultValue);
+            schema.defaultValue = valueFormat ? utils.dateUtil(defaultValue).format(valueFormat) : utils.dateUtil(defaultValue);
           } else {
             const def = [];
             defaultValue.forEach((item) => {
-              def.push(utils.dateUtil(item));
+              def.push(
+                valueFormat ? utils.dateUtil(item).format(valueFormat) : utils.dateUtil(item)
+              );
             });
             schema.defaultValue = def;
           }
@@ -12461,7 +12469,9 @@ const _sfc_main$E = /* @__PURE__ */ vue.defineComponent({
         // showCount: true,
         maxlength: 100,
         size: "small",
-        getPopupContainer: () => vue.unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body,
+        getPopupContainer: (e) => {
+          return !!index2 ? e.parentNode : vue.unref(table2 == null ? void 0 : table2.wrapRef.value) ?? document.body;
+        },
         placeholder: createPlaceholderMessage(vue.unref(getComponent)),
         ...apiSelectProps,
         ...compProps,
@@ -15270,30 +15280,10 @@ function useTableFooter(propsRef, scrollRef, tableElRef, getDataSourceRef) {
   }
   return { getFooterProps };
 }
-function deepCopy(obj) {
-  if (typeof obj !== "object" || obj === null) {
-    return obj;
-  }
-  let copy;
-  if (Array.isArray(obj)) {
-    copy = [];
-    for (let i = 0; i < obj.length; i++) {
-      copy[i] = deepCopy(obj[i]);
-    }
-  } else {
-    copy = {};
-    for (const key2 in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key2)) {
-        copy[key2] = deepCopy(obj[key2]);
-      }
-    }
-  }
-  return copy;
-}
 function useTableForm(propsRef, slots, fetch, getLoading) {
   const getFormConfig = vue.computed(() => {
     const { formConfig } = vue.unref(propsRef);
-    const temp = deepCopy(formConfig);
+    const temp = cloneDeep(formConfig);
     temp == null ? void 0 : temp.schemas.forEach((item) => {
       if (item.component === "Input") {
         item.componentProps = {
@@ -17161,9 +17151,15 @@ const Description = /* @__PURE__ */ vue.defineComponent({
               textAlign: getProps.value.labelAlign
             },
             "class": `${prefixCls2}-label`
-          }, [slots[`${item.field}Label`] ? (_b = slots[`${item.field}Label`]) == null ? void 0 : _b.call(slots) : item.label, ((_c = getProps.value) == null ? void 0 : _c.isShowColon) ? ":" : ""]), vue.createVNode("span", {
+          }, [slots[`${item.field}Label`] ? (_b = slots[`${item.field}Label`]) == null ? void 0 : _b.call(slots, {
+            model: getProps.value.data,
+            field: item.label
+          }) : item.label, ((_c = getProps.value) == null ? void 0 : _c.isShowColon) ? ":" : ""]), vue.createVNode("span", {
             "class": `${prefixCls2}-value`
-          }, [slots[`${item.field}Value`] ? (_d = slots[`${item.field}Value`]) == null ? void 0 : _d.call(slots) : getProps.value.data[`${item.field}`], (item == null ? void 0 : item.isCopy) ? vue.createVNode("span", {
+          }, [slots[`${item.field}Value`] ? (_d = slots[`${item.field}Value`]) == null ? void 0 : _d.call(slots, {
+            model: getProps.value.data,
+            field: getProps.value.data[`${item.field}`]
+          }) : getProps.value.data[`${item.field}`], (item == null ? void 0 : item.isCopy) ? vue.createVNode("span", {
             "style": "cursor:pointer;margin-left:5px",
             "onClick": () => handleClick(getProps.value.data[`${item.field}`])
           }, [vue.createVNode(CopyOutlined$1, {

package/package.json

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