hy-dispatch-ui-v3 0.2.34 → 0.2.36

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

@@ -1,4 +1,4 @@
-import { useModel, ref, openBlock, createElementBlock, Fragment, createCommentVNode, createVNode, unref, mergeProps, withCtx, createElementVNode, normalizeClass, renderSlot, createBlock, withModifiers, createTextVNode, toDisplayString, mergeModels, defineComponent } from 'vue';
+import { useModel, ref, computed, openBlock, createElementBlock, Fragment, createCommentVNode, createVNode, unref, mergeProps, withCtx, createElementVNode, normalizeClass, renderSlot, createBlock, withModifiers, createTextVNode, toDisplayString, mergeModels, defineComponent } from 'vue';
 import { ElDialog } from 'element-plus';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { HyButton } from '../hyButton/index.mjs';
@@ -23,11 +23,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
     },
-    zIndex: {
-      type: Number,
-      default: null
-      // default-默认类型 right-右侧弹窗 fullscreen-全屏
-    },
+    // zIndex: {
+    //   type: Number,
+    //   default: null, // default-默认类型 right-右侧弹窗 fullscreen-全屏
+    // },
     top: String,
     // 支持缩小化
     showShrink: { type: Boolean, default: false },
@@ -132,7 +131,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         onEnd?.();
       }, 750);
     }
-    function showToWorkspace(initDragLevelIndex) {
+    function setDragLevelIndex(initDragLevelIndex) {
       dragLevelIndex.value = initDragLevelIndex;
       if (minimized.value) runAnim();
       minimized.value = false;
@@ -147,11 +146,20 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     const dialogTestRef = ref();
     function dialogMousedown(e) {
-      if (props.zIndex != null) return;
       emits("onDialogMousedown", e);
     }
+    const modalClass = computed(() => {
+      const classes = [];
+      if (animating.value || minimized.value) {
+        classes.push("hy-dialog-app-shrink");
+      }
+      if (minimized.value) {
+        classes.push("hy-dialog-is-minimized");
+      }
+      return classes.join(" ");
+    });
     __expose({
-      showToWorkspace,
+      setDragLevelIndex,
       hideToWorkspace
     });
     return (_ctx, _cache) => {
@@ -160,14 +168,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         null,
         [
           createCommentVNode("  @mousedown.stop"),
-          createCommentVNode('  :z-index="zIndex || dragLevelIndex"'),
-          createCommentVNode("  draggable"),
           createCommentVNode(`  :align-center="!['right', 'fullscreen'].includes(props.dialogType)"`),
           createCommentVNode('  body-class="h-0 flex-1"'),
           createCommentVNode('  :class="dialogClass"'),
-          createCommentVNode('  :overflow="false"'),
-          createCommentVNode('  :modal="false"'),
           createVNode(unref(ElDialog), mergeProps({
+            "z-index": dragLevelIndex.value,
+            draggable: props.showShrink,
+            modal: !props.showShrink,
+            overflow: !props.showShrink,
+            "modal-penetrable": "",
             ref_key: "dialogTestRef",
             ref: dialogTestRef,
             onMousedown: dialogMousedown,
@@ -175,11 +184,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "close-on-click-modal": false,
             "close-on-press-escape": false,
             "show-close": false,
-            "modal-penetrable": "",
-            "modal-class": {
-              "hy-dialog-app-shrink": animating.value || minimized.value,
-              "hy-dialog-is-minimized": minimized.value
-            },
+            "modal-class": modalClass.value,
             modelValue: visible.value,
             "onUpdate:modelValue": ($event) => visible.value = $event,
             width: props.width,
@@ -285,7 +290,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ]),
             _: 3
             /* FORWARDED */
-          }, 16, ["modal-class", "modelValue", "onUpdate:modelValue", "width", "top"])
+          }, 16, ["z-index", "draggable", "modal", "overflow", "modal-class", "modelValue", "onUpdate:modelValue", "width", "top"])
         ],
         2112
         /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */

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/hySearch/cpns/searchItem.vue.mjs

@@ -218,7 +218,8 @@ const _sfc_main = {
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
                         }, __props.column.attrs, {
-                          disabled: unref(isDisabled)(props, __props.column)
+                          disabled: unref(isDisabled)(props, __props.column),
+                          onChange: onChangeHandler
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
                       ],
                       2112

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

@@ -2,7 +2,7 @@ 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';
@@ -36,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);
@@ -53,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);
@@ -105,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;
         },
@@ -133,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;
         }
@@ -250,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

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,
@@ -435,7 +435,7 @@ const _sfc_main = {
                         /* STABLE_FRAGMENT */
                       )) : column.type === "operator" ? (openBlock(), createElementBlock("div", {
                         key: 4,
-                        class: "w-full flex items-center justify-end gap-2 text-main",
+                        class: "w-full flex items-center justify-end gap-3 text-main",
                         onClick: withModifiers(() => {
                         }, ["stop"]),
                         onContextmenu: withModifiers(() => {

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() {
@@ -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 {
     // 表格配置项

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

@@ -1,5 +1,5 @@
 import { toRef } from 'vue';
-import { isEmpty, isBoolean, isString, isObject } from '../../../utils/is.mjs';
+import { isEmpty, isBoolean, isString, isObject, isPermission } from '../../../utils/is.mjs';
 import { useAppSearch } from '../../hySearch/js/useAppSearch.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 
@@ -13,7 +13,7 @@ function getColumnDefaultConfig(column) {
       };
     case "index":
       return {
-        props: `${column.type}_prop`,
+        prop: `${column.type}_prop`,
         label: t("table.index")
       };
     case "expand":
@@ -34,7 +34,21 @@ function getColumnDefaultWidth(column) {
   if (column.type === "expand" && column.expandType === "expand") return 40;
   if (column.type === "selection") return 40;
   if (column.type === "index") return 80;
-  if (column.type === "operator") return 172;
+  if (column.type === "operator") {
+    const length = (column.operator || []).reduce((total, item) => {
+      if (!item.permission && isPermission(item.permission)) {
+        total++;
+      }
+      return total;
+    }, 0);
+    if (length >= 3) {
+      return 168;
+    } else if (length === 2) {
+      return 168 - 52;
+    } else {
+      return 168 - 52 * 2;
+    }
+  }
   return;
 }
 function generateColumnItem(column) {
@@ -58,13 +72,13 @@ function getColumnEditable(column, index) {
     };
   }
   return {
-    index: type === "operator" ? 1e3 : index,
     lock: false,
     edit: !type || type === "default",
     checked: !type || type !== "default" || type === "operator",
     desc: void 0,
     examples: [],
-    ...editable || {}
+    ...editable || {},
+    index: type === "operator" ? 1e3 : index
   };
 }
 function getColumnSort(column) {
@@ -88,7 +102,7 @@ function getColumnSort(column) {
   return sort;
 }
 const useAppTable = (config = {}) => {
-  const { columns, filterModel, filterColumns } = config || {};
+  const { columns, filterModel = {}, filterColumns } = config || {};
   const tableColumns = [];
   let defaultSortInfo = null;
   try {

package/es/components/hyTable/style/table.scss

@@ -6,21 +6,26 @@
   color: rgb(var(--hy-main));
   font-size: 14px;
   background-color: rgb(var(--hy-background));
-  .el-table {
+  .hy-el-table {
     &.hideSelect {
       /* 禁用全选 */
-      .el-table__header-wrapper .el-checkbox {
+      .hy-el-table__header-wrapper .hy-el-checkbox {
         display: none !important;
       }
     }
-    .el-table__cell .cell {
+    .hy-el-table__cell .cell {
       display: flex;
       align-items: center;
-      .el-table__expand-icon {
+      .hy-el-table__expand-icon {
         flex-shrink: 0;
       }
     }
   }
+  .hy-el-table-v2 {
+    .hy-el-table-v2__row-cell {
+      padding: 8px 12px;
+    }
+  }
   .hy-table-search {
     width: 160px;
     .hy-el-input__inner::placeholder {

package/es/components/hyTable/table.vue.mjs

@@ -482,7 +482,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               default: withCtx((scope) => [
                                 column?.slot ? renderSlot(_ctx.$slots, column?.slot, mergeProps({ ref_for: true }, scope), void 0, void 0, 0) : column.type === "operator" ? (openBlock(), createElementBlock("div", {
                                   key: 1,
-                                  class: "flex items-center justify-end gap-2 text-main"
+                                  class: "w-full flex items-center justify-end gap-3 text-main"
                                 }, [
                                   (openBlock(true), createElementBlock(
                                     Fragment,

package/es/style/element/hy-element.scss

@@ -216,6 +216,16 @@
   white-space: nowrap;
 }
 
+.hy-el-textarea__clear {
+  position: absolute;
+  right: 11px;
+  top: 15px;
+  transform: translateY(-50%);
+  color: var(--el-input-icon-color);
+  font-size: 14px;
+  cursor: pointer;
+}
+
 // 日期选择器
 .hy-el-popper.hy-el-tooltip.hy-el-picker__popper {
   --hy-el-border-color-light: rgba(var(--hy-auxiliary), 1);
@@ -921,6 +931,12 @@
       position: relative;
       height: 38px;
       padding-left: 20px;
+
+      .hy-el-collapse-item__title {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
 
     .hy-el-collapse-item__wrap {
@@ -954,6 +970,7 @@
     td.is-selected {
       box-shadow: 0px 0 12px 0px rgba(var(--hy-theme), 1) inset;
       background: rgba(var(--hy-background-2), 1);
+
       .hy-el-calendar-day {
         border: 1px solid rgba(var(--hy-theme), 1);
       }

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.33";
+const version = "0.2.35";
 
 export { version };

package/lib/components/hyDialog/dialog.vue.js

@@ -27,11 +27,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: String,
       default: "default"
     },
-    zIndex: {
-      type: Number,
-      default: null
-      // default-默认类型 right-右侧弹窗 fullscreen-全屏
-    },
+    // zIndex: {
+    //   type: Number,
+    //   default: null, // default-默认类型 right-右侧弹窗 fullscreen-全屏
+    // },
     top: String,
     // 支持缩小化
     showShrink: { type: Boolean, default: false },
@@ -136,7 +135,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         onEnd?.();
       }, 750);
     }
-    function showToWorkspace(initDragLevelIndex) {
+    function setDragLevelIndex(initDragLevelIndex) {
       dragLevelIndex.value = initDragLevelIndex;
       if (minimized.value) runAnim();
       minimized.value = false;
@@ -151,11 +150,20 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     const dialogTestRef = vue.ref();
     function dialogMousedown(e) {
-      if (props.zIndex != null) return;
       emits("onDialogMousedown", e);
     }
+    const modalClass = vue.computed(() => {
+      const classes = [];
+      if (animating.value || minimized.value) {
+        classes.push("hy-dialog-app-shrink");
+      }
+      if (minimized.value) {
+        classes.push("hy-dialog-is-minimized");
+      }
+      return classes.join(" ");
+    });
     __expose({
-      showToWorkspace,
+      setDragLevelIndex,
       hideToWorkspace
     });
     return (_ctx, _cache) => {
@@ -164,14 +172,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         null,
         [
           vue.createCommentVNode("  @mousedown.stop"),
-          vue.createCommentVNode('  :z-index="zIndex || dragLevelIndex"'),
-          vue.createCommentVNode("  draggable"),
           vue.createCommentVNode(`  :align-center="!['right', 'fullscreen'].includes(props.dialogType)"`),
           vue.createCommentVNode('  body-class="h-0 flex-1"'),
           vue.createCommentVNode('  :class="dialogClass"'),
-          vue.createCommentVNode('  :overflow="false"'),
-          vue.createCommentVNode('  :modal="false"'),
           vue.createVNode(vue.unref(elementPlus.ElDialog), vue.mergeProps({
+            "z-index": dragLevelIndex.value,
+            draggable: props.showShrink,
+            modal: !props.showShrink,
+            overflow: !props.showShrink,
+            "modal-penetrable": "",
             ref_key: "dialogTestRef",
             ref: dialogTestRef,
             onMousedown: dialogMousedown,
@@ -179,11 +188,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             "close-on-click-modal": false,
             "close-on-press-escape": false,
             "show-close": false,
-            "modal-penetrable": "",
-            "modal-class": {
-              "hy-dialog-app-shrink": animating.value || minimized.value,
-              "hy-dialog-is-minimized": minimized.value
-            },
+            "modal-class": modalClass.value,
             modelValue: visible.value,
             "onUpdate:modelValue": ($event) => visible.value = $event,
             width: props.width,
@@ -289,7 +294,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ]),
             _: 3
             /* FORWARDED */
-          }, 16, ["modal-class", "modelValue", "onUpdate:modelValue", "width", "top"])
+          }, 16, ["z-index", "draggable", "modal", "overflow", "modal-class", "modelValue", "onUpdate:modelValue", "width", "top"])
         ],
         2112
         /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */

package/lib/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/lib/components/hySearch/cpns/searchItem.vue.js

@@ -222,7 +222,8 @@ const _sfc_main = {
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
                         }, __props.column.attrs, {
-                          disabled: vue.unref(index.isDisabled)(props, __props.column)
+                          disabled: vue.unref(index.isDisabled)(props, __props.column),
+                          onChange: onChangeHandler
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
                       ],
                       2112

package/lib/components/hyTable/cpns/columnSelect.vue.js

@@ -6,11 +6,11 @@ var vue = require('vue');
 var Sortable = require('sortablejs');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
-var index$2 = require('../js/index.js');
+var index = require('../js/index.js');
 var columnSelectItem = require('./columnSelectItem.vue.js');
 var useLocale = require('../../../hooks/useLocale.js');
-var index = require('../../hyTooltip/index.js');
-var index$1 = require('../../hyButton/index.js');
+var index$1 = require('../../hyTooltip/index.js');
+var index$2 = require('../../hyButton/index.js');
 var is = require('../../../utils/is.js');
 
 const _sfc_main = {
@@ -40,11 +40,11 @@ const _sfc_main = {
     const tableEditableColumns = vue.ref([]);
     const showColumnsLength = vue.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 index.tableColumnShowHandler(column) && column.editable.edit;
     }
     function showPopover() {
       initColumnsInfo(props.columns, props.columnsEditable);
@@ -57,26 +57,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 = vue.ref(true);
@@ -109,7 +103,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;
         },
@@ -119,7 +113,7 @@ const _sfc_main = {
       closePopover();
     }
     function onClearHandler() {
-      const { columnsList, columnsEditablele } = index$2.tableColumnHandler(
+      const { columnsList, columnsEditablele } = index.tableColumnHandler(
         props.originColumns
       );
       initColumnsInfo(columnsList, columnsEditablele);
@@ -137,29 +131,19 @@ const _sfc_main = {
           const { oldIndex, newIndex } = event;
           if (is.isEmpty(oldIndex) || is.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;
         }
@@ -254,7 +238,7 @@ const _sfc_main = {
                               vue.Fragment,
                               { key: index },
                               [
-                                !isFilterColumn(item) && item.editable.lock ? (vue.openBlock(), vue.createBlock(columnSelectItem.default, {
+                                isShowColumn(item) && item.editable.lock ? (vue.openBlock(), vue.createBlock(columnSelectItem.default, {
                                   key: 0,
                                   column: item,
                                   checkMap: checkMap.value
@@ -336,13 +320,13 @@ const _sfc_main = {
                     _: 1
                     /* STABLE */
                   }),
-                  checkedList.value?.length >= 8 ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
+                  checkedList.value?.length >= 8 ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
                     key: 0,
                     "is-always": false,
                     content: vue.unref(t)("table.tooManyFieldsWillAffectReadability"),
                     class: "mr-2 text-auxiliary"
                   }, null, 8, ["content"])) : vue.createCommentVNode("v-if", true),
-                  vue.createVNode(vue.unref(index$1.HyButton), {
+                  vue.createVNode(vue.unref(index$2.HyButton), {
                     type: "primary",
                     size: "small",
                     onClick: onConfirmHandler

package/lib/components/hyTable/cpns/virtualTable.vue.js

@@ -312,8 +312,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,
@@ -439,7 +439,7 @@ const _sfc_main = {
                         /* STABLE_FRAGMENT */
                       )) : column.type === "operator" ? (vue.openBlock(), vue.createElementBlock("div", {
                         key: 4,
-                        class: "w-full flex items-center justify-end gap-2 text-main",
+                        class: "w-full flex items-center justify-end gap-3 text-main",
                         onClick: vue.withModifiers(() => {
                         }, ["stop"]),
                         onContextmenu: vue.withModifiers(() => {

package/lib/components/hyTable/js/index.js

@@ -15,67 +15,67 @@ function tableColumnShowHandler(column) {
   if (is.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 && !is.isPermission(permission)) {
+      otherColumns.push(column);
+    } else {
+      let { sortIndex, checked } = cacheColumnsValue?.[prop] || {};
+      obj[prop] = {
+        prop,
+        sortIndex: is.isNumber(sortIndex) ? sortIndex : editable.index,
+        checked: is.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 && !is.isPermission(operator.permission)) {
@@ -161,17 +161,35 @@ const useAppTableWrapper = (hy) => {
   const tableColumnsList = vue.computed(() => {
     return tableColumns.value.filter((column) => tableColumnShowHandler(column));
   });
-  const searchPlaceholder = vue.ref("");
+  const searchPlaceholder = vue.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 (is.isString(props.rowKey)) return row[props.rowKey];
     if (is.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() {
@@ -337,12 +355,10 @@ const useAppTableWrapper = (hy) => {
   vue.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 {
     // 表格配置项

package/lib/components/hyTable/js/useAppTable.js

@@ -15,7 +15,7 @@ function getColumnDefaultConfig(column) {
       };
     case "index":
       return {
-        props: `${column.type}_prop`,
+        prop: `${column.type}_prop`,
         label: t("table.index")
       };
     case "expand":
@@ -36,7 +36,21 @@ function getColumnDefaultWidth(column) {
   if (column.type === "expand" && column.expandType === "expand") return 40;
   if (column.type === "selection") return 40;
   if (column.type === "index") return 80;
-  if (column.type === "operator") return 172;
+  if (column.type === "operator") {
+    const length = (column.operator || []).reduce((total, item) => {
+      if (!item.permission && is.isPermission(item.permission)) {
+        total++;
+      }
+      return total;
+    }, 0);
+    if (length >= 3) {
+      return 168;
+    } else if (length === 2) {
+      return 168 - 52;
+    } else {
+      return 168 - 52 * 2;
+    }
+  }
   return;
 }
 function generateColumnItem(column) {
@@ -60,13 +74,13 @@ function getColumnEditable(column, index) {
     };
   }
   return {
-    index: type === "operator" ? 1e3 : index,
     lock: false,
     edit: !type || type === "default",
     checked: !type || type !== "default" || type === "operator",
     desc: void 0,
     examples: [],
-    ...editable || {}
+    ...editable || {},
+    index: type === "operator" ? 1e3 : index
   };
 }
 function getColumnSort(column) {
@@ -90,7 +104,7 @@ function getColumnSort(column) {
   return sort;
 }
 const useAppTable = (config = {}) => {
-  const { columns, filterModel, filterColumns } = config || {};
+  const { columns, filterModel = {}, filterColumns } = config || {};
   const tableColumns = [];
   let defaultSortInfo = null;
   try {

package/lib/components/hyTable/style/table.scss

@@ -6,21 +6,26 @@
   color: rgb(var(--hy-main));
   font-size: 14px;
   background-color: rgb(var(--hy-background));
-  .el-table {
+  .hy-el-table {
     &.hideSelect {
       /* 禁用全选 */
-      .el-table__header-wrapper .el-checkbox {
+      .hy-el-table__header-wrapper .hy-el-checkbox {
         display: none !important;
       }
     }
-    .el-table__cell .cell {
+    .hy-el-table__cell .cell {
       display: flex;
       align-items: center;
-      .el-table__expand-icon {
+      .hy-el-table__expand-icon {
         flex-shrink: 0;
       }
     }
   }
+  .hy-el-table-v2 {
+    .hy-el-table-v2__row-cell {
+      padding: 8px 12px;
+    }
+  }
   .hy-table-search {
     width: 160px;
     .hy-el-input__inner::placeholder {

package/lib/components/hyTable/table.vue.js

@@ -486,7 +486,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               default: vue.withCtx((scope) => [
                                 column?.slot ? vue.renderSlot(_ctx.$slots, column?.slot, vue.mergeProps({ ref_for: true }, scope), void 0, void 0, 0) : column.type === "operator" ? (vue.openBlock(), vue.createElementBlock("div", {
                                   key: 1,
-                                  class: "flex items-center justify-end gap-2 text-main"
+                                  class: "w-full flex items-center justify-end gap-3 text-main"
                                 }, [
                                   (vue.openBlock(true), vue.createElementBlock(
                                     vue.Fragment,

package/lib/style/element/hy-element.scss

@@ -216,6 +216,16 @@
   white-space: nowrap;
 }
 
+.hy-el-textarea__clear {
+  position: absolute;
+  right: 11px;
+  top: 15px;
+  transform: translateY(-50%);
+  color: var(--el-input-icon-color);
+  font-size: 14px;
+  cursor: pointer;
+}
+
 // 日期选择器
 .hy-el-popper.hy-el-tooltip.hy-el-picker__popper {
   --hy-el-border-color-light: rgba(var(--hy-auxiliary), 1);
@@ -921,6 +931,12 @@
       position: relative;
       height: 38px;
       padding-left: 20px;
+
+      .hy-el-collapse-item__title {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
 
     .hy-el-collapse-item__wrap {
@@ -954,6 +970,7 @@
     td.is-selected {
       box-shadow: 0px 0 12px 0px rgba(var(--hy-theme), 1) inset;
       background: rgba(var(--hy-background-2), 1);
+
       .hy-el-calendar-day {
         border: 1px solid rgba(var(--hy-theme), 1);
       }

package/lib/version.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "0.2.33";
+const version = "0.2.35";
 
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.34",
+  "version": "0.2.36",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "scripts": {
@@ -22,7 +22,6 @@
     "body-parser": "^2.3.0",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.20",
-    "element-plus": "^2.14.2",
     "express": "^5.2.1",
     "hy-virtual-tree": "^2.4.4",
     "lodash-unified": "^1.0.3",
@@ -30,13 +29,12 @@
     "mysql": "^2.18.1",
     "sortablejs": "^1.15.7",
     "vite-plugin-svg-icons": "^2.0.1",
-    "vue": "^3.5.25",
     "vue-cropper": "^1.1.4",
-    "vue-router": "^5.0.3",
     "xlsx": "^0.17.3"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.28.6",
+    "@babel/parser": "^8.0.4",
     "@pnpm/find-workspace-packages": "^6.0.9",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "7.0.0",
@@ -136,8 +134,17 @@
     "./tailwind.css": "./dist/tailwind.css"
   },
   "peerDependencies": {
+    "element-plus": ">=2.13.0",
     "vue": ">=3.5.25"
   },
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "@parcel/watcher",
+      "es5-ext",
+      "esbuild",
+      "fsevents"
+    ]
+  },
   "author": "sailor-lin",
   "license": "MIT"
 }