hy-dispatch-ui-v3 0.2.33 → 0.2.35

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

@@ -1,7 +1,7 @@
 import { unref, toRef } from 'vue';
-import { genValueByProp } from '../../../utils/form.mjs';
 import { funRunHandler, mergeDeep } from '../../../utils/handler.mjs';
 import { isArray, isObject } from '../../../utils/is.mjs';
+import { genValueByProp } from '../../../utils/form.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 
 const genDefaultLabel = (config) => {

package/es/components/hyForm/style/form.scss

@@ -1,10 +1,6 @@
 .hy-form-container {
   display: grid;
   column-gap: 24px;
-  .el-form-item__label::before {
-    content: '' !important;
-    display: none;
-  }
 
   .label-required {
     &::after {

package/es/components/hyNoPermissions/noPermissions.vue.mjs

@@ -11,7 +11,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     svgName: {
       type: String,
-      default: "ops-list-no-data"
+      default: "analytics-v3-no-data-normal"
     }
   },
   emits: [],

package/es/components/hyNoPermissionsMap/noPermissionsMap.vue.mjs

@@ -11,7 +11,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     svgName: {
       type: String,
-      default: "ops-list-no-data"
+      default: "analytics-v3-no-data-normal"
     }
   },
   emits: [],

package/es/components/hyOrgCascader/orgCascader.vue.mjs

@@ -1,7 +1,7 @@
 import { defineComponent, useModel, useTemplateRef, ref, computed, watch, openBlock, createElementBlock, createElementVNode, normalizeStyle, createVNode, unref, renderSlot, toDisplayString, createCommentVNode, createBlock, normalizeClass, mergeModels } from 'vue';
 import { ElCascader } from 'element-plus';
-import { useLocale } from '../../hooks/useLocale.mjs';
 import { useApi } from '../../hooks/useApi.mjs';
+import { useLocale } from '../../hooks/useLocale.mjs';
 
 import "./style/orgCascader.scss";
 

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

@@ -75,7 +75,7 @@ const _sfc_main = {
         prop: columnProp.value
       }, {
         default: withCtx(() => [
-          createElementVNode("div", { class: "flex bg-background-2 rounded border border-transparent hover:border-theme box-border" }, [
+          createElementVNode("div", { class: "flex bg-background-2 rounded outline outline-1 outline-transparent outline-offset-0 hover:outline-theme box-border" }, [
             createElementVNode(
               "div",
               {
@@ -92,10 +92,7 @@ const _sfc_main = {
                     }])
                   },
                   [
-                    __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] ? renderSlot(_ctx.$slots, __props.column.labelSlot, {
-                      key: 0,
-                      column: __props.column
-                    }) : (openBlock(), createElementBlock(
+                    __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),
@@ -115,10 +112,7 @@ const _sfc_main = {
                   },
                   [
                     createCommentVNode(" \u81EA\u5B9A\u4E49\u5177\u540D\u63D2\u69FD "),
-                    __props.column.slot ? renderSlot(_ctx.$slots, __props.column.slot, {
-                      key: 0,
-                      column: __props.column
-                    }) : __props.column.type === "input" ? (openBlock(), createElementBlock(
+                    __props.column.slot ? renderSlot(_ctx.$slots, __props.column.slot, { column: __props.column }, void 0, void 0, 0) : __props.column.type === "input" ? (openBlock(), createElementBlock(
                       Fragment,
                       { key: 1 },
                       [

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

@@ -55,13 +55,13 @@ function useShrink(props, formItemWrapper) {
   function getContainerPickUpHeight() {
     switch (props.size) {
       case "large":
-        return 43;
+        return 44;
       case "small":
-        return 27;
+        return 28;
       case "":
       case "default":
       default:
-        return 35;
+        return 36;
     }
   }
   function switchShrink() {
@@ -74,7 +74,7 @@ function useShrink(props, formItemWrapper) {
     if (container.children.length) {
       for (let i = 0; i < container.children.length; i++) {
         const element = container.children[i];
-        if (i > 0 && element.offsetLeft === 0) {
+        if (i > 0 && element.offsetLeft <= 1) {
           showShrink.value = true;
           break;
         } else if (i === container.children.length - 1) {

package/es/components/hySearch/style/search.scss

@@ -33,6 +33,7 @@
     flex-wrap: wrap;
     gap: 16px;
     position: relative;
+    padding: 1px;
     .hy-el-form-item {
       margin-bottom: 0;
       &.hidden {

package/es/components/hyTable/cpns/columnSelect.vue.mjs

@@ -2,9 +2,10 @@ import { useTemplateRef, ref, computed, unref, watch, openBlock, createBlock, wi
 import Sortable from 'sortablejs';
 import { ElPopover, ElIcon, ElCheckboxGroup, ElMessage } from 'element-plus';
 import { CircleClose, Warning, Edit } from '@element-plus/icons-vue';
-import { tableColumnHandler } from '../js/index.mjs';
+import { tableColumnShowHandler, tableColumnHandler } from '../js/index.mjs';
 import _sfc_main$1 from './columnSelectItem.vue.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
+import { HyTooltip } from '../../hyTooltip/index.mjs';
 import { HyButton } from '../../hyButton/index.mjs';
 import { isEmpty } from '../../../utils/is.mjs';
 
@@ -35,11 +36,11 @@ const _sfc_main = {
     const tableEditableColumns = ref([]);
     const showColumnsLength = computed(() => {
       return (tableColumns.value || []).reduce((total, column) => {
-        return total + (isFilterColumn(column) ? 0 : 1);
+        return total + (isShowColumn(column) ? 1 : 0);
       }, 0);
     });
-    function isFilterColumn(column) {
-      return !column.editable.edit || column.prop === "operator";
+    function isShowColumn(column) {
+      return tableColumnShowHandler(column) && column.editable.edit;
     }
     function showPopover() {
       initColumnsInfo(props.columns, props.columnsEditable);
@@ -52,26 +53,20 @@ const _sfc_main = {
       popoverRef.value?.hide?.();
     }
     function initColumnsInfo(columns, columnsEditable) {
+      const columnArr = [];
       const checkedArr = [];
-      tableEditableColumns.value = columns.reduce((list, column, index) => {
-        if (!isFilterColumn(column) && !column.editable.lock) {
-          list.push({
+      for (const column of columns) {
+        if (isShowColumn(column) && !column.editable.lock) {
+          columnArr.push({
             ...column,
-            sortIndex: index
+            sortIndex: columnsEditable[column.prop].sortIndex
           });
-        }
-        return list;
-      }, []);
-      for (const key in columnsEditable || {}) {
-        const target = columnsEditable[key];
-        const { column } = target;
-        if (isFilterColumn(column) || column.editable.lock) {
-          continue;
-        }
-        if (target.checked) {
-          checkedArr.push(column.prop);
+          if (columnsEditable[column.prop].checked) {
+            checkedArr.push(column.prop);
+          }
         }
       }
+      tableEditableColumns.value = columnArr;
       checkedList.value = checkedArr;
     }
     const showClear = ref(true);
@@ -104,7 +99,7 @@ const _sfc_main = {
       }
       const editableObj = tableEditableColumns.value.reduce(
         (editableObj2, column) => {
-          editableObj2[column.prop].index = column.sortIndex;
+          editableObj2[column.prop].sortIndex = column.sortIndex;
           editableObj2[column.prop].checked = checkMap.value.has(column.prop);
           return editableObj2;
         },
@@ -132,29 +127,19 @@ const _sfc_main = {
           const { oldIndex, newIndex } = event;
           if (isEmpty(oldIndex) || isEmpty(newIndex) || oldIndex === newIndex)
             return;
-          const newSortIndex = tableEditableColumns.value[newIndex].sortIndex;
-          tableEditableColumns.value[newIndex].sortIndex = tableEditableColumns.value[oldIndex].sortIndex;
-          tableEditableColumns.value[oldIndex].sortIndex = newSortIndex;
-          if (oldIndex < newIndex) {
-            tableEditableColumns.value.splice(
-              oldIndex,
-              1,
-              tableEditableColumns.value.splice(
-                newIndex,
-                1,
-                tableEditableColumns.value[oldIndex]
-              )[0]
-            );
-          } else {
-            tableEditableColumns.value.splice(
-              newIndex,
-              1,
-              tableEditableColumns.value.splice(
-                oldIndex,
-                1,
-                tableEditableColumns.value[newIndex]
-              )[0]
-            );
+          const minIndex = Math.min(oldIndex, newIndex);
+          const maxIndex = Math.max(oldIndex, newIndex);
+          const sortList = [];
+          for (let i = minIndex; i <= maxIndex; i++) {
+            sortList[i] = tableEditableColumns.value[i].sortIndex;
+          }
+          tableEditableColumns.value.splice(
+            newIndex,
+            0,
+            tableEditableColumns.value.splice(oldIndex, 1)[0]
+          );
+          for (let i = minIndex; i <= maxIndex; i++) {
+            tableEditableColumns.value[i].sortIndex = sortList[i];
           }
           showClear.value = true;
         }
@@ -228,7 +213,7 @@ const _sfc_main = {
                   /* STABLE */
                 })
               ]),
-              createElementVNode("div", { class: "h-[364px] px-4 pt-[11px] pb-1 overflow-y-auto" }, [
+              createElementVNode("div", { class: "h-[364px] px-4 pt-[11px] pb-1 scroll-body overflow-y-auto" }, [
                 createVNode(unref(ElCheckboxGroup), {
                   modelValue: checkedList.value,
                   "onUpdate:modelValue": ($event) => checkedList.value = $event
@@ -249,7 +234,7 @@ const _sfc_main = {
                               Fragment,
                               { key: index },
                               [
-                                !isFilterColumn(item) && item.editable.lock ? (openBlock(), createBlock(_sfc_main$1, {
+                                isShowColumn(item) && item.editable.lock ? (openBlock(), createBlock(_sfc_main$1, {
                                   key: 0,
                                   column: item,
                                   checkMap: checkMap.value
@@ -299,48 +284,44 @@ const _sfc_main = {
                   /* STABLE */
                 }, 8, ["modelValue", "onUpdate:modelValue"])
               ]),
-              createElementVNode("div", { class: "flex items-center pt-[5px] pb-4 pl-[14px] pr-3" }, [
-                createElementVNode(
-                  "span",
-                  null,
-                  toDisplayString(unref(t)("table.haveBeenSelected", [checkedList.value?.length || 0])),
-                  1
-                  /* TEXT */
-                ),
-                showClear.value ? (openBlock(), createElementBlock(
-                  "span",
-                  {
-                    key: 0,
-                    class: "clickBox text-danger-2 ml-3",
-                    onClick: onClearHandler
-                  },
-                  toDisplayString(unref(t)("table.clear")),
-                  1
-                  /* TEXT */
-                )) : createCommentVNode("v-if", true),
-                createElementVNode("div", { class: "flex items-center ml-auto" }, [
-                  checkedList.value?.length >= 8 ? (openBlock(), createElementBlock("span", {
+              createElementVNode("div", { class: "flex items-center pt-[5px] pb-4 pl-[14px] pr-3 overflow-hidden" }, [
+                createElementVNode("div", { class: "flex items-center" }, [
+                  createElementVNode(
+                    "span",
+                    null,
+                    toDisplayString(unref(t)("table.selectedNumberItems", [checkedList.value?.length || 0])),
+                    1
+                    /* TEXT */
+                  ),
+                  showClear.value ? (openBlock(), createElementBlock(
+                    "span",
+                    {
+                      key: 0,
+                      class: "clickBox text-danger-2 ml-3",
+                      onClick: onClearHandler
+                    },
+                    toDisplayString(unref(t)("table.clear")),
+                    1
+                    /* TEXT */
+                  )) : createCommentVNode("v-if", true)
+                ]),
+                createElementVNode("div", { class: "w-0 flex-1 flex items-center justify-end ml-3" }, [
+                  createVNode(unref(ElIcon), {
+                    class: "mr-1.5",
+                    color: "rgb(var(--hy-auxiliary))"
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(unref(Warning))
+                    ]),
+                    _: 1
+                    /* STABLE */
+                  }),
+                  checkedList.value?.length >= 8 ? (openBlock(), createBlock(unref(HyTooltip), {
                     key: 0,
-                    class: "flex items-center mr-2 text-auxiliary"
-                  }, [
-                    createVNode(unref(ElIcon), {
-                      class: "mr-1.5",
-                      color: "rgb(var(--hy-auxiliary))"
-                    }, {
-                      default: withCtx(() => [
-                        createVNode(unref(Warning))
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    }),
-                    createElementVNode(
-                      "span",
-                      null,
-                      toDisplayString(unref(t)("table.tooManyFieldsWillAffectReadability")),
-                      1
-                      /* TEXT */
-                    )
-                  ])) : createCommentVNode("v-if", true),
+                    "is-always": false,
+                    content: unref(t)("table.tooManyFieldsWillAffectReadability"),
+                    class: "mr-2 text-auxiliary"
+                  }, null, 8, ["content"])) : createCommentVNode("v-if", true),
                   createVNode(unref(HyButton), {
                     type: "primary",
                     size: "small",

package/es/components/hyTable/cpns/columnSelectItem.vue.mjs

@@ -1,6 +1,6 @@
 import { openBlock, createBlock, unref, withCtx, createElementVNode, toDisplayString, createElementBlock, createCommentVNode, Fragment, renderList, normalizeClass, createVNode, withModifiers } from 'vue';
 import { ElPopover, ElIcon, ElCheckbox } from 'element-plus';
-import { Lock, DCaret } from '@element-plus/icons-vue';
+import { Lock } from '@element-plus/icons-vue';
 import { renderHeaderHandler } from '../js/index.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
@@ -90,16 +90,13 @@ const _sfc_main = {
               )),
               __props.columnsLength > 1 ? (openBlock(), createElementBlock("div", {
                 key: 2,
-                class: "w-5 h-full flex items-center justify-center handle cursor-grab ml-3",
+                class: "h-full flex items-center justify-center handle cursor-grab ml-3",
                 onClick: withModifiers(() => {
                 }, ["stop"])
               }, [
-                createVNode(unref(ElIcon), null, {
-                  default: withCtx(() => [
-                    createVNode(unref(DCaret))
-                  ]),
-                  _: 1
-                  /* STABLE */
+                createElementVNode("div", {
+                  class: "w-5 h-2.5",
+                  style: { "background": "radial-gradient(\n                    circle,\n                    rgba(var(--hy-theme)) 1px,\n                    transparent 2px\n                  )\n                  0px 0px / 5px 5px" }
                 })
               ], 8, ["onClick"])) : createCommentVNode("v-if", true)
             ])) : createCommentVNode("v-if", true)

package/es/components/hyTable/cpns/headerItem.vue.mjs

@@ -90,7 +90,7 @@ const _sfc_main = {
           }, 8, ["color", "onClick"])
         ]),
         renderSlot(_ctx.$slots, "default")
-      ], 8, ["onClick"])) : renderSlot(_ctx.$slots, "default", { key: 1 });
+      ], 8, ["onClick"])) : renderSlot(_ctx.$slots, "default", {}, void 0, void 0, 1);
     };
   }
 };

package/es/components/hyTable/cpns/virtualTable.vue.mjs

@@ -308,8 +308,8 @@ const _sfc_main = {
         width: __props.width,
         height: __props.height,
         "header-height": __props.showHeader ? 44 : 0,
-        "row-height": 50,
-        "estimated-row-height": 50,
+        "row-height": 64,
+        "estimated-row-height": 64,
         "expand-column-key": expandColumn.value?.key,
         fixed: "",
         "row-class": rowClass,
@@ -355,9 +355,8 @@ const _sfc_main = {
         row: withCtx(({ columns, depth, rowData: row, rowIndex: $index }) => [
           createCommentVNode(" \u5C55\u5F00\u5185\u5BB9 "),
           depth > 0 && isExpandTable.value ? renderSlot(_ctx.$slots, expandColumn.value.slot, {
-            key: 0,
             row: dataSourceMap.value.get(row.dataKey)
-          }) : (openBlock(), createElementBlock(
+          }, void 0, void 0, 0) : (openBlock(), createElementBlock(
             Fragment,
             { key: 1 },
             [
@@ -422,10 +421,7 @@ const _sfc_main = {
                         indeterminate: indeterminateKeys.value.has(getRowKey(row)),
                         disabled: !isSelectable(row),
                         onClick: withModifiers(($event) => switchCheckHandler(row), ["stop"])
-                      }, null, 8, ["model-value", "indeterminate", "disabled", "onClick"])) : column?.slot && (column.type !== "expand" || !isExpandTable.value) ? renderSlot(_ctx.$slots, column?.slot, mergeProps({
-                        key: 2,
-                        ref_for: true
-                      }, { column, row, $index, cellIndex })) : column.type === "index" ? (openBlock(), createElementBlock(
+                      }, null, 8, ["model-value", "indeterminate", "disabled", "onClick"])) : column?.slot && (column.type !== "expand" || !isExpandTable.value) ? renderSlot(_ctx.$slots, column?.slot, mergeProps({ ref_for: true }, { column, row, $index, cellIndex }), void 0, void 0, 2) : column.type === "index" ? (openBlock(), createElementBlock(
                         Fragment,
                         { key: 3 },
                         [
@@ -439,7 +435,7 @@ const _sfc_main = {
                         /* STABLE_FRAGMENT */
                       )) : column.type === "operator" ? (openBlock(), createElementBlock("div", {
                         key: 4,
-                        class: "w-full flex items-center justify-between text-main",
+                        class: "w-full flex items-center justify-end gap-3 text-main",
                         onClick: withModifiers(() => {
                         }, ["stop"]),
                         onContextmenu: withModifiers(() => {
@@ -457,7 +453,7 @@ const _sfc_main = {
                               key: cindex,
                               "is-always": "",
                               overLine: 1,
-                              content: citem.label
+                              content: citem.desc
                             }, {
                               default: withCtx(() => [
                                 createElementVNode("div", {
@@ -473,13 +469,13 @@ const _sfc_main = {
                                     "svg-name": citem.svgName,
                                     "class-name": "!w-4 !h-4"
                                   }, null, 8, ["svg-name"]),
-                                  citem.subLabel ? (openBlock(), createElementBlock(
+                                  citem.label ? (openBlock(), createElementBlock(
                                     "div",
                                     {
                                       key: 0,
                                       class: "mt-1 whitespace-nowrap"
                                     },
-                                    toDisplayString(citem.subLabel),
+                                    toDisplayString(citem.label),
                                     1
                                     /* TEXT */
                                   )) : (openBlock(), createElementBlock("div", {

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

@@ -1,6 +1,6 @@
 import { ref, computed, watchEffect, unref, nextTick } from 'vue';
 import { ElLoading } from 'element-plus';
-import { isString, isBoolean, isFunction, isPermission, isArray, isNumber } from '../../../utils/is.mjs';
+import { isString, isBoolean, isFunction, isPermission, isNumber, isArray } from '../../../utils/is.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { usePermissionMap } from '../../../hooks/usePermissionMap.mjs';
 
@@ -13,67 +13,67 @@ function tableColumnShowHandler(column) {
   if (isFunction(show)) return show(column);
   return true;
 }
-function tableColumnsEditableleHandler(columns, columnsEditablele, searchArr) {
-  const searchLabelSet = /* @__PURE__ */ new Set();
+function tableColumnsEditableleHandler(columns, columnsEditablele) {
   const columnsEditableleObj = {};
+  const sortSet = /* @__PURE__ */ new Set();
   for (const column of columns) {
-    const { editable } = column;
-    const columnsEditableleItem = columnsEditablele[column.prop] || editable;
-    const { index } = columnsEditableleItem;
-    if (!columnsEditableleObj[index]) {
-      columnsEditableleObj[index] = [];
+    const columnsEditableleItem = columnsEditablele[column.prop];
+    const { sortIndex } = columnsEditableleItem;
+    sortSet.add(sortIndex);
+    if (!columnsEditableleObj[sortIndex]) {
+      columnsEditableleObj[sortIndex] = [];
     }
-    columnsEditableleObj[index].push({
-      ...columnsEditableleItem,
+    columnsEditableleObj[sortIndex].push({
+      editable: columnsEditableleItem,
       column
     });
-    if (column.isSearch) {
-      searchLabelSet.add(column.label);
-    }
-  }
-  if (searchArr?.length > 0) {
-    searchArr.forEach((item) => {
-      searchLabelSet.add(item.label);
-    });
   }
-  return Object.keys(columnsEditableleObj).reduce(
-    ({ columnsEditablele: columnsEditablele2, columnsList, searchText }, key) => {
+  Array.from(sortSet.values()).reduce((a, b) => a - b);
+  const columnsList = Object.keys(columnsEditableleObj).reduce(
+    (columnsList2, key) => {
       const list = columnsEditableleObj[key];
       for (let i = 0; i < list.length; i++) {
         const target = list[i];
-        columnsEditablele2[target.column.prop] = {
-          ...target,
-          index: columnsList.length + i
-        };
-        columnsList.push(target.column);
+        columnsList2.push(target.column);
       }
-      return { columnsEditablele: columnsEditablele2, columnsList, searchText };
+      return columnsList2;
     },
-    {
-      columnsEditablele: {},
-      columnsList: [],
-      searchText: Array.from(searchLabelSet.values()).join("\u3001")
-    }
+    []
   );
+  return {
+    columnsList,
+    columnsEditablele
+  };
 }
-function tableColumnHandler(columns, cacheKey, searchArr) {
-  const cacheColumnsValue = cacheKey ? JSON.parse(sessionStorage.getItem(cacheKey) || "{}") : {};
+function tableColumnHandler(columns, cacheKey) {
+  const cacheColumnsValue = cacheKey && sessionStorage.getItem(cacheKey) ? JSON.parse(sessionStorage.getItem(cacheKey) || "{}") : null;
+  const otherColumns = [];
+  let maxIndex = 0;
   const cacheColumnsEditablele = columns.reduce((obj, column) => {
-    obj[column.prop] = {
-      ...column.editable,
-      ...cacheColumnsValue[column.prop],
-      lock: column.editable.lock,
-      edit: column.editable.edit,
-      desc: column.editable.desc,
-      examples: column.editable.examples
-    };
+    const { editable, prop, type, permission } = column;
+    if (cacheColumnsValue && (!cacheColumnsValue[prop] || type === "operator") || permission && !isPermission(permission)) {
+      otherColumns.push(column);
+    } else {
+      let { sortIndex, checked } = cacheColumnsValue?.[prop] || {};
+      obj[prop] = {
+        prop,
+        sortIndex: isNumber(sortIndex) ? sortIndex : editable.index,
+        checked: isBoolean(checked) ? checked : editable.checked
+      };
+      maxIndex = Math.max(maxIndex, obj[prop].sortIndex);
+    }
     return obj;
   }, {});
-  return tableColumnsEditableleHandler(
-    columns,
-    cacheColumnsEditablele,
-    searchArr
-  );
+  otherColumns.forEach((item, index) => {
+    const { prop, type } = item;
+    maxIndex = maxIndex < item.editable.index ? item.editable.index : maxIndex + index + 1;
+    cacheColumnsEditablele[prop] = {
+      prop,
+      sortIndex: maxIndex,
+      checked: type !== "checked"
+    };
+  });
+  return tableColumnsEditableleHandler(columns, cacheColumnsEditablele);
 }
 function operatorShowHandler(operator, scope) {
   if (operator.permission && !isPermission(operator.permission)) {
@@ -159,17 +159,35 @@ const useAppTableWrapper = (hy) => {
   const tableColumnsList = computed(() => {
     return tableColumns.value.filter((column) => tableColumnShowHandler(column));
   });
-  const searchPlaceholder = ref("");
+  const searchPlaceholder = computed(() => {
+    const searchLabelSet = tableColumnsList.value.reduce(
+      (searchLabelSet2, column) => {
+        if (column.isSearch) {
+          searchLabelSet2.add(column.label);
+        }
+        return searchLabelSet2;
+      },
+      /* @__PURE__ */ new Set()
+    );
+    if (props.searchArr?.length > 0) {
+      props.searchArr.forEach((item) => {
+        searchLabelSet.add(item.label);
+      });
+    }
+    return Array.from(searchLabelSet.values());
+  });
   function getRowKey(row = {}) {
     if (isString(props.rowKey)) return row[props.rowKey];
     if (isFunction(props.rowKey)) return props.rowKey(row);
     return row.id;
   }
   function onTableColumnsSelectHandler(value) {
-    const { columnsEditablele, columnsList, searchText } = tableColumnsEditableleHandler(props.tableColumns, value, props.searchArr);
+    const { columnsList, searchText } = tableColumnsEditableleHandler(
+      props.tableColumns,
+      value
+    );
     tableColumns.value = columnsList;
-    tableColumnsEditablele.value = columnsEditablele;
-    searchPlaceholder.value = searchText;
+    tableColumnsEditablele.value = value;
     sessionStorage.setItem(CACHE_COLUMNS_KEY, JSON.stringify(value));
   }
   function doLayout() {
@@ -316,7 +334,7 @@ const useAppTableWrapper = (hy) => {
   }
   function onTableRowExpandChangeHandler(row, expandedRows) {
     if (isBoolean(expandedRows) || props.expandMode !== "accordion" || expandedRows.length <= 1) {
-      props.onExpandChange(row, expandedRows);
+      props.onExpandChange && props.onExpandChange(row, expandedRows);
       return;
     } else {
       expandedRows.forEach((item) => {
@@ -335,12 +353,10 @@ const useAppTableWrapper = (hy) => {
   watchEffect(() => {
     const { columnsList, columnsEditablele, searchText } = tableColumnHandler(
       props.tableColumns,
-      CACHE_COLUMNS_KEY,
-      props.searchArr
+      CACHE_COLUMNS_KEY
     );
     tableColumns.value = columnsList;
     tableColumnsEditablele.value = columnsEditablele;
-    searchPlaceholder.value = searchText;
   });
   return {
     // 表格配置项