hy-dispatch-ui-v3 0.2.32 → 0.2.34

package/lib/components/hyIconBox/style/iconBox.scss

@@ -4,23 +4,24 @@
   & + & {
     margin-left: 12px;
   }
-}
 
-.hy-icon-box-content {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  padding: 5px;
-  user-select: none;
-  color: rgb(var(--hy-main));
-  border-radius: 100%;
-  background:
-    radial-gradient(
-      142% 47% at 50% 119%,
-      rgb(var(--hy-theme), 0.5) 0%,
-      rgb(var(--hy-theme), 0) 100%
-    ),
-    rgb(var(--hy-background-3));
-  border: 1px solid rgb(var(--hy-auxiliary), 0.5);
-  box-shadow: 0px 2px 5px 0px rgba(29, 33, 41, 0.5);
+  .hy-icon-box-content {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    padding: 5px;
+    user-select: none;
+    color: rgb(var(--hy-main));
+    border-radius: 100%;
+    background:
+      radial-gradient(
+        142% 47% at 50% 119%,
+        rgb(var(--hy-theme), 0.5) 0%,
+        rgb(var(--hy-theme), 0) 100%
+      ),
+      rgb(var(--hy-background-3));
+    border: 1px solid rgb(var(--hy-auxiliary), 0.5);
+    box-shadow: 0px 2px 5px 0px rgba(29, 33, 41, 0.5);
+  }
 }
+

package/lib/components/hyInput/input.vue.js

@@ -20,7 +20,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       // between-清除两端空格 all-清除所有空格 before-清除前面的空格 after-清除后面的空格 none-不清除空格
     }
   }, {
-    "modelValue": { type: String, default: "" },
+    "modelValue": {
+      type: [String, Number],
+      default: ""
+    },
     "modelModifiers": {}
   }),
   emits: /* @__PURE__ */ vue.mergeModels([], ["update:modelValue"]),

package/lib/components/hyNoPermissions/noPermissions.vue.js

@@ -15,7 +15,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/lib/components/hyNoPermissionsMap/noPermissionsMap.vue.js

@@ -15,7 +15,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/lib/components/hyOrgCascader/orgCascader.vue.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
-var useLocale = require('../../hooks/useLocale.js');
 var useApi = require('../../hooks/useApi.js');
+var useLocale = require('../../hooks/useLocale.js');
 
 import "./style/orgCascader.scss";
 

package/lib/components/hySearch/cpns/searchItem.vue.js

@@ -79,7 +79,7 @@ const _sfc_main = {
         prop: columnProp.value
       }, {
         default: vue.withCtx(() => [
-          vue.createElementVNode("div", { class: "flex bg-background-2 rounded border border-transparent hover:border-theme box-border" }, [
+          vue.createElementVNode("div", { class: "flex bg-background-2 rounded outline outline-1 outline-transparent outline-offset-0 hover:outline-theme box-border" }, [
             vue.createElementVNode(
               "div",
               {
@@ -96,10 +96,7 @@ const _sfc_main = {
                     }])
                   },
                   [
-                    __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] ? vue.renderSlot(_ctx.$slots, __props.column.labelSlot, {
-                      key: 0,
-                      column: __props.column
-                    }) : (vue.openBlock(), vue.createElementBlock(
+                    __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] ? vue.renderSlot(_ctx.$slots, __props.column.labelSlot, { column: __props.column }, void 0, void 0, 0) : (vue.openBlock(), vue.createElementBlock(
                       "span",
                       { key: 1 },
                       vue.toDisplayString(__props.column.label),
@@ -119,10 +116,7 @@ const _sfc_main = {
                   },
                   [
                     vue.createCommentVNode(" \u81EA\u5B9A\u4E49\u5177\u540D\u63D2\u69FD "),
-                    __props.column.slot ? vue.renderSlot(_ctx.$slots, __props.column.slot, {
-                      key: 0,
-                      column: __props.column
-                    }) : __props.column.type === "input" ? (vue.openBlock(), vue.createElementBlock(
+                    __props.column.slot ? vue.renderSlot(_ctx.$slots, __props.column.slot, { column: __props.column }, void 0, void 0, 0) : __props.column.type === "input" ? (vue.openBlock(), vue.createElementBlock(
                       vue.Fragment,
                       { key: 1 },
                       [

package/lib/components/hySearch/js/index.js

@@ -57,13 +57,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() {
@@ -76,7 +76,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/lib/components/hySearch/style/search.scss

@@ -11,59 +11,60 @@
     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;
+    padding: 1px;
+    .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/columnSelect.vue.js

@@ -6,10 +6,11 @@ var vue = require('vue');
 var Sortable = require('sortablejs');
 var elementPlus = require('element-plus');
 var iconsVue = require('@element-plus/icons-vue');
-var index$1 = require('../js/index.js');
+var index$2 = require('../js/index.js');
 var columnSelectItem = require('./columnSelectItem.vue.js');
 var useLocale = require('../../../hooks/useLocale.js');
-var index = require('../../hyButton/index.js');
+var index = require('../../hyTooltip/index.js');
+var index$1 = require('../../hyButton/index.js');
 var is = require('../../../utils/is.js');
 
 const _sfc_main = {
@@ -118,7 +119,7 @@ const _sfc_main = {
       closePopover();
     }
     function onClearHandler() {
-      const { columnsList, columnsEditablele } = index$1.tableColumnHandler(
+      const { columnsList, columnsEditablele } = index$2.tableColumnHandler(
         props.originColumns
       );
       initColumnsInfo(columnsList, columnsEditablele);
@@ -232,7 +233,7 @@ const _sfc_main = {
                   /* STABLE */
                 })
               ]),
-              vue.createElementVNode("div", { class: "h-[364px] px-4 pt-[11px] pb-1 overflow-y-auto" }, [
+              vue.createElementVNode("div", { class: "h-[364px] px-4 pt-[11px] pb-1 scroll-body overflow-y-auto" }, [
                 vue.createVNode(vue.unref(elementPlus.ElCheckboxGroup), {
                   modelValue: checkedList.value,
                   "onUpdate:modelValue": ($event) => checkedList.value = $event
@@ -303,49 +304,45 @@ const _sfc_main = {
                   /* STABLE */
                 }, 8, ["modelValue", "onUpdate:modelValue"])
               ]),
-              vue.createElementVNode("div", { class: "flex items-center pt-[5px] pb-4 pl-[14px] pr-3" }, [
-                vue.createElementVNode(
-                  "span",
-                  null,
-                  vue.toDisplayString(vue.unref(t)("table.haveBeenSelected", [checkedList.value?.length || 0])),
-                  1
-                  /* TEXT */
-                ),
-                showClear.value ? (vue.openBlock(), vue.createElementBlock(
-                  "span",
-                  {
-                    key: 0,
-                    class: "clickBox text-danger-2 ml-3",
-                    onClick: onClearHandler
-                  },
-                  vue.toDisplayString(vue.unref(t)("table.clear")),
-                  1
-                  /* TEXT */
-                )) : vue.createCommentVNode("v-if", true),
-                vue.createElementVNode("div", { class: "flex items-center ml-auto" }, [
-                  checkedList.value?.length >= 8 ? (vue.openBlock(), vue.createElementBlock("span", {
+              vue.createElementVNode("div", { class: "flex items-center pt-[5px] pb-4 pl-[14px] pr-3 overflow-hidden" }, [
+                vue.createElementVNode("div", { class: "flex items-center" }, [
+                  vue.createElementVNode(
+                    "span",
+                    null,
+                    vue.toDisplayString(vue.unref(t)("table.selectedNumberItems", [checkedList.value?.length || 0])),
+                    1
+                    /* TEXT */
+                  ),
+                  showClear.value ? (vue.openBlock(), vue.createElementBlock(
+                    "span",
+                    {
+                      key: 0,
+                      class: "clickBox text-danger-2 ml-3",
+                      onClick: onClearHandler
+                    },
+                    vue.toDisplayString(vue.unref(t)("table.clear")),
+                    1
+                    /* TEXT */
+                  )) : vue.createCommentVNode("v-if", true)
+                ]),
+                vue.createElementVNode("div", { class: "w-0 flex-1 flex items-center justify-end ml-3" }, [
+                  vue.createVNode(vue.unref(elementPlus.ElIcon), {
+                    class: "mr-1.5",
+                    color: "rgb(var(--hy-auxiliary))"
+                  }, {
+                    default: vue.withCtx(() => [
+                      vue.createVNode(vue.unref(iconsVue.Warning))
+                    ]),
+                    _: 1
+                    /* STABLE */
+                  }),
+                  checkedList.value?.length >= 8 ? (vue.openBlock(), vue.createBlock(vue.unref(index.HyTooltip), {
                     key: 0,
-                    class: "flex items-center mr-2 text-auxiliary"
-                  }, [
-                    vue.createVNode(vue.unref(elementPlus.ElIcon), {
-                      class: "mr-1.5",
-                      color: "rgb(var(--hy-auxiliary))"
-                    }, {
-                      default: vue.withCtx(() => [
-                        vue.createVNode(vue.unref(iconsVue.Warning))
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    }),
-                    vue.createElementVNode(
-                      "span",
-                      null,
-                      vue.toDisplayString(vue.unref(t)("table.tooManyFieldsWillAffectReadability")),
-                      1
-                      /* TEXT */
-                    )
-                  ])) : vue.createCommentVNode("v-if", true),
-                  vue.createVNode(vue.unref(index.HyButton), {
+                    "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), {
                     type: "primary",
                     size: "small",
                     onClick: onConfirmHandler

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

@@ -94,16 +94,13 @@ const _sfc_main = {
               )),
               __props.columnsLength > 1 ? (vue.openBlock(), vue.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: vue.withModifiers(() => {
                 }, ["stop"])
               }, [
-                vue.createVNode(vue.unref(elementPlus.ElIcon), null, {
-                  default: vue.withCtx(() => [
-                    vue.createVNode(vue.unref(iconsVue.DCaret))
-                  ]),
-                  _: 1
-                  /* STABLE */
+                vue.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"])) : vue.createCommentVNode("v-if", true)
             ])) : vue.createCommentVNode("v-if", true)

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

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

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)) {
@@ -349,9 +359,8 @@ const _sfc_main = {
         row: vue.withCtx(({ columns, depth, rowData: row, rowIndex: $index }) => [
           vue.createCommentVNode(" \u5C55\u5F00\u5185\u5BB9 "),
           depth > 0 && isExpandTable.value ? vue.renderSlot(_ctx.$slots, expandColumn.value.slot, {
-            key: 0,
             row: dataSourceMap.value.get(row.dataKey)
-          }) : (vue.openBlock(), vue.createElementBlock(
+          }, void 0, void 0, 0) : (vue.openBlock(), vue.createElementBlock(
             vue.Fragment,
             { key: 1 },
             [
@@ -386,6 +395,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(() => [
@@ -415,10 +425,7 @@ const _sfc_main = {
                         indeterminate: indeterminateKeys.value.has(getRowKey(row)),
                         disabled: !isSelectable(row),
                         onClick: vue.withModifiers(($event) => switchCheckHandler(row), ["stop"])
-                      }, null, 8, ["model-value", "indeterminate", "disabled", "onClick"])) : column?.slot && (column.type !== "expand" || !isExpandTable.value) ? vue.renderSlot(_ctx.$slots, column?.slot, vue.mergeProps({
-                        key: 2,
-                        ref_for: true
-                      }, { column, row, $index, cellIndex })) : column.type === "index" ? (vue.openBlock(), vue.createElementBlock(
+                      }, null, 8, ["model-value", "indeterminate", "disabled", "onClick"])) : column?.slot && (column.type !== "expand" || !isExpandTable.value) ? vue.renderSlot(_ctx.$slots, column?.slot, vue.mergeProps({ ref_for: true }, { column, row, $index, cellIndex }), void 0, void 0, 2) : column.type === "index" ? (vue.openBlock(), vue.createElementBlock(
                         vue.Fragment,
                         { key: 3 },
                         [
@@ -432,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-between text-main",
+                        class: "w-full flex items-center justify-end gap-2 text-main",
                         onClick: vue.withModifiers(() => {
                         }, ["stop"]),
                         onContextmenu: vue.withModifiers(() => {
@@ -450,7 +457,7 @@ const _sfc_main = {
                               key: cindex,
                               "is-always": "",
                               overLine: 1,
-                              content: citem.label
+                              content: citem.desc
                             }, {
                               default: vue.withCtx(() => [
                                 vue.createElementVNode("div", {
@@ -466,13 +473,13 @@ const _sfc_main = {
                                     "svg-name": citem.svgName,
                                     "class-name": "!w-4 !h-4"
                                   }, null, 8, ["svg-name"]),
-                                  citem.subLabel ? (vue.openBlock(), vue.createElementBlock(
+                                  citem.label ? (vue.openBlock(), vue.createElementBlock(
                                     "div",
                                     {
                                       key: 0,
                                       class: "mt-1 whitespace-nowrap"
                                     },
-                                    vue.toDisplayString(citem.subLabel),
+                                    vue.toDisplayString(citem.label),
                                     1
                                     /* TEXT */
                                   )) : (vue.openBlock(), vue.createElementBlock("div", {

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 && 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/js/useAppTable.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var vue = require('vue');
-var useAppSearch = require('../../hySearch/js/useAppSearch.js');
 var is = require('../../../utils/is.js');
+var useAppSearch = require('../../hySearch/js/useAppSearch.js');
 var useLocale = require('../../../hooks/useLocale.js');
 
 function getColumnDefaultConfig(column) {

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

@@ -38,3 +38,16 @@
     }
   }
 }
+
+.hy-table-dropdown-menu.hy-el-dropdown-menu {
+  --hy-el-text-color-regular: rgba(var(--hy-main));
+  border: 1px solid rgba(var(--hy-main));
+  padding: 0px;
+  .hy-el-dropdown-menu__item {
+    padding: 9px 16px 10px;
+    border-bottom: 1px solid rgba(var(--hy-border));
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+}