hy-dispatch-ui-v3 0.2.52 → 0.2.54

package/dist/tailwind.css

@@ -148,6 +148,18 @@
   }
 }
 
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border-width: 0;
+}
+
 .visible {
   visibility: visible;
 }
@@ -452,6 +464,10 @@
   height: 12px !important;
 }
 
+.\!h-\[18px\] {
+  height: 18px !important;
+}
+
 .\!h-\[20px\] {
   height: 20px !important;
 }
@@ -484,6 +500,10 @@
   height: 0.125rem;
 }
 
+.h-1 {
+  height: 0.25rem;
+}
+
 .h-1\.5 {
   height: 0.375rem;
 }
@@ -644,6 +664,10 @@
   width: 0.125rem;
 }
 
+.w-1 {
+  width: 0.25rem;
+}
+
 .w-1\.5 {
   width: 0.375rem;
 }
@@ -783,6 +807,10 @@
   cursor: pointer;
 }
 
+.cursor-wait {
+  cursor: wait;
+}
+
 .select-none {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -1048,6 +1076,10 @@
   padding: 0px !important;
 }
 
+.p-1 {
+  padding: 0.25rem;
+}
+
 .p-5 {
   padding: 1.25rem;
 }
@@ -1329,6 +1361,12 @@
   text-decoration-line: underline;
 }
 
+.shadow {
+  --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+  --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
+
 .shadow-\[0_0_4px_0\] {
   --tw-shadow: 0 0 4px 0;
   --tw-shadow-colored: 0 0 4px 0 var(--tw-shadow-color);
@@ -1372,6 +1410,21 @@
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
 
+.grayscale {
+  --tw-grayscale: grayscale(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+
+.invert {
+  --tw-invert: invert(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+
+.sepia {
+  --tw-sepia: sepia(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+
 .filter {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }

package/es/components/hyBatchUploadDialog/batchUploadDialog.vue.mjs

@@ -1,10 +1,10 @@
-import { defineComponent, useTemplateRef, useModel, ref, openBlock, createBlock, unref, mergeProps, createSlots, withCtx, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode, createVNode, createTextVNode, toDisplayString, createElementBlock, mergeModels } from 'vue';
+import { defineComponent, useTemplateRef, useModel, ref, openBlock, createBlock, unref, mergeProps, createSlots, withCtx, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode, createTextVNode, createVNode, toDisplayString, createElementBlock, createElementVNode, mergeModels } from 'vue';
 import { ElIcon } from 'element-plus';
 import { Warning } from '@element-plus/icons-vue';
 import { HyDialog } from '../hyDialog/index.mjs';
 import { HyBatchTableForm } from '../hyTableForm/index.mjs';
-import { HyTooltip } from '../hyTooltip/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
+import { HyTooltip } from '../hyTooltip/index.mjs';
 
 import "./style/batchUploadDialog.scss";
 
@@ -100,11 +100,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const emits = __emit;
     const batchTableFormRef = useTemplateRef("batchTableFormRef");
     const visible = useModel(__props, "modelValue");
-    const showSubmit = ref(false);
+    const HyDialogRef = useTemplateRef("HyDialogRef");
+    const currentStep = ref(1);
     const isSubmitting = ref(false);
+    const totalElements = ref(0);
     const failedCount = ref(0);
     const failedStatus = ref(null);
-    const HyDialogRef = useTemplateRef("HyDialogRef");
     function setDragLevelIndex(dragLevel) {
       HyDialogRef.value.setDragLevelIndex(dragLevel);
     }
@@ -115,26 +116,26 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       emits("onDialogMousedown", e);
     }
     async function show() {
-      visible.value = true;
-      showSubmit.value = false;
+      currentStep.value = 1;
       failedCount.value = 0;
+      totalElements.value = 0;
       failedStatus.value = null;
+      visible.value = true;
     }
     function onTableUploadingHandler(...args) {
       emits("uploading", ...args);
     }
     function onTableUploadedHandler(...args) {
-      showSubmit.value = true;
       emits("uploaded", ...args);
     }
     function onTableResetHandler(...args) {
       failedCount.value = 0;
       failedStatus.value = null;
-      showSubmit.value = false;
       emits("reset", ...args);
     }
     function onTableValidateHandler(params) {
       const { row, prop, isValid, message, total, success, failed } = params;
+      totalElements.value = total;
       failedCount.value = failed;
       failedStatus.value = !failed ? null : failedStatus.value || "validate";
       emits("validate", params);
@@ -156,10 +157,18 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       isSubmitting.value = false;
       emits("submit", params);
     }
+    function onNextStep() {
+      batchTableFormRef.value.nextStep();
+    }
     async function onSubmitHandler() {
       const res = await batchTableFormRef.value.validate();
       if (props.uploadType === "custom") {
-        return { ...res, result: res.total === res.success };
+        const dataSource = batchTableFormRef.value.getTableDataSource();
+        onTableSubmitHandler({
+          ...res,
+          result: res.total === res.success,
+          dataSource
+        });
       } else {
         batchTableFormRef.value.submitDataSource();
       }
@@ -225,11 +234,34 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               1
               /* TEXT */
             ))
+          ])) : currentStep.value === 2 && !totalElements.value ? (openBlock(), createElementBlock("div", {
+            key: 1,
+            class: "flex items-center gap-1.5 text-xs text-warning"
+          }, [
+            createVNode(unref(ElIcon), null, {
+              default: withCtx(() => [
+                createVNode(unref(Warning))
+              ]),
+              _: 1
+              /* STABLE */
+            }),
+            createElementVNode("span", null, "\u5F53\u524D\u672A\u5BFC\u5165\u6570\u636E\uFF0C\u8BF7\u60A8\u5BFC\u5165\u6DFB\u52A0\u6570\u636E")
           ])) : createCommentVNode("v-if", true)
         ]),
         "operate-right-box": withCtx(() => [
-          showSubmit.value ? (openBlock(), createBlock(unref(HyTooltip), {
+          currentStep.value === 1 ? (openBlock(), createBlock(unref(HyButton), {
             key: 0,
+            type: "primary",
+            class: "!min-w-[120px]",
+            onClick: onNextStep
+          }, {
+            default: withCtx(() => [
+              createTextVNode("\u8FDB\u5165\u6DFB\u52A0")
+            ]),
+            _: 1
+            /* STABLE */
+          })) : currentStep.value === 2 ? (openBlock(), createBlock(unref(HyTooltip), {
+            key: 1,
             disabled: !isSubmitting.value,
             content: "\u6570\u636E\u6B63\u5728\u5BFC\u5165\u4E2D\uFF0C\u8BF7\u7A0D\u7B49"
           }, {
@@ -260,6 +292,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             key: 0,
             ref_key: "batchTableFormRef",
             ref: batchTableFormRef,
+            step: currentStep.value,
+            "onUpdate:step": ($event) => currentStep.value = $event,
             tableColumns: __props.tableColumns,
             formColumns: __props.formColumns,
             rules: __props.rules,
@@ -288,7 +322,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ])
               };
             })
-          ]), 1032, ["tableColumns", "formColumns", "rules", "emptyText", "fontSize", "rowClickExpand", "columnNum", "size", "beforeDataHandle", "submit-handler"])) : createCommentVNode("v-if", true)
+          ]), 1032, ["step", "onUpdate:step", "tableColumns", "formColumns", "rules", "emptyText", "fontSize", "rowClickExpand", "columnNum", "size", "beforeDataHandle", "submit-handler"])) : createCommentVNode("v-if", true)
         ]),
         _: 2
         /* DYNAMIC */

package/es/components/hyConfirmDialog/confirmDialog.vue.mjs

@@ -1,7 +1,7 @@
-import { defineComponent, useModel, ref, openBlock, createBlock, unref, mergeProps, withCtx, createElementVNode, createVNode, normalizeClass, toDisplayString, createElementBlock, createTextVNode, createCommentVNode, withModifiers, mergeModels } from 'vue';
-import { ElDialog, ElIcon } from 'element-plus';
-import { Warning, CircleClose } from '@element-plus/icons-vue';
+import { defineComponent, useModel, ref, openBlock, createBlock, unref, mergeProps, withCtx, createElementVNode, createCommentVNode, createVNode, normalizeStyle, normalizeClass, toDisplayString, createElementBlock, createTextVNode, withModifiers, mergeModels } from 'vue';
+import { ElDialog } from 'element-plus';
 import { useLocale } from '../../hooks/useLocale.mjs';
+import { HyIcon } from '../hyIcon/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
 
 const __default__ = defineComponent({
@@ -157,15 +157,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 onClick: onCloseHandler
               },
               [
-                createVNode(unref(ElIcon), {
-                  size: "18",
-                  color: "rgb(var(--hy-danger-2))"
-                }, {
-                  default: withCtx(() => [
-                    createVNode(unref(CircleClose))
-                  ]),
-                  _: 1
-                  /* STABLE */
+                createVNode(unref(HyIcon), {
+                  "svg-name": "layout-dialog-close-v2",
+                  "class-name": "!w-[18px] !h-[18px]"
                 })
               ],
               2
@@ -176,16 +170,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         default: withCtx(() => [
           createElementVNode("div", { class: "flex flex-col items-center justify-between pt-[37px] pb-[27px]" }, [
             createElementVNode("div", { class: "flex flex-col items-center text-main" }, [
-              createVNode(unref(ElIcon), {
-                size: "40",
-                color: __props.iconColor
-              }, {
-                default: withCtx(() => [
-                  createVNode(unref(Warning))
-                ]),
-                _: 1
-                /* STABLE */
-              }, 8, ["color"]),
+              createCommentVNode(' <el-icon size="40" :color="iconColor"><Warning /></el-icon> '),
+              createVNode(unref(HyIcon), {
+                "svg-name": "dispatch-share1-prompt",
+                class: "!w-[40px] !h-[40px]",
+                style: normalizeStyle({ color: __props.iconColor })
+              }, null, 8, ["style"]),
               createElementVNode(
                 "div",
                 {

package/es/components/hyDialog/dialog.vue.mjs

@@ -221,13 +221,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   class: normalizeClass(["box-border w-full border-0 border-b border-solid border-background-3 px-4 py-[10px] text-main text-sm font-bold flex justify-between items-center relative", { "!justify-center": __props.titleAlign === "center" }])
                 },
                 [
-                  createElementVNode(
-                    "div",
-                    { class: "flex-grow w-0 mr-2 over_one_line" },
-                    toDisplayString(__props.title),
-                    1
-                    /* TEXT */
-                  ),
+                  createElementVNode("div", { class: "flex-grow w-0 mr-2 over_one_line" }, [
+                    renderSlot(_ctx.$slots, "title", {}, () => [
+                      createTextVNode(
+                        toDisplayString(__props.title),
+                        1
+                        /* TEXT */
+                      )
+                    ])
+                  ]),
                   createElementVNode("div", { class: "text-lg cursor-pointer" }, [
                     renderSlot(_ctx.$slots, "title-operate-box"),
                     __props.ifShrink ? (openBlock(), createBlock(unref(HyIcon), {

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

@@ -1,13 +1,12 @@
 import { computed, useTemplateRef, ref, 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 { isRequired, renderArrayItemLabel, renderAddLabel } from '../js/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 { funRunHandler } from '../../../utils/handler.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
 
 const _sfc_main = {
@@ -105,11 +104,11 @@ const _sfc_main = {
                   /* TEXT */
                 )
               ]),
-              unref(funRunHandler)(__props.column.help) ? (openBlock(), createBlock(unref(HyTooltip), {
+              unref(columnHelpHandler)(props, __props.column) ? (openBlock(), createBlock(unref(HyTooltip), {
                 key: 0,
                 "is-always": "",
                 overLine: 1,
-                content: unref(funRunHandler)(__props.column.help)
+                content: unref(columnHelpHandler)(props, __props.column)
               }, {
                 default: withCtx(() => [
                   createVNode(unref(ElIcon), {
@@ -252,6 +251,7 @@ const _sfc_main = {
                               "parent-prop": __props.column.field,
                               index,
                               loading: __props.loading,
+                              size: __props.size,
                               disabled: __props.disabled,
                               readonly: __props.readonly,
                               level: 3
@@ -267,7 +267,7 @@ const _sfc_main = {
                                   ])
                                 };
                               })
-                            ]), 1032, ["model", "column", "rules", "parent-prop", "index", "loading", "disabled", "readonly"]);
+                            ]), 1032, ["model", "column", "rules", "parent-prop", "index", "loading", "size", "disabled", "readonly"]);
                           }),
                           128
                           /* KEYED_FRAGMENT */

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

@@ -35,6 +35,10 @@ const _sfc_main = {
     readonly: {
       type: Boolean,
       default: false
+    },
+    size: {
+      type: String,
+      default: "default"
     }
   },
   setup(__props) {
@@ -114,6 +118,7 @@ const _sfc_main = {
                       model: __props.model,
                       column: item,
                       rules: __props.rules,
+                      size: __props.size,
                       loading: __props.loading,
                       disabled: __props.disabled,
                       readonly: __props.readonly
@@ -129,7 +134,7 @@ const _sfc_main = {
                           ])
                         };
                       })
-                    ]), 1032, ["model", "column", "rules", "loading", "disabled", "readonly"]);
+                    ]), 1032, ["model", "column", "rules", "size", "loading", "disabled", "readonly"]);
                   }),
                   128
                   /* KEYED_FRAGMENT */

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

@@ -1,10 +1,9 @@
-import { computed, unref, openBlock, createBlock, normalizeStyle, withCtx, createCommentVNode, createElementVNode, renderSlot, toDisplayString, createElementBlock, createVNode, normalizeClass, Fragment, mergeProps } from 'vue';
+import { useTemplateRef, computed, unref, openBlock, createBlock, normalizeStyle, withCtx, createCommentVNode, createElementVNode, renderSlot, toDisplayString, createElementBlock, createVNode, normalizeClass, Fragment, mergeProps } from 'vue';
 import { ElFormItem, ElIcon, ElSelect, ElRadioGroup, ElCheckboxGroup, ElSwitch, ElInputNumber } from 'element-plus';
 import { QuestionFilled } from '@element-plus/icons-vue';
-import { columnShowHandler, columnItemStyle, isRequired, renderText, isDisabled, optionsHandler } from '../js/index.mjs';
+import { columnShowHandler, columnItemStyle, isRequired, columnHelpHandler, isReadonly, renderText, isDisabled, optionsHandler } from '../js/index.mjs';
 import { isArray } from '../../../utils/is.mjs';
-import { setValueByProp, getValueByProp } from '../../../utils/form.mjs';
-import { funRunHandler } from '../../../utils/handler.mjs';
+import { setValueByProp, getValueByProp, columnRuleHandler } from '../../../utils/form.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
 import { HyInput } from '../../hyInput/index.mjs';
 import { HyDatePicker } from '../../hyDatePicker/index.mjs';
@@ -47,10 +46,15 @@ const _sfc_main = {
     level: {
       type: Number,
       default: 2
+    },
+    size: {
+      type: String,
+      default: "default"
     }
   },
   setup(__props) {
     const props = __props;
+    const formItemRef = useTemplateRef("formItemRef");
     const columnProp = computed(() => {
       let field = isArray(props.column.field) ? props.column.field[0] : props.column.field;
       if (props.parentProp) {
@@ -78,7 +82,13 @@ const _sfc_main = {
         setValueByProp(props.model, prop, val);
       }
     });
-    function onChangeHandler(...args) {
+    function getColumnRuleHandler(column, model) {
+      if (!isRequired(props, column) && formItemRef.value) {
+        formItemRef.value.clearValidate();
+      }
+      return columnRuleHandler(column, model);
+    }
+    function onChangeHandler() {
       const { onChange } = props.column;
       if (!onChange) return;
       onChange(props.column, props.model);
@@ -86,8 +96,10 @@ const _sfc_main = {
     return (_ctx, _cache) => {
       return unref(columnShowHandler)(props, __props.column) ? (openBlock(), createBlock(unref(ElFormItem), {
         key: 0,
-        rules: __props.column.rules,
+        ref_key: "formItemRef",
+        ref: formItemRef,
         prop: columnProp.value,
+        rules: getColumnRuleHandler(__props.column, props.model),
         style: normalizeStyle(unref(columnItemStyle)(props, __props.column))
       }, {
         default: withCtx(() => [
@@ -111,11 +123,11 @@ const _sfc_main = {
                 key: 0,
                 class: "label-required"
               })) : createCommentVNode("v-if", true),
-              unref(funRunHandler)(__props.column.help) ? (openBlock(), createBlock(unref(HyTooltip), {
+              unref(columnHelpHandler)(props, __props.column) ? (openBlock(), createBlock(unref(HyTooltip), {
                 key: 1,
                 "is-always": "",
                 overLine: 1,
-                content: unref(funRunHandler)(__props.column.help)
+                content: unref(columnHelpHandler)(props, __props.column)
               }, {
                 default: withCtx(() => [
                   createVNode(unref(ElIcon), {
@@ -146,14 +158,14 @@ const _sfc_main = {
             ])) : createCommentVNode("v-if", true)
           ]),
           createCommentVNode(" \u5185\u5BB9\u4EC5\u67E5\u770B "),
-          __props.column.readonly || __props.readonly || !__props.column.type && !__props.column.slot ? (openBlock(), createElementBlock(
+          unref(isReadonly)(props, __props.column) || !__props.column.type && !__props.column.slot ? (openBlock(), createElementBlock(
             "div",
             {
               key: 0,
               class: normalizeClass(["w-full flex items-center text-main px-2", {
-                "min-h-[40px]": _ctx.size === "large",
-                "min-h-[32px]": _ctx.size === "default",
-                "min-h-[24px]": _ctx.size === "small",
+                "min-h-[40px]": __props.size === "large",
+                "min-h-[32px]": __props.size === "default",
+                "min-h-[24px]": __props.size === "small",
                 "bg-background": __props.level === 1,
                 "bg-background-2": __props.level === 2,
                 "bg-background-3": __props.level === 3,
@@ -320,7 +332,10 @@ const _sfc_main = {
                   createCommentVNode(" \u5F00\u5173 "),
                   createVNode(unref(ElSwitch), mergeProps({
                     modelValue: bindValue.value,
-                    "onUpdate:modelValue": ($event) => bindValue.value = $event
+                    "onUpdate:modelValue": ($event) => bindValue.value = $event,
+                    "inline-prompt": "",
+                    width: "80",
+                    style: { "--hy-el-switch-on-color": "#5ab95f", "--hy-el-switch-off-color": "rgba(var(--hy-background), 1)" }
                   }, __props.column.attrs, {
                     disabled: unref(isDisabled)(props, __props.column),
                     onChange: onChangeHandler
@@ -367,7 +382,7 @@ const _sfc_main = {
         ]),
         _: 3
         /* FORWARDED */
-      }, 8, ["rules", "prop", "style"])) : createCommentVNode("v-if", true);
+      }, 8, ["prop", "rules", "style"])) : createCommentVNode("v-if", true);
     };
   }
 };

package/es/components/hyForm/js/index.mjs

@@ -1,6 +1,7 @@
 import { unref } from 'vue';
 import { funRunHandler } from '../../../utils/handler.mjs';
-import { isNumber, isBoolean, isFunction, isArray, isObject } from '../../../utils/is.mjs';
+import { isNumber, isBoolean, isFunction, isArray, isObject, isString } from '../../../utils/is.mjs';
+import { columnRuleHandler, getValueByProp } from '../../../utils/form.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 
 function columnItemStyle(props, column) {
@@ -26,15 +27,29 @@ function columnShowHandler(props, column) {
   if (isFunction(show)) return show(column, props.model);
   return true;
 }
+function columnHelpHandler(props, column) {
+  const help = unref(column.help);
+  if (isString(help)) return help;
+  if (isFunction(help)) return help(column, props.model);
+  return;
+}
+function isReadonly(props, column) {
+  if (props.readonly) return props.readonly;
+  const readonly = unref(column.readonly);
+  if (isBoolean(readonly)) return readonly;
+  if (isFunction(readonly)) return readonly(column, props.model);
+  return false;
+}
 function isRequired(props, column) {
-  let { readonly, field, rules } = column;
-  if (props.readonly || readonly) {
+  let { field } = column;
+  let rules = columnRuleHandler(column, props.model);
+  if (isReadonly(props, column)) {
     return false;
   }
   if (Array.isArray(field)) {
     return field.find((key) => isRequired(props, { ...column, field: key }));
   }
-  rules = isArray(rules) && rules?.length || isObject(rules) ? rules : props.rules?.[field];
+  rules = isArray(rules) && rules?.length ? rules : props.rules?.[field];
   if (isArray(rules)) {
     return rules.some((item) => item.required);
   }
@@ -53,39 +68,28 @@ function isDisabled(props, column) {
 function renderText(props, column = {}) {
   const { type, field, customRender } = column;
   const { props: fieldNames } = column.attrs || {};
+  const columnValue = getValueByProp(props.model, field);
   if (customRender && typeof customRender === "function") {
     return customRender({
       column,
       model: props.model,
-      value: props.model[field]
+      value: columnValue
     });
   }
-  if (type === "range-picker") {
-    const [start, end] = field;
-    return props.model?.[start] ? `${props.model?.[start]} ~ ${props.model?.[end]}` : "";
-  }
-  if (type === "location") {
-    const [lon, lat] = field;
-    return [props.model[lon], props.model[lat]].filter(Boolean).join("\uFF0C");
-  }
   if (/^(select|radio|checkbox)$/.test(type)) {
     const optionList = optionsHandler(props, column);
     const target = optionList.find(
-      (item) => item[fieldNames.value] === props.model?.[field]
+      (item) => item[fieldNames.value] === columnValue
     );
-    return target?.[fieldNames.label] || props.model?.[field] || "";
-  }
-  if (/^dept-select(-all)?$/.test(type)) {
-    const dict = /^dept-select$/.test(type) ? deptTreeDict.value : deptTreeAllDict.value;
-    return dict[props.model?.[field]] || props.model?.[field] || "";
-  }
-  if (type === "area-select") {
-    return areaTreeDict.value[props.model?.[field]] || props.model?.[field] || "";
+    return target?.[fieldNames.label] || columnValue || "";
   }
   if (Array.isArray(field)) {
-    return field.map((key) => props.model?.[key] || "").filter(Boolean).join(" - ");
+    return field.map((key) => getValueByProp(props.model, key) || "").filter(Boolean).join(" - ");
+  }
+  if (type === "switch") {
+    return columnValue === column.attrs.activeValue ? column.attrs.activeText : column.attrs.inactiveText;
   }
-  return props.model?.[field] || props.model?.[field] || "";
+  return columnValue || "";
 }
 function renderArrayItemLabel(props, column, index) {
   const { t } = useLocale();
@@ -106,4 +110,4 @@ function optionsHandler(props, column) {
   return [];
 }
 
-export { columnItemStyle, columnShowHandler, isDisabled, isRequired, optionsHandler, renderAddLabel, renderArrayItemLabel, renderText };
+export { columnHelpHandler, columnItemStyle, columnShowHandler, isDisabled, isReadonly, isRequired, optionsHandler, renderAddLabel, renderArrayItemLabel, renderText };

package/es/components/hyForm/js/useAppForm.mjs

@@ -1,6 +1,6 @@
 import { unref, toRef } from 'vue';
 import { funRunHandler, mergeDeep } from '../../../utils/handler.mjs';
-import { isArray, isObject } from '../../../utils/is.mjs';
+import { isArray } from '../../../utils/is.mjs';
 import { genValueByProp } from '../../../utils/form.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 
@@ -32,34 +32,6 @@ const genPlaceholderHandler = (config) => {
   }
   return { placeholder, startPlaceholder, endPlaceholder };
 };
-const genRuleRequiredMsgHandler = (config) => {
-  const { t } = useLocale();
-  const { type, prop, label } = config || {};
-  if (!prop || !prop?.length) return "";
-  switch (type) {
-    case "input":
-    case "input-number":
-      return t("hy.pleaseEnterPlaceholder", [label]);
-    case "select":
-    case "radio":
-    case "checkbox":
-    case "date-picker":
-      return t("hy.pleaseSelectPlaceholder", [label]);
-    default:
-      return t("hy.cannotBeEmpty", [label]);
-  }
-};
-const rulesHandler = (config) => {
-  let { rules, required } = config || {};
-  rules = isArray(rules) ? [...rules] : isObject(rules) ? [rules] : [];
-  if (!rules.some((item) => item.required) && required) {
-    rules.unshift({
-      required: true,
-      message: genRuleRequiredMsgHandler(config)
-    });
-  }
-  return rules;
-};
 function appFormItemHandler(column = {}) {
   const label = genDefaultLabel(column);
   const { placeholder} = genPlaceholderHandler({ ...column, label });
@@ -71,7 +43,7 @@ function appFormItemHandler(column = {}) {
       field: column.prop,
       label,
       readonly: column.readonly || false,
-      rules: rulesHandler(column),
+      rules: column.rules,
       attrs
     }
   );
@@ -109,6 +81,17 @@ function appFormItemHandler(column = {}) {
       ...column,
       children: (column.children || []).map((item) => appFormItemHandler(item))
     };
+  } else if (/^switch$/.test(column.type)) {
+    column = {
+      ...column,
+      attrs: {
+        activeText: "\u5F00\u542F",
+        inactiveText: "\u5173\u95ED",
+        activeValue: true,
+        inactiveValue: false,
+        ...attrs
+      }
+    };
   }
   return column;
 }
@@ -122,6 +105,8 @@ const resetAppFormValue = (columns = [], obj = {}) => {
         const childValue = resetAppFormValue(item.children);
         obj[item.prop] = [childValue];
       }
+    } else if (item.type === "extra") {
+      resetAppFormValue(item.children, obj);
     } else if (Array.isArray(item.prop)) {
       for (let i = 0; i < item.prop.length; i++) {
         genValueByProp(