hy-dispatch-ui-v3 0.2.59 → 0.2.60

package/es/components/hyForm/form.vue.mjs

@@ -1,9 +1,10 @@
-import { defineComponent, useTemplateRef, computed, nextTick, unref, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeStyle, createCommentVNode, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, createVNode, createSlots, renderSlot } from 'vue';
+import { defineComponent, useTemplateRef, computed, ref, nextTick, unref, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeStyle, createCommentVNode, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, createVNode, createSlots, renderSlot } from 'vue';
 import { ElForm, ElDivider } from 'element-plus';
-import _sfc_main$3 from './cpns/formItem.vue.mjs';
+import _sfc_main$4 from './cpns/formItem.vue.mjs';
 import _sfc_main$1 from './cpns/extraItem.vue.mjs';
 import _sfc_main$2 from './cpns/arrayItem.vue.mjs';
-import { columnItemStyle, columnShowHandler } from './js/index.mjs';
+import _sfc_main$3 from './cpns/locationSelect.vue.mjs';
+import { columnShowHandler, columnItemStyle } from './js/index.mjs';
 import { resetAppFormValue } from './js/useAppForm.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { isArray, isNumber } from '../../utils/is.mjs';
@@ -49,7 +50,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       // 'large' | 'default' | 'small'
     }
   },
-  setup(__props, { expose: __expose }) {
+  emits: ["on-allMapSelect"],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const emit = __emit;
     const props = __props;
     const { t } = useLocale();
     const formTemplateRef = useTemplateRef("formTemplateRef");
@@ -69,6 +72,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         gridTemplateColumns: `repeat(${columnNum}, minmax(0, 1fr))`
       };
     });
+    const locationSelectRef = useTemplateRef("locationSelectRef");
+    const allMapSelect = ref(false);
+    function setMapSize() {
+      allMapSelect.value = !allMapSelect.value;
+      emit("on-allMapSelect", allMapSelect.value);
+    }
     __expose({
       validate: async (callback) => {
         await nextTick();
@@ -100,6 +109,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getField: async (fields) => {
         await nextTick();
         return unref(formTemplateRef).getField(fields);
+      },
+      setMarker: (latlng) => {
+        if (locationSelectRef.value) {
+          isArray(locationSelectRef.value) ? locationSelectRef.value.map((item) => item.setMarker(latlng)) : locationSelectRef.value.setMarker(latlng);
+        }
       }
       // setInitialValue: async (value) => {
       //   await nextTick()
@@ -121,7 +135,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           createElementVNode(
             "div",
             {
-              class: "hy-form-container",
+              class: "hy-form-container h-full",
               style: normalizeStyle(containerStyle.value)
             },
             [
@@ -138,29 +152,40 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     [
                       createCommentVNode(" \u6807\u9898 "),
                       column.type === "title" ? (openBlock(), createElementBlock(
-                        "div",
-                        {
-                          key: 0,
-                          class: normalizeClass(["w-full flex items-center text-theme whitespace-nowrap relative mb-3 mt-1", [__props.size === "small" ? "text-xs" : "text-sm"]]),
-                          style: normalizeStyle(unref(columnItemStyle)(props, column))
-                        },
+                        Fragment,
+                        { key: 0 },
                         [
-                          createElementVNode(
-                            "span",
-                            { class: "mr-2" },
-                            toDisplayString(column.label),
-                            1
-                            /* TEXT */
-                          ),
-                          createVNode(unref(ElDivider), {
-                            "content-position": "left",
-                            "border-style": "dashed",
-                            class: "border-[rgba(var(--hy-theme),0.5)] my-0"
-                          }),
-                          createElementVNode("div", { class: "absolute top-1/2 -left-1.5 transform -translate-x-full -translate-y-1/2 w-0.5 h-3 bg-theme" })
+                          unref(columnShowHandler)(props, column) ? (openBlock(), createElementBlock(
+                            "div",
+                            {
+                              key: 0,
+                              class: normalizeClass(["w-full flex items-center text-theme whitespace-nowrap relative mb-3 mt-1", [
+                                __props.size === "small" ? "text-xs" : "text-sm",
+                                allMapSelect.value ? "hidden" : ""
+                              ]]),
+                              style: normalizeStyle(unref(columnItemStyle)(props, column))
+                            },
+                            [
+                              createElementVNode(
+                                "span",
+                                { class: "mr-2" },
+                                toDisplayString(column.label),
+                                1
+                                /* TEXT */
+                              ),
+                              createVNode(unref(ElDivider), {
+                                "content-position": "left",
+                                "border-style": "dashed",
+                                class: "border-[rgba(var(--hy-theme),0.5)] my-0"
+                              }),
+                              createElementVNode("div", { class: "absolute top-1/2 -left-1.5 transform -translate-x-full -translate-y-1/2 w-0.5 h-3 bg-theme" })
+                            ],
+                            6
+                            /* CLASS, STYLE */
+                          )) : createCommentVNode("v-if", true)
                         ],
-                        6
-                        /* CLASS, STYLE */
+                        64
+                        /* STABLE_FRAGMENT */
                       )) : column.type === "extra" && !_ctx.$slots[column.slot] ? (openBlock(), createElementBlock(
                         Fragment,
                         { key: 1 },
@@ -168,6 +193,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                           createCommentVNode(" \u8865\u5145\u4FE1\u606F\u8868\u5355 "),
                           unref(columnShowHandler)(props, column) ? (openBlock(), createBlock(_sfc_main$1, {
                             key: 0,
+                            class: normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,
                             column,
                             rules: __props.rules,
@@ -188,7 +214,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "style"])) : createCommentVNode("v-if", true)
+                          ]), 1032, ["class", "model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "style"])) : createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */
@@ -199,6 +225,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                           createCommentVNode(" \u8868\u5355\u6570\u7EC4 "),
                           unref(columnShowHandler)(props, column) ? (openBlock(), createBlock(_sfc_main$2, {
                             key: 0,
+                            class: normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,
                             column,
                             rules: __props.rules,
@@ -220,16 +247,41 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : createCommentVNode("v-if", true)
+                          ]), 1032, ["class", "model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style"])) : createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */
-                      )) : (openBlock(), createElementBlock(
+                      )) : column.type === "location-select" ? (openBlock(), createElementBlock(
                         Fragment,
                         { key: 3 },
+                        [
+                          unref(columnShowHandler)(props, column) ? (openBlock(), createBlock(_sfc_main$3, {
+                            key: 0,
+                            ref_for: true,
+                            ref_key: "locationSelectRef",
+                            ref: locationSelectRef,
+                            model: __props.model,
+                            column,
+                            rules: __props.rules,
+                            columnNum: __props.columnNum,
+                            loading: __props.loading,
+                            disabled: __props.disabled,
+                            readonly: __props.readonly,
+                            size: __props.size,
+                            style: normalizeStyle(unref(columnItemStyle)(props, column)),
+                            allMapSelect: allMapSelect.value,
+                            onSetMapSize: setMapSize
+                          }, null, 8, ["model", "column", "rules", "columnNum", "loading", "disabled", "readonly", "size", "style", "allMapSelect"])) : createCommentVNode("v-if", true)
+                        ],
+                        64
+                        /* STABLE_FRAGMENT */
+                      )) : (openBlock(), createElementBlock(
+                        Fragment,
+                        { key: 4 },
                         [
                           createCommentVNode(" \u8868\u5355 "),
-                          createVNode(_sfc_main$3, {
+                          createVNode(_sfc_main$4, {
+                            class: normalizeClass([allMapSelect.value ? "hidden" : ""]),
                             model: __props.model,
                             column,
                             rules: __props.rules,
@@ -248,7 +300,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 ])
                               };
                             })
-                          ]), 1032, ["model", "column", "rules", "loading", "disabled", "readonly"])
+                          ]), 1032, ["class", "model", "column", "rules", "loading", "disabled", "readonly"])
                         ],
                         64
                         /* STABLE_FRAGMENT */

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

@@ -1,6 +1,6 @@
 import { unref } from 'vue';
+import { isBoolean, isFunction, isNumber, isArray, isObject, isString } from '../../../utils/is.mjs';
 import { funRunHandler } from '../../../utils/handler.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';
 
@@ -15,6 +15,7 @@ function columnItemStyle(props, column) {
       case "title":
       case "extra":
       case "array":
+      case "location-select":
         style["grid-column"] = `span ${props.columnNum}`;
         break;
     }
@@ -27,6 +28,12 @@ function columnShowHandler(props, column) {
   if (isFunction(show)) return show(column, props.model);
   return true;
 }
+function columnVisibleHandler(props, column) {
+  const visible = unref(column.visible);
+  if (isBoolean(visible)) return visible;
+  if (isFunction(visible)) return visible(column, props.model);
+  return true;
+}
 function columnHelpHandler(props, column) {
   const help = unref(column.help);
   if (isString(help)) return help;
@@ -110,4 +117,4 @@ function optionsHandler(props, column) {
   return [];
 }
 
-export { columnHelpHandler, columnItemStyle, columnShowHandler, isDisabled, isReadonly, isRequired, optionsHandler, renderAddLabel, renderArrayItemLabel, renderText };
+export { columnHelpHandler, columnItemStyle, columnShowHandler, columnVisibleHandler, isDisabled, isReadonly, isRequired, optionsHandler, renderAddLabel, renderArrayItemLabel, renderText };

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

@@ -1,41 +1,11 @@
 import { unref, toRef } from 'vue';
 import { funRunHandler, mergeDeep } from '../../../utils/handler.mjs';
 import { isArray } from '../../../utils/is.mjs';
-import { genValueByProp } from '../../../utils/form.mjs';
-import { useLocale } from '../../../hooks/useLocale.mjs';
+import { genValueByProp, genColumnDefaultLabel } from '../../../utils/form.mjs';
 
-const genDefaultLabel = (config) => {
-  if (config.label) return config.label;
-  const { t } = useLocale();
-  switch (config.type) {
-    // 部门级联选择框
-    case "org-cascader":
-      return t("form.department");
-  }
-};
-const genPlaceholderHandler = (config) => {
-  const { t } = useLocale();
-  const { type, label, attrs = {} } = config || {};
-  let placeholder = attrs.placeholder, startPlaceholder = attrs.startPlaceholder, endPlaceholder = attrs.endPlaceholder;
-  switch (type) {
-    case "input":
-    case "input-number":
-      placeholder = placeholder || t("hy.pleaseEnterPlaceholder", [label]);
-      break;
-    case "select":
-    case "date-picker":
-    case "time-picker":
-      placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
-      break;
-    default:
-      placeholder = placeholder || label;
-  }
-  return { placeholder, startPlaceholder, endPlaceholder };
-};
 function appFormItemHandler(column = {}) {
-  const label = genDefaultLabel(column);
-  const { placeholder} = genPlaceholderHandler({ ...column, label });
-  const attrs = { ...column.attrs || {}, placeholder };
+  const label = genColumnDefaultLabel(column);
+  const attrs = { ...column.attrs || {} };
   column = mergeDeep(
     { ...column },
     {
@@ -55,7 +25,7 @@ function appFormItemHandler(column = {}) {
         ...attrs
       }
     };
-  } else if (/^(radio|checkbox|select)$/.test(column.type)) {
+  } else if (/^(radio|radio-group|checkbox|select)$/.test(column.type)) {
     return {
       ...column,
       attrs: {
@@ -69,7 +39,7 @@ function appFormItemHandler(column = {}) {
         }
       }
     };
-  } else if (/^(extra)$/.test(column.type)) {
+  } else if (/^(extra)$/.test(column.type) || /^(location-select)$/.test(column.type)) {
     return {
       ...column,
       children: (column.children || []).map((item) => appFormItemHandler(item))
@@ -105,7 +75,7 @@ const resetAppFormValue = (columns = [], obj = {}) => {
         const childValue = resetAppFormValue(item.children);
         obj[item.prop] = [childValue];
       }
-    } else if (item.type === "extra") {
+    } else if (item.type === "extra" || item.type === "location-select") {
       resetAppFormValue(item.children, obj);
     } else if (Array.isArray(item.prop)) {
       for (let i = 0; i < item.prop.length; i++) {

package/es/components/hyMap/map.vue.mjs

@@ -16,7 +16,7 @@ const _sfc_main = {
       type: Object,
       default: () => ({})
     },
-    // 地图类型 gaode leaflet bugMap
+    // 地图类型 gaode leafletjs bugMap
     mapType: {
       type: String,
       default: "gaode"
@@ -27,7 +27,7 @@ const _sfc_main = {
     const props = __props;
     const emits = __emit;
     const mapRef = ref();
-    const { newMap } = useMixins(
+    const { newMap, map, hyMap } = useMixins(
       {
         props,
         emits,
@@ -39,7 +39,7 @@ const _sfc_main = {
       newMap(props.mapType);
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", { class: "w-full h-full p-5 box-border border-border border relative" }, [
+      return openBlock(), createElementBlock("div", { class: "w-full h-full box-border border-border border relative" }, [
         createElementVNode(
           "div",
           {

package/es/components/hyRadioGroup/index.mjs

@@ -0,0 +1,6 @@
+import _sfc_main from './radioGroup.vue.mjs';
+import { withInstall } from '../../utils/handler.mjs';
+
+const HyRadioGroup = withInstall(_sfc_main);
+
+export { HyRadioGroup, HyRadioGroup as default };

package/es/components/hyRadioGroup/radioGroup.vue.mjs

@@ -0,0 +1,123 @@
+import { useModel, useTemplateRef, ref, computed, watch, openBlock, createElementBlock, normalizeClass, Fragment, renderList, renderSlot, createTextVNode, toDisplayString, normalizeStyle, createCommentVNode, mergeModels, defineComponent, nextTick } from 'vue';
+
+import "./style/radioGroup.scss";
+
+const __default__ = defineComponent({
+  name: "HyRadioGroup"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
+  props: /* @__PURE__ */ mergeModels({
+    options: {
+      type: Array,
+      default: () => []
+    },
+    props: {
+      type: Object,
+      default: () => ({})
+    },
+    size: {
+      type: String,
+      default: "default"
+    }
+  }, {
+    "modelValue": {
+      type: [String, Number, Boolean]
+    },
+    "modelModifiers": {}
+  }),
+  emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
+    const modelValue = useModel(__props, "modelValue");
+    const sliderRef = useTemplateRef("sliderRef");
+    const selectIndex = ref(0);
+    const radioProps = computed(() => {
+      return {
+        value: "value",
+        label: "label",
+        disabled: "disabled",
+        ...props.props || {}
+      };
+    });
+    function switchSelect(target) {
+      modelValue.value = target[radioProps.value.value];
+      emits("change", modelValue.value);
+    }
+    async function sliderHandler() {
+      selectIndex.value = props.options.findIndex((item) => {
+        return item[radioProps.value.value] === modelValue.value;
+      });
+      await nextTick();
+      const slider = sliderRef.value;
+      if (slider) {
+        const proportion = 100 / props.options.length;
+        const left = selectIndex.value > 0 ? selectIndex.value * proportion : 0;
+        console.log("proportion", proportion, left, selectIndex.value);
+        slider.style.left = `${left}%`;
+      }
+    }
+    watch(
+      () => [modelValue.value, props.options],
+      () => {
+        sliderHandler();
+      },
+      { immediate: true }
+    );
+    __expose({});
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock(
+        "ul",
+        {
+          class: normalizeClass(["w-full flex text-xs rounded border border-border box-border relative", [
+            __props.size === "large" ? "h-[40px]" : __props.size === "small" ? "h-[24px]" : "h-[32px]",
+            __props.size === "small" ? "text-xs" : "text-sm"
+          ]])
+        },
+        [
+          (openBlock(true), createElementBlock(
+            Fragment,
+            null,
+            renderList(__props.options, (item, index) => {
+              return openBlock(), createElementBlock("li", {
+                key: index,
+                class: "w-0 flex-1 flex items-center justify-center text-main clickBox",
+                onClick: ($event) => switchSelect(item)
+              }, [
+                renderSlot(_ctx.$slots, "default", {
+                  item,
+                  index
+                }, () => [
+                  createTextVNode(
+                    toDisplayString(item[radioProps.value.label]),
+                    1
+                    /* TEXT */
+                  )
+                ])
+              ], 8, ["onClick"]);
+            }),
+            128
+            /* KEYED_FRAGMENT */
+          )),
+          selectIndex.value >= 0 ? (openBlock(), createElementBlock(
+            "li",
+            {
+              key: 0,
+              ref_key: "sliderRef",
+              ref: sliderRef,
+              class: "slider rounded box-border absolute h-full top-0 left-0 z-0 duration-500 border border-theme shadow-[0_0_6px_0] shadow-theme",
+              style: normalizeStyle([{ width: `calc(100% / ${__props.options.length})` }, { "background": "linear-gradient(180deg, #2a4968 0%, #0ea0bb 100%)" }])
+            },
+            null,
+            4
+            /* STYLE */
+          )) : createCommentVNode("v-if", true)
+        ],
+        2
+        /* CLASS */
+      );
+    };
+  }
+});
+
+export { _sfc_main as default };

package/es/components/hySearch/cpns/searchItem.vue.mjs

@@ -2,7 +2,7 @@ import { computed, unref, openBlock, createBlock, withCtx, createElementVNode, n
 import { ElFormItem, ElSelect } from 'element-plus';
 import { columnShowHandler, columnItemStyle, columnItemInputStyle, isDisabled, optionsHandler, isSelectedTimeRange, timeRangeHandler } from '../js/index.mjs';
 import { isArray } from '../../../utils/is.mjs';
-import { setValueByProp, getValueByProp } from '../../../utils/form.mjs';
+import { setValueByProp, getValueByProp, columnPlaceholderHandler, columnLabelHandler } from '../../../utils/form.mjs';
 import { HyInput } from '../../hyInput/index.mjs';
 import { HyDatePicker } from '../../hyDatePicker/index.mjs';
 import { HyTimePicker } from '../../hyTimePicker/index.mjs';
@@ -56,6 +56,13 @@ const _sfc_main = {
         setValueByProp(props.model, prop, val);
       }
     });
+    const columnAttrs = computed(() => {
+      return {
+        ...props.column.attrs,
+        label: columnLabelHandler(props.column, props.model),
+        placeholder: columnPlaceholderHandler(props.column, props.model)
+      };
+    });
     function onChangeHandler(value, column) {
       emits("search");
     }
@@ -96,14 +103,14 @@ const _sfc_main = {
                   "div",
                   {
                     class: normalizeClass(["flex items-center text-auxiliary text-xs whitespace-nowrap", {
-                      "border-r border-border px-3": __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] || __props.column.label
+                      "border-r border-border px-3": __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] || unref(columnLabelHandler)(__props.column, props.model)
                     }])
                   },
                   [
                     __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] ? renderSlot(_ctx.$slots, __props.column.labelSlot, { column: __props.column }, void 0, void 0, 0) : (openBlock(), createElementBlock(
                       "span",
                       { key: 1 },
-                      toDisplayString(__props.column.label),
+                      toDisplayString(unref(columnLabelHandler)(__props.column, props.model)),
                       1
                       /* TEXT */
                     ))
@@ -128,7 +135,7 @@ const _sfc_main = {
                         createVNode(unref(HyInput), mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onKeydown: withKeys(($event) => onKeydownEnterHander($event, __props.column), ["enter"]),
                           onChange: ($event) => onChangeHandler($event, __props.column)
@@ -144,7 +151,7 @@ const _sfc_main = {
                         createVNode(unref(ElSelect), mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           options: unref(optionsHandler)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
@@ -162,7 +169,7 @@ const _sfc_main = {
                           "daterange",
                           "monthrange",
                           "yearrange"
-                        ].includes(__props.column.attrs?.type) && unref(isArray)(__props.column.field) ? (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
+                        ].includes(columnAttrs.value?.type) && unref(isArray)(__props.column.field) ? (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
                           key: 0,
                           start: bindValue.value,
                           "onUpdate:start": ($event) => bindValue.value = $event,
@@ -171,7 +178,7 @@ const _sfc_main = {
                           "is-range": true,
                           style: { "width": "100%" },
                           timeRangeFill: __props.column.timeRangeFill
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
                         }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "timeRangeFill", "disabled", "onChange"])) : (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
@@ -181,7 +188,7 @@ const _sfc_main = {
                           "is-range": false,
                           style: { "width": "100%" },
                           timeRangeFill: __props.column.timeRangeFill
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "timeRangeFill", "disabled", "onChange"]))
@@ -193,7 +200,7 @@ const _sfc_main = {
                       { key: 4 },
                       [
                         createCommentVNode(" \u65F6\u95F4\u9009\u62E9\u6846 "),
-                        __props.column.attrs.isRange ? (openBlock(), createBlock(unref(HyTimePicker), mergeProps({
+                        columnAttrs.value.isRange ? (openBlock(), createBlock(unref(HyTimePicker), mergeProps({
                           key: 0,
                           start: bindValue.value,
                           "onUpdate:start": ($event) => bindValue.value = $event,
@@ -201,7 +208,7 @@ const _sfc_main = {
                           "onUpdate:end": ($event) => bindValue2.value = $event,
                           "is-range": true,
                           style: { "width": "100%" }
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (openBlock(), createBlock(unref(HyTimePicker), mergeProps({
@@ -210,7 +217,7 @@ const _sfc_main = {
                           "onUpdate:modelValue": ($event) => bindValue.value = $event,
                           "is-range": false,
                           style: { "width": "100%" }
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"]))
@@ -225,7 +232,7 @@ const _sfc_main = {
                         createVNode(unref(HyOrgCascader), mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: unref(isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
@@ -241,7 +248,7 @@ const _sfc_main = {
               4
               /* STYLE */
             ),
-            __props.column.type === "date-picker" && ["daterange", "datetimerange"].includes(__props.column.attrs?.type) && __props.column.timeRangeOptions?.length ? (openBlock(), createElementBlock("div", {
+            __props.column.type === "date-picker" && ["daterange", "datetimerange"].includes(columnAttrs.value?.type) && __props.column.timeRangeOptions?.length ? (openBlock(), createElementBlock("div", {
               key: 0,
               class: "flex text-main select-none"
             }, [

package/es/components/hySearch/js/useAppSearch.mjs

@@ -1,37 +1,9 @@
 import { unref, toRef } from 'vue';
 import { funRunHandler, mergeDeep } from '../../../utils/handler.mjs';
-import { genValueByProp } from '../../../utils/form.mjs';
+import { genValueByProp, genColumnDefaultLabel } from '../../../utils/form.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isNumber } from '../../../utils/is.mjs';
 
-const genDefaultLabel = (config) => {
-  if (config.label) return config.label;
-  const { t } = useLocale();
-  switch (config.type) {
-    // 部门级联选择框
-    case "org-cascader":
-      return t("form.department");
-  }
-};
-const genPlaceholderHandler = (config) => {
-  const { t } = useLocale();
-  const { type, label, attrs = {} } = config || {};
-  let placeholder = attrs.placeholder, startPlaceholder = attrs.startPlaceholder, endPlaceholder = attrs.endPlaceholder;
-  switch (type) {
-    case "input":
-      placeholder = placeholder || t("hy.pleaseEnterPlaceholder", [label]);
-      break;
-    case "select":
-    case "date-picker":
-    case "time-picker":
-    case "org-cascader":
-      placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
-      break;
-    default:
-      placeholder = placeholder || label;
-  }
-  return { placeholder, startPlaceholder, endPlaceholder };
-};
 const genColumnWidth = (config) => {
   let { width, inputWidth, type, attrs } = config || {};
   if (!width && !inputWidth) {
@@ -84,12 +56,10 @@ const timeRangeOptionsHandler = (config) => {
   }, []);
 };
 function appSearchItemHandler(column = {}) {
-  const label = genDefaultLabel(column);
-  const { placeholder} = genPlaceholderHandler({ ...column, label });
+  const label = genColumnDefaultLabel(column);
   const attrs = {
     clearable: true,
-    ...column.attrs || {},
-    placeholder
+    ...column.attrs || {}
   };
   const { width, inputWidth } = genColumnWidth(column);
   column = mergeDeep(