hy-dispatch-ui-v3 0.2.32 → 0.2.33

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

@@ -11,59 +11,59 @@
     padding-bottom: 0;
     opacity: 0;
   }
-}
-.hy-search-header {
-  height: 16px;
-  display: flex;
-  align-items: center;
-  font-size: 12px;
-  color: rgb(var(--hy-main));
-  margin-bottom: 16px;
-  transition: all 0.3s linear;
-  &.hy-search-header-hidden {
-    height: 0;
-    margin-bottom: 0px;
-  }
-}
-.hy-search-form {
-  overflow: hidden;
-  transition: all 0.3s;
-}
-.hy-search-container {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 16px;
-  position: relative;
-  .hy-el-form-item {
-    margin-bottom: 0;
-    &.hidden {
-      display: none;
+  .hy-search-header {
+    height: 16px;
+    display: flex;
+    align-items: center;
+    font-size: 12px;
+    color: rgb(var(--hy-main));
+    margin-bottom: 16px;
+    transition: all 0.3s linear;
+    &.hy-search-header-hidden {
+      height: 0;
+      margin-bottom: 0px;
     }
   }
-  .hy-el-input,
-  .hy-el-date-editor {
-    --el-input-bg-color: transparent;
-    --el-input-border: none;
-    --el-border-color: transparent;
-    --el-input-border-color: transparent;
-    --el-input-text-color: rgb(var(--hy-main));
-    --el-input-border-radius: 0px 4px 4px 0px;
-    --el-input-hover-border-color: rgb(var(--hy-theme));
-    .hy-el-input__wrapper,
-    &.hy-el-input__wrapper {
-      box-shadow: none !important;
-    }
+  .hy-search-form {
+    overflow: hidden;
+    transition: all 0.3s;
   }
-  .hy-el-select {
-    --el-border-color: transparent;
-    --el-fill-color-blank: transparent;
-    --el-border-radius-base: 0px 4px 4px 0px;
-    --el-border-color-hover: rgb(var(--hy-theme));
-    .hy-el-select__wrapper {
-      box-shadow: none !important;
+  .hy-search-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16px;
+    position: relative;
+    .hy-el-form-item {
+      margin-bottom: 0;
+      &.hidden {
+        display: none;
+      }
+    }
+    .hy-el-input,
+    .hy-el-date-editor {
+      --el-input-bg-color: transparent;
+      --el-input-border: none;
+      --el-border-color: transparent;
+      --el-input-border-color: transparent;
+      --el-input-text-color: rgb(var(--hy-main));
+      --el-input-border-radius: 0px 4px 4px 0px;
+      --el-input-hover-border-color: rgb(var(--hy-theme));
+      .hy-el-input__wrapper,
+      &.hy-el-input__wrapper {
+        box-shadow: none !important;
+      }
+    }
+    .hy-el-select {
+      --el-border-color: transparent;
+      --el-fill-color-blank: transparent;
+      --el-border-radius-base: 0px 4px 4px 0px;
+      --el-border-color-hover: rgb(var(--hy-theme));
+      .hy-el-select__wrapper {
+        box-shadow: none !important;
+      }
+    }
+    .hy-search-custom-wrapper {
+      min-height: var(--hy-el-component-size);
     }
-  }
-  .hy-search-custom-wrapper {
-    min-height: var(--hy-el-component-size);
   }
 }

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

@@ -57,6 +57,12 @@ const _sfc_main = {
     },
     onRowContextmenu: {
       type: Function
+    },
+    expandMode: {
+      // 展开模式，不支持树形展开
+      type: String,
+      default: "default"
+      // deafult-默认 accordion-手风琴
     }
   },
   emits: ["search", "select", "select-all", "expand-change"],
@@ -262,7 +268,11 @@ const _sfc_main = {
       const isExpanded = is.isBoolean(expanded) ? expanded : !is.isNumber(index);
       if (isExpanded) {
         if (!is.isNumber(index)) {
-          expandedKeys.value.push(getRowKey(row));
+          if (props.expandMode === "accordion" && isExpandTable.value) {
+            expandedKeys.value = [getRowKey(row)];
+          } else {
+            expandedKeys.value.push(getRowKey(row));
+          }
         }
       } else {
         if (is.isNumber(index)) {
@@ -386,6 +396,7 @@ const _sfc_main = {
                             }), ["stop"])
                           }, [
                             vue.createVNode(vue.unref(elementPlus.ElIcon), {
+                              class: "text-main",
                               style: vue.normalizeStyle({ "margin-inline-start": `${depth * 12}px` })
                             }, {
                               default: vue.withCtx(() => [

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

@@ -316,6 +316,17 @@ const useAppTableWrapper = (hy) => {
       tableRef.value.toggleRowExpansion(row);
     }
   }
+  function onTableRowExpandChangeHandler(row, expandedRows) {
+    if (is.isBoolean(expandedRows) || props.expandMode !== "accordion" || expandedRows.length <= 1) {
+      props.onExpandChange(row, expandedRows);
+      return;
+    } else {
+      expandedRows.forEach((item) => {
+        if (getRowKey(row) === getRowKey(item)) return;
+        toggleRowExpansion(item);
+      });
+    }
+  }
   const isSearchFocus = vue.ref(false);
   function onSearchInputHandler() {
     isSearchFocus.value = true;
@@ -355,6 +366,7 @@ const useAppTableWrapper = (hy) => {
     toggleRowExpansion,
     onTableSelectHandler,
     onTableRowContextmenuHandler,
+    onTableRowExpandChangeHandler,
     onTableRowClickHandler,
     onTableColumnsSelectHandler,
     // 搜索选中

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

@@ -177,6 +177,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       type: Boolean,
       required: false,
       default: true
+    },
+    expandMode: {
+      // 展开模式，不支持树形展开
+      type: String,
+      default: "default"
+      // deafult-默认 accordion-手风琴
+    },
+    onExpandChange: {
+      // 展开回调
+      type: Function
     }
   },
   emits: [
@@ -214,6 +224,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       toggleRowExpansion,
       onTableRowClickHandler,
       onTableRowContextmenuHandler,
+      onTableRowExpandChangeHandler,
       onTableSelectHandler,
       isSearchFocus,
       onSearchInputHandler,
@@ -322,8 +333,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
                         class: "hy-table-search",
                         placeholder: vue.unref(t)("table.searchFor", [__props.controllerText || ""]),
+                        clearable: "",
                         onFocus: vue.unref(onSearchInputHandler),
                         onBlur: vue.unref(onSearchBlurHandler),
+                        onClear: vue.unref(onSearchQueryHandler),
                         onKeydown: vue.withKeys(vue.unref(onSearchQueryHandler), ["enter"])
                       }, {
                         append: vue.withCtx(() => [
@@ -342,7 +355,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         ]),
                         _: 1
                         /* STABLE */
-                      }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onFocus", "onBlur", "onKeydown"])
+                      }, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onFocus", "onBlur", "onClear", "onKeydown"])
                     ],
                     2
                     /* CLASS */
@@ -417,7 +430,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 onSelect: vue.unref(onTableSelectHandler),
                 onSelectAll: vue.unref(onTableSelectHandler),
                 onRowClick: vue.unref(onTableRowClickHandler),
-                onRowContextmenu: vue.unref(onTableRowContextmenuHandler)
+                onRowContextmenu: vue.unref(onTableRowContextmenuHandler),
+                onExpandChange: vue.unref(onTableRowExpandChangeHandler)
               }), {
                 empty: vue.withCtx(() => [
                   vue.renderSlot(_ctx.$slots, "empty", {}, () => [
@@ -658,7 +672,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 3
                 /* FORWARDED */
-              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu"])) : vue.createCommentVNode("v-if", true),
+              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])) : vue.createCommentVNode("v-if", true),
               __props.type === "virtual" ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElAutoResizer), { key: 1 }, {
                 default: vue.withCtx(({ height, width }) => [
                   vue.createVNode(virtualTable.default, vue.mergeProps({
@@ -678,11 +692,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     },
                     "row-key": __props.rowKey,
                     "filter-model": __props.filterModel,
+                    expandMode: __props.expandMode,
                     onSearch: ($event) => vue.unref(getData)(1),
                     onSelect: vue.unref(onTableSelectHandler),
                     onSelectAll: vue.unref(onTableSelectHandler),
                     onRowClick: vue.unref(onTableRowClickHandler),
-                    onRowContextmenu: vue.unref(onTableRowContextmenuHandler)
+                    onRowContextmenu: vue.unref(onTableRowContextmenuHandler),
+                    onExpandChange: __props.onExpandChange
                   }), vue.createSlots({
                     empty: vue.withCtx(() => [
                       vue.createElementVNode("div", { class: "w-full h-full flex items-center justify-center border-b border-border" }, [
@@ -708,7 +724,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         ])
                       };
                     })
-                  ]), 1040, ["width", "height", "data", "columns", "columns-editable", "show-header", "row-class-name", "show-all-select", "style", "row-key", "filter-model", "onSearch", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu"])
+                  ]), 1040, ["width", "height", "data", "columns", "columns-editable", "show-header", "row-class-name", "show-all-select", "style", "row-key", "filter-model", "expandMode", "onSearch", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])
                 ]),
                 _: 3
                 /* FORWARDED */