3h1-ui 3.0.0-next.223 → 3.0.0-next.225

package/es/index.js

@@ -11730,7 +11730,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
     const isTableForm = computed(() => !!formProps2.value.formLabelInInput);
     const componentsPropsRef = ref({});
     watch(() => props2.formModel, () => {
-      var _a2;
+      var _a2, _b, _c, _d, _e;
       const {
         schema: schema2,
         tableAction: tableAction2,
@@ -11762,7 +11762,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
           ...props2
         });
       }
-      if (schema2.component.includes("Picker") || schema2.component.includes("Select")) {
+      if (((_b = (_a2 = schema2.component) == null ? void 0 : _a2.includes) == null ? void 0 : _b.call(_a2, "Picker")) || ((_d = (_c = schema2.component) == null ? void 0 : _c.includes) == null ? void 0 : _d.call(_c, "Select"))) {
         componentProps.getPopupContainer = () => document.body;
       }
       if (["RangePicker", "DatePicker"].includes(schema2.component)) {
@@ -11794,7 +11794,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
         };
       }
       if (schema2.component === "Select") {
-        const label = ((_a2 = componentProps == null ? void 0 : componentProps.fieldNames) == null ? void 0 : _a2.label) || "label";
+        const label = ((_e = componentProps == null ? void 0 : componentProps.fieldNames) == null ? void 0 : _e.label) || "label";
         componentProps = Object.assign({}, componentProps, {
           showSearch: true,
           filterOption: (input, option) => {
@@ -30043,6 +30043,8 @@ const ShyTag = /* @__PURE__ */ defineComponent({
       ...props2.fieldNames
     }));
     watch(() => props2.options, (val) => {
+      if (!(val == null ? void 0 : val.length))
+        return;
       optionsRef.value = unref(val);
     }, {
       immediate: true,
@@ -30055,10 +30057,12 @@ const ShyTag = /* @__PURE__ */ defineComponent({
     }, {
       immediate: true
     });
-    const tag2 = computed(() => unref(optionsRef).find((item) => item[unref(fieldNames).value] == props2.value) ?? {
-      [unref(fieldNames).label]: "-",
-      [unref(fieldNames).color]: "var(--gray-5)",
-      [unref(fieldNames).css]: ""
+    const tag2 = computed(() => {
+      return unref(optionsRef).find((item) => item[unref(fieldNames).value] == props2.value) ?? {
+        [unref(fieldNames).label]: "-",
+        [unref(fieldNames).color]: "var(--gray-5)",
+        [unref(fieldNames).css]: ""
+      };
     });
     const renderTag = computed(() => {
       const [isTag, tagMode] = [props2.isTag, props2.tagMode];
@@ -49264,6 +49268,7 @@ const CustomCollapse = /* @__PURE__ */ defineComponent({
       "onUpdate:activeKey": ($event) => collapseActiveKey.value = $event
     }, {
       default: () => [createVNode(Collapse.Panel, {
+        "forceRender": true,
         "key": field
       }, {
         default: () => [props2 == null ? void 0 : props2.renderGroup(componentProps == null ? void 0 : componentProps.schemas)],
@@ -49300,49 +49305,72 @@ const Descriptions = /* @__PURE__ */ defineComponent({
       };
     });
     const handleValuePrecision = (item, data) => {
-      var _a2;
-      return slots[`${item.field}Value`] ? (_a2 = slots[`${item.field}Value`]) == null ? void 0 : _a2.call(slots, {
-        model: data,
-        field: data[`${item.field}`]
-      }) : getProps.value.summaryTotalFields.includes(item.field) && isNumber$3(+data[`${item.field}`]) && !isNaN(+data[`${item.field}`]) ? (+data[`${item.field}`]).toFixed(getProps.value.summaryPrecision).replace(/\d(?=(?:\d{3})+(?:\.|$))/g, (match, offset2, string3) => {
+      return getProps.value.summaryTotalFields.includes(item.field) && isNumber$3(+data[`${item.field}`]) && !isNaN(+data[`${item.field}`]) ? (+data[`${item.field}`]).toFixed(getProps.value.summaryPrecision).replace(/\d(?=(?:\d{3})+(?:\.|$))/g, (match, offset2, string3) => {
         return match + (string3.charAt(offset2 + 1) === "." || offset2 === string3.length - 1 ? "" : ",");
       }) : data[`${item.field}`];
     };
     emit("register", {
       setDescProps
     });
-    const transformValue = (item) => {
-      const {
-        field,
-        componentProps: comProps,
-        component
-      } = item;
-      const componentProps = isFunction$6(comProps) ? comProps({
-        formModel: unref(getValues)
-      }) : comProps;
-      const {
-        data,
-        summaryTotalFields
-      } = unref(getProps);
-      if ((summaryTotalFields == null ? void 0 : summaryTotalFields.length) && summaryTotalFields.includes(field)) {
-        return handleValuePrecision(item, data);
-      } else if ((componentProps == null ? void 0 : componentProps.options) || (componentProps == null ? void 0 : componentProps.api)) {
-        let options = [];
-        if (Array.isArray(componentProps.options)) {
-          options = treeToList(componentProps.options);
+    const transformValue = computed(() => {
+      return (item) => {
+        var _a2;
+        const {
+          field,
+          componentProps: comProps,
+          component,
+          label
+        } = item;
+        const {
+          data,
+          summaryTotalFields
+        } = unref(getProps);
+        const componentProps = isFunction$6(comProps) ? (
+          // @ts-ignore
+          comProps({
+            formModel: data
+          })
+        ) : comProps;
+        if (slots[`${item.field}Value`]) {
+          return (_a2 = slots[`${item.field}Value`]) == null ? void 0 : _a2.call(slots, {
+            model: data,
+            field: data[`${item.field}`]
+          });
+        }
+        if ((summaryTotalFields == null ? void 0 : summaryTotalFields.length) && summaryTotalFields.includes(field)) {
+          return handleValuePrecision(item, data);
+        }
+        if ((componentProps == null ? void 0 : componentProps.options) || (componentProps == null ? void 0 : componentProps.api)) {
+          let options = [];
+          if (Array.isArray(componentProps.options)) {
+            options = treeToList(componentProps.options);
+          }
+          return createVNode(ShyTag, mergeProps({
+            "value": data[`${field}`]
+          }, componentProps, {
+            "options": options
+          }), null);
+        }
+        if (["DatePicker", "MonthPicker", "RangePicker", "WeekPicker", "TimePicker"].includes(component)) {
+          if (!data[`${field}`])
+            return "";
+          return dayjs$1(data[`${field}`]).format((componentProps == null ? void 0 : componentProps.valueFormat) || "YYYY-MM-DD");
+        }
+        if (component === "Table") {
+          return createVNode(ShyFormTable, mergeProps(componentProps, {
+            "isShowAddBtn": false,
+            "isShowAction": false,
+            "value": data[`${field}`]
+          }), null);
+        }
+        if (component === "Divider") {
+          return createVNode(Divider, componentProps, _isSlot(label) ? label : {
+            default: () => [label]
+          });
         }
-        return createVNode(ShyTag, mergeProps({
-          "value": data[`${field}`]
-        }, componentProps, {
-          "options": options
-        }), null);
-      } else if (["DatePicker", "MonthPicker", "RangePicker", "WeekPicker", "TimePicker"].includes(component)) {
-        if (!data[`${field}`])
-          return "";
-        return dayjs$1(data[`${field}`]).format((componentProps == null ? void 0 : componentProps.valueFormat) || "YYYY-MM-DD");
-      } else
         return data[`${field}`];
-    };
+      };
+    });
     const renderValue = (item) => {
       var _a2;
       const {
@@ -49364,12 +49392,13 @@ const Descriptions = /* @__PURE__ */ defineComponent({
         return render3(unref(getValues)(item));
       } else {
         const contentStyles = {
+          overflow: "hidden",
           ...unref(getProps).contentStyle,
           ...contentStyle
         };
         return createVNode("div", {
           "style": contentStyles
-        }, [transformValue(item)]);
+        }, [unref(transformValue)(item)]);
       }
     };
     const labelAlignCss = computed(() => {
@@ -49491,7 +49520,7 @@ const Descriptions = /* @__PURE__ */ defineComponent({
       }), [[vShow, isShow]]);
     };
     const renderSchema = (group) => {
-      var _a2, _b;
+      var _a2, _b, _c;
       if (isArray$3(group)) {
         let _slot2;
         const props3 = pick$1(unref(getProps), ["bordered"]);
@@ -49513,10 +49542,10 @@ const Descriptions = /* @__PURE__ */ defineComponent({
       const componentProps = isFunction$6(comProps) ? (
         // @ts-ignore
         comProps({
-          formModel: unref(getValues)
+          formModel: (_a2 = unref(getProps)) == null ? void 0 : _a2.data
         })
       ) : comProps;
-      const realSpan = ((colProps2 == null ? void 0 : colProps2.span) || ((_b = (_a2 = unref(getProps)) == null ? void 0 : _a2.baseColProps) == null ? void 0 : _b.span) || basicColProps) / basicRowProps;
+      const realSpan = ((colProps2 == null ? void 0 : colProps2.span) || ((_c = (_b = unref(getProps)) == null ? void 0 : _b.baseColProps) == null ? void 0 : _c.span) || basicColProps) / basicRowProps;
       const style2 = {
         [`--col-span`]: `${realSpan * 100}%`,
         [`--w-gap`]: `${realSpan * basicGap}px`
@@ -49537,7 +49566,10 @@ const Descriptions = /* @__PURE__ */ defineComponent({
             "style": style2,
             "class": `${prefixCls2}-group`
           }, [createVNode(CustomCollapse, {
-            "schema": group,
+            "schema": {
+              ...group,
+              componentProps
+            },
             "renderGroup": renderGroup
           }, null)]), [[vShow, isShow]]);
         case "Custom":
@@ -49562,10 +49594,18 @@ const Descriptions = /* @__PURE__ */ defineComponent({
       if (!isArray$3(schemas))
         return [];
       return schemas.reduce((prev2, curr) => {
-        if (curr.component && curr.component === "Group") {
+        if ((curr == null ? void 0 : curr.component) === "Group") {
           prev2.push(curr);
           return prev2;
         }
+        if ((curr == null ? void 0 : curr.component) === "Divider") {
+          prev2.push(merge$2(curr, {
+            componentProps: {
+              groupType: "Divider"
+            }
+          }));
+          return prev2;
+        }
         if (!isArray$3(prev2[prev2.length - 1])) {
           prev2.push([]);
         }

package/lib/index.js

@@ -11754,7 +11754,7 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
     const isTableForm = vue.computed(() => !!formProps2.value.formLabelInInput);
     const componentsPropsRef = vue.ref({});
     vue.watch(() => props2.formModel, () => {
-      var _a2;
+      var _a2, _b, _c, _d, _e;
       const {
         schema: schema2,
         tableAction: tableAction2,
@@ -11786,7 +11786,7 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
           ...props2
         });
       }
-      if (schema2.component.includes("Picker") || schema2.component.includes("Select")) {
+      if (((_b = (_a2 = schema2.component) == null ? void 0 : _a2.includes) == null ? void 0 : _b.call(_a2, "Picker")) || ((_d = (_c = schema2.component) == null ? void 0 : _c.includes) == null ? void 0 : _d.call(_c, "Select"))) {
         componentProps.getPopupContainer = () => document.body;
       }
       if (["RangePicker", "DatePicker"].includes(schema2.component)) {
@@ -11818,7 +11818,7 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
         };
       }
       if (schema2.component === "Select") {
-        const label = ((_a2 = componentProps == null ? void 0 : componentProps.fieldNames) == null ? void 0 : _a2.label) || "label";
+        const label = ((_e = componentProps == null ? void 0 : componentProps.fieldNames) == null ? void 0 : _e.label) || "label";
         componentProps = Object.assign({}, componentProps, {
           showSearch: true,
           filterOption: (input, option) => {
@@ -30067,6 +30067,8 @@ const ShyTag = /* @__PURE__ */ vue.defineComponent({
       ...props2.fieldNames
     }));
     vue.watch(() => props2.options, (val) => {
+      if (!(val == null ? void 0 : val.length))
+        return;
       optionsRef.value = vue.unref(val);
     }, {
       immediate: true,
@@ -30079,10 +30081,12 @@ const ShyTag = /* @__PURE__ */ vue.defineComponent({
     }, {
       immediate: true
     });
-    const tag2 = vue.computed(() => vue.unref(optionsRef).find((item) => item[vue.unref(fieldNames).value] == props2.value) ?? {
-      [vue.unref(fieldNames).label]: "-",
-      [vue.unref(fieldNames).color]: "var(--gray-5)",
-      [vue.unref(fieldNames).css]: ""
+    const tag2 = vue.computed(() => {
+      return vue.unref(optionsRef).find((item) => item[vue.unref(fieldNames).value] == props2.value) ?? {
+        [vue.unref(fieldNames).label]: "-",
+        [vue.unref(fieldNames).color]: "var(--gray-5)",
+        [vue.unref(fieldNames).css]: ""
+      };
     });
     const renderTag = vue.computed(() => {
       const [isTag, tagMode] = [props2.isTag, props2.tagMode];
@@ -49288,6 +49292,7 @@ const CustomCollapse = /* @__PURE__ */ vue.defineComponent({
       "onUpdate:activeKey": ($event) => collapseActiveKey.value = $event
     }, {
       default: () => [vue.createVNode(antDesignVue.Collapse.Panel, {
+        "forceRender": true,
         "key": field
       }, {
         default: () => [props2 == null ? void 0 : props2.renderGroup(componentProps == null ? void 0 : componentProps.schemas)],
@@ -49324,49 +49329,72 @@ const Descriptions = /* @__PURE__ */ vue.defineComponent({
       };
     });
     const handleValuePrecision = (item, data) => {
-      var _a2;
-      return slots[`${item.field}Value`] ? (_a2 = slots[`${item.field}Value`]) == null ? void 0 : _a2.call(slots, {
-        model: data,
-        field: data[`${item.field}`]
-      }) : getProps.value.summaryTotalFields.includes(item.field) && utils$1.isNumber(+data[`${item.field}`]) && !isNaN(+data[`${item.field}`]) ? (+data[`${item.field}`]).toFixed(getProps.value.summaryPrecision).replace(/\d(?=(?:\d{3})+(?:\.|$))/g, (match, offset2, string3) => {
+      return getProps.value.summaryTotalFields.includes(item.field) && utils$1.isNumber(+data[`${item.field}`]) && !isNaN(+data[`${item.field}`]) ? (+data[`${item.field}`]).toFixed(getProps.value.summaryPrecision).replace(/\d(?=(?:\d{3})+(?:\.|$))/g, (match, offset2, string3) => {
         return match + (string3.charAt(offset2 + 1) === "." || offset2 === string3.length - 1 ? "" : ",");
       }) : data[`${item.field}`];
     };
     emit("register", {
       setDescProps
     });
-    const transformValue = (item) => {
-      const {
-        field,
-        componentProps: comProps,
-        component
-      } = item;
-      const componentProps = utils$1.isFunction(comProps) ? comProps({
-        formModel: vue.unref(getValues)
-      }) : comProps;
-      const {
-        data,
-        summaryTotalFields
-      } = vue.unref(getProps);
-      if ((summaryTotalFields == null ? void 0 : summaryTotalFields.length) && summaryTotalFields.includes(field)) {
-        return handleValuePrecision(item, data);
-      } else if ((componentProps == null ? void 0 : componentProps.options) || (componentProps == null ? void 0 : componentProps.api)) {
-        let options = [];
-        if (Array.isArray(componentProps.options)) {
-          options = treeToList(componentProps.options);
+    const transformValue = vue.computed(() => {
+      return (item) => {
+        var _a2;
+        const {
+          field,
+          componentProps: comProps,
+          component,
+          label
+        } = item;
+        const {
+          data,
+          summaryTotalFields
+        } = vue.unref(getProps);
+        const componentProps = utils$1.isFunction(comProps) ? (
+          // @ts-ignore
+          comProps({
+            formModel: data
+          })
+        ) : comProps;
+        if (slots[`${item.field}Value`]) {
+          return (_a2 = slots[`${item.field}Value`]) == null ? void 0 : _a2.call(slots, {
+            model: data,
+            field: data[`${item.field}`]
+          });
+        }
+        if ((summaryTotalFields == null ? void 0 : summaryTotalFields.length) && summaryTotalFields.includes(field)) {
+          return handleValuePrecision(item, data);
+        }
+        if ((componentProps == null ? void 0 : componentProps.options) || (componentProps == null ? void 0 : componentProps.api)) {
+          let options = [];
+          if (Array.isArray(componentProps.options)) {
+            options = treeToList(componentProps.options);
+          }
+          return vue.createVNode(ShyTag, vue.mergeProps({
+            "value": data[`${field}`]
+          }, componentProps, {
+            "options": options
+          }), null);
+        }
+        if (["DatePicker", "MonthPicker", "RangePicker", "WeekPicker", "TimePicker"].includes(component)) {
+          if (!data[`${field}`])
+            return "";
+          return dayjs$1(data[`${field}`]).format((componentProps == null ? void 0 : componentProps.valueFormat) || "YYYY-MM-DD");
+        }
+        if (component === "Table") {
+          return vue.createVNode(ShyFormTable, vue.mergeProps(componentProps, {
+            "isShowAddBtn": false,
+            "isShowAction": false,
+            "value": data[`${field}`]
+          }), null);
+        }
+        if (component === "Divider") {
+          return vue.createVNode(Divider, componentProps, _isSlot(label) ? label : {
+            default: () => [label]
+          });
         }
-        return vue.createVNode(ShyTag, vue.mergeProps({
-          "value": data[`${field}`]
-        }, componentProps, {
-          "options": options
-        }), null);
-      } else if (["DatePicker", "MonthPicker", "RangePicker", "WeekPicker", "TimePicker"].includes(component)) {
-        if (!data[`${field}`])
-          return "";
-        return dayjs$1(data[`${field}`]).format((componentProps == null ? void 0 : componentProps.valueFormat) || "YYYY-MM-DD");
-      } else
         return data[`${field}`];
-    };
+      };
+    });
     const renderValue = (item) => {
       var _a2;
       const {
@@ -49388,12 +49416,13 @@ const Descriptions = /* @__PURE__ */ vue.defineComponent({
         return render3(vue.unref(getValues)(item));
       } else {
         const contentStyles = {
+          overflow: "hidden",
           ...vue.unref(getProps).contentStyle,
           ...contentStyle
         };
         return vue.createVNode("div", {
           "style": contentStyles
-        }, [transformValue(item)]);
+        }, [vue.unref(transformValue)(item)]);
       }
     };
     const labelAlignCss = vue.computed(() => {
@@ -49515,7 +49544,7 @@ const Descriptions = /* @__PURE__ */ vue.defineComponent({
       }), [[vue.vShow, isShow]]);
     };
     const renderSchema = (group) => {
-      var _a2, _b;
+      var _a2, _b, _c;
       if (utils$1.isArray(group)) {
         let _slot2;
         const props3 = pick$1(vue.unref(getProps), ["bordered"]);
@@ -49537,10 +49566,10 @@ const Descriptions = /* @__PURE__ */ vue.defineComponent({
       const componentProps = utils$1.isFunction(comProps) ? (
         // @ts-ignore
         comProps({
-          formModel: vue.unref(getValues)
+          formModel: (_a2 = vue.unref(getProps)) == null ? void 0 : _a2.data
         })
       ) : comProps;
-      const realSpan = ((colProps2 == null ? void 0 : colProps2.span) || ((_b = (_a2 = vue.unref(getProps)) == null ? void 0 : _a2.baseColProps) == null ? void 0 : _b.span) || basicColProps) / basicRowProps;
+      const realSpan = ((colProps2 == null ? void 0 : colProps2.span) || ((_c = (_b = vue.unref(getProps)) == null ? void 0 : _b.baseColProps) == null ? void 0 : _c.span) || basicColProps) / basicRowProps;
       const style2 = {
         [`--col-span`]: `${realSpan * 100}%`,
         [`--w-gap`]: `${realSpan * basicGap}px`
@@ -49561,7 +49590,10 @@ const Descriptions = /* @__PURE__ */ vue.defineComponent({
             "style": style2,
             "class": `${prefixCls2}-group`
           }, [vue.createVNode(CustomCollapse, {
-            "schema": group,
+            "schema": {
+              ...group,
+              componentProps
+            },
             "renderGroup": renderGroup
           }, null)]), [[vue.vShow, isShow]]);
         case "Custom":
@@ -49586,10 +49618,18 @@ const Descriptions = /* @__PURE__ */ vue.defineComponent({
       if (!utils$1.isArray(schemas))
         return [];
       return schemas.reduce((prev2, curr) => {
-        if (curr.component && curr.component === "Group") {
+        if ((curr == null ? void 0 : curr.component) === "Group") {
           prev2.push(curr);
           return prev2;
         }
+        if ((curr == null ? void 0 : curr.component) === "Divider") {
+          prev2.push(merge$2(curr, {
+            componentProps: {
+              groupType: "Divider"
+            }
+          }));
+          return prev2;
+        }
         if (!utils$1.isArray(prev2[prev2.length - 1])) {
           prev2.push([]);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.223",
+  "version": "3.0.0-next.225",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",