hy-dispatch-ui-v3 0.2.66 → 0.2.68

package/es/components/hyForm/cpns/arrayItem.vue.mjs

@@ -1,13 +1,11 @@
-import { computed, useTemplateRef, ref, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, renderSlot, unref, toDisplayString, createBlock, withCtx, createVNode, createCommentVNode, normalizeStyle, Fragment, renderList, createSlots, mergeProps } from 'vue';
+import { computed, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, renderSlot, unref, toDisplayString, createBlock, withCtx, createVNode, createCommentVNode, normalizeStyle, Fragment, renderList, createSlots, mergeProps } from 'vue';
 import { ElIcon } from 'element-plus';
 import { Delete, Top, Bottom, CirclePlus } from '@element-plus/icons-vue';
-import '../../../hooks/index.mjs';
 import '../../index.mjs';
 import '../../../utils/index.mjs';
 import { isRequired, columnHelpHandler, renderArrayItemLabel, renderAddLabel } from '../js/index.mjs';
 import _sfc_main$1 from './formItem.vue.mjs';
 import { resetAppFormValue } from '../js/useAppForm.mjs';
-import { useLocale } from '../../../hooks/useLocale.mjs';
 import { setValueByProp, getValueByProp } from '../../../utils/form.mjs';
 import { isNumber, isArray } from '../../../utils/is.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
@@ -50,7 +48,6 @@ const _sfc_main = {
   },
   setup(__props) {
     const props = __props;
-    const { t } = useLocale();
     const bindValue = computed({
       get() {
         const prop = props.column.field;
@@ -61,20 +58,6 @@ const _sfc_main = {
         setValueByProp(props.model, prop, val);
       }
     });
-    const containerRef = useTemplateRef("containerRef");
-    const containerHeight = ref(0);
-    const isExpand = ref(false);
-    const isExpandHover = ref(null);
-    function onExpandHandler(column) {
-      containerHeight.value = containerRef.value.clientHeight;
-      isExpand.value = !isExpand.value;
-    }
-    function onExpandMouseenter(column) {
-      isExpandHover.value = true;
-    }
-    function onExpandMouseleave(column) {
-      isExpandHover.value = false;
-    }
     const containerStyle = computed(() => {
       const columnNum = isNumber(props.column.columnNum) && props.column.columnNum > 0 ? props.column.columnNum : isNumber(props.columnNum) && props.columnNum > 0 ? props.columnNum || 1 : 1;
       return {
@@ -157,8 +140,10 @@ const _sfc_main = {
         createElementVNode(
           "div",
           {
-            class: "overflow-y-auto scroll-body",
-            style: normalizeStyle({ maxHeight: `${__props.column.height || 500}px` })
+            class: normalizeClass({ "overflow-y-auto scroll-body": __props.column.height > 0 }),
+            style: normalizeStyle({
+              maxHeight: __props.column.height > 0 ? `${__props.column.height}px` : void 0
+            })
           },
           [
             (openBlock(true), createElementBlock(
@@ -169,7 +154,7 @@ const _sfc_main = {
                   "div",
                   {
                     key: index,
-                    class: normalizeClass(["bg-background-2 rounded-[6px] border border-border my-1.5", [__props.size === "small" ? "px-4 pt-2" : " pt-3 px-5"]])
+                    class: normalizeClass(["bg-background-2 rounded-[6px] border border-border my-1.5 box-border", [__props.size === "small" ? "px-4 pt-2" : " pt-3 px-5"]])
                   },
                   [
                     createElementVNode("div", { class: "flex items-center min-h-[36px]" }, [
@@ -187,7 +172,7 @@ const _sfc_main = {
                         }, () => [
                           createElementVNode(
                             "span",
-                            { class: "text-auxiliary" },
+                            { class: "text-auxiliary whitespace-nowrap" },
                             toDisplayString(unref(renderArrayItemLabel)(props, __props.column, index)),
                             1
                             /* TEXT */
@@ -197,7 +182,7 @@ const _sfc_main = {
                       createElementVNode("div", { class: "flex items-center gap-3 ml-auto" }, [
                         bindValue.value.length > 1 || props.column.emptyChildren ? (openBlock(), createElementBlock("div", {
                           key: 0,
-                          class: "clickBox bg-background py-0.5 px-1.5 rounded",
+                          class: "clickBox bg-background py-0.5 px-1.5 rounded box-border",
                           onClick: ($event) => onDeleteItemHandler(index)
                         }, [
                           createVNode(unref(ElIcon), {
@@ -245,9 +230,6 @@ const _sfc_main = {
                     createElementVNode(
                       "div",
                       {
-                        ref_for: true,
-                        ref_key: "containerRef",
-                        ref: containerRef,
                         class: "grid gap-x-6",
                         style: normalizeStyle(containerStyle.value)
                       },
@@ -298,8 +280,8 @@ const _sfc_main = {
               /* KEYED_FRAGMENT */
             ))
           ],
-          4
-          /* STYLE */
+          6
+          /* CLASS, STYLE */
         ),
         createElementVNode("div", { class: "flex justify-center mt-2.5" }, [
           createElementVNode("span", {

package/es/components/hyForm/cpns/arrayItem2.vue.mjs

@@ -0,0 +1,198 @@
+import { useTemplateRef, ref, computed, onBeforeUnmount, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, createBlock, createSlots, withCtx, renderSlot, mergeProps, createVNode, unref, toDisplayString } from 'vue';
+import '../../index.mjs';
+import '../../../utils/index.mjs';
+import '../../../hooks/index.mjs';
+import { renderAddLabel } from '../js/index.mjs';
+import _sfc_main$1 from './formItem.vue.mjs';
+import { resetAppFormValue } from '../js/useAppForm.mjs';
+import { useResizeObserver } from '../../../hooks/useResizeObserver.mjs';
+import { setValueByProp, getValueByProp } from '../../../utils/form.mjs';
+import { isNumber, isArray } from '../../../utils/is.mjs';
+import { HyIcon } from '../../hyIcon/index.mjs';
+
+const _sfc_main = {
+  __name: "arrayItem2",
+  props: {
+    model: {
+      type: Object,
+      default: () => ({})
+    },
+    column: {
+      type: Object,
+      default: () => ({})
+    },
+    rules: {
+      type: Object,
+      default: () => ({})
+    },
+    columnNum: {
+      type: Number,
+      default: 1
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    size: {
+      type: String,
+      default: "default"
+    }
+  },
+  setup(__props) {
+    const props = __props;
+    const arrayItemRef = useTemplateRef("arrayItemRef");
+    const { removeResize } = useResizeObserver(arrayItemRef, () => {
+      if (arrayItemRef.value) {
+        clientHeight.value = arrayItemRef.value.clientHeight;
+      }
+    });
+    const clientHeight = ref(0);
+    const bindValue = computed({
+      get() {
+        const prop = props.column.field;
+        return getValueByProp(props.model, prop);
+      },
+      set(val) {
+        const prop = props.column.field;
+        setValueByProp(props.model, prop, val);
+      }
+    });
+    const containerStyle = computed(() => {
+      const columnNum = isNumber(props.column.columnNum) && props.column.columnNum > 0 ? props.column.columnNum : isNumber(props.columnNum) && props.columnNum > 0 ? props.columnNum || 1 : 1;
+      return {
+        gridTemplateColumns: `repeat(${columnNum}, minmax(0, 1fr))`
+      };
+    });
+    function onAddItemHandler() {
+      if (!isArray(bindValue.value)) {
+        bindValue.value = [];
+      }
+      bindValue.value.push(resetAppFormValue(props.column.children));
+    }
+    function onDeleteItemHandler(index) {
+      bindValue.value.splice(index, 1);
+    }
+    onBeforeUnmount(() => {
+      removeResize && removeResize();
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock(
+        "div",
+        {
+          ref_key: "arrayItemRef",
+          ref: arrayItemRef
+        },
+        [
+          createElementVNode(
+            "div",
+            {
+              class: "absolute w-full bg-background-2 left-0",
+              style: normalizeStyle({ height: clientHeight.value ? `${clientHeight.value}px` : void 0 })
+            },
+            null,
+            4
+            /* STYLE */
+          ),
+          createElementVNode("div", { class: "py-3" }, [
+            (openBlock(true), createElementBlock(
+              Fragment,
+              null,
+              renderList(bindValue.value, (item, index) => {
+                return openBlock(), createElementBlock("div", {
+                  key: index,
+                  class: "relative"
+                }, [
+                  createElementVNode(
+                    "div",
+                    {
+                      class: "grid gap-x-6",
+                      style: normalizeStyle(containerStyle.value)
+                    },
+                    [
+                      (openBlock(true), createElementBlock(
+                        Fragment,
+                        null,
+                        renderList(__props.column.children, (citem, cindex) => {
+                          return openBlock(), createBlock(_sfc_main$1, {
+                            key: cindex,
+                            model: item,
+                            column: citem,
+                            rules: __props.rules,
+                            "parent-prop": __props.column.field,
+                            index,
+                            loading: __props.loading,
+                            size: __props.size,
+                            disabled: __props.disabled,
+                            readonly: __props.readonly,
+                            level: 3
+                          }, createSlots({
+                            _: 2
+                            /* DYNAMIC */
+                          }, [
+                            renderList(_ctx.$slots, (_, slotName) => {
+                              return {
+                                name: slotName,
+                                fn: withCtx((scope) => [
+                                  renderSlot(_ctx.$slots, slotName, mergeProps({ ref_for: true }, scope))
+                                ])
+                              };
+                            })
+                          ]), 1032, ["model", "column", "rules", "parent-prop", "index", "loading", "size", "disabled", "readonly"]);
+                        }),
+                        128
+                        /* KEYED_FRAGMENT */
+                      ))
+                    ],
+                    4
+                    /* STYLE */
+                  ),
+                  createElementVNode("div", {
+                    class: "w-[32px] h-[32px] flex items-center justify-center bg-[rgba(var(--hy-danger-2),0.2)] clickBox rounded absolute top-[32px] -right-2 transform translate-x-full",
+                    onClick: ($event) => onDeleteItemHandler(index)
+                  }, [
+                    createVNode(unref(HyIcon), {
+                      "svg-name": "ops-linear-delete",
+                      class: "!w-5 !h-5 text-danger-2"
+                    })
+                  ], 8, ["onClick"])
+                ]);
+              }),
+              128
+              /* KEYED_FRAGMENT */
+            )),
+            createElementVNode("div", { class: "flex items-center" }, [
+              createElementVNode("span", {
+                onClick: ($event) => onAddItemHandler(),
+                class: "flex items-center justify-center clickBox text-success text-xs"
+              }, [
+                createVNode(unref(HyIcon), {
+                  "svg-name": "ops-button-add",
+                  class: "!w-3 !h-3"
+                }),
+                createElementVNode(
+                  "span",
+                  { style: { "margin-left": "6px" } },
+                  toDisplayString(unref(renderAddLabel)(props, __props.column)),
+                  1
+                  /* TEXT */
+                )
+              ], 8, ["onClick"])
+            ])
+          ])
+        ],
+        512
+        /* NEED_PATCH */
+      );
+    };
+  }
+};
+
+export { _sfc_main as default };

package/es/components/hyForm/cpns/extraItem.vue.mjs

@@ -4,8 +4,8 @@ import { DArrowRight } from '@element-plus/icons-vue';
 import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
 import _sfc_main$1 from './formItem.vue.mjs';
-import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isNumber } from '../../../utils/is.mjs';
+import { $t } from '../../../hooks/useLocale.mjs';
 
 const _sfc_main = {
   __name: "extraItem",
@@ -45,7 +45,6 @@ const _sfc_main = {
   },
   setup(__props) {
     const props = __props;
-    const { t } = useLocale();
     const containerRef = useTemplateRef("containerRef");
     const containerHeight = ref(0);
     const isExpand = ref(false);
@@ -88,7 +87,7 @@ const _sfc_main = {
             createElementVNode(
               "span",
               { class: "ml-1.5" },
-              toDisplayString(isExpandHover.value ? unref(t)("form.additionalInformationHoverTip") : unref(t)("form.additionalInformationTip")),
+              toDisplayString(isExpandHover.value ? unref($t)("form.additionalInformationHoverTip") : unref($t)("form.additionalInformationTip")),
               1
               /* TEXT */
             )