hy-dispatch-ui-v3 0.2.59 → 0.2.61

package/lib/components/hyMenu/menu.vue.js

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
-var elementPlus = require('element-plus');
-var iconsVue = require('@element-plus/icons-vue');
 var index = require('../hyTooltip/index.js');
 var index$1 = require('../hyIcon/index.js');
 
@@ -25,7 +23,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     },
     showShrink: {
       type: Boolean,
-      default: false
+      default: true
     }
   }, {
     "expand": { type: Boolean, default: true },
@@ -70,18 +68,27 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     }, [
                       vue.createElementVNode("div", { class: "operator-label clickBox" }, [
                         vue.createVNode(vue.unref(index$1.HyIcon), {
-                          "svg-name": `${item.iconName}`,
-                          "class-name": "!w-5 !h-5 flex-shrink-0"
+                          "svg-name": `${item.iconNameV3 || item.iconName}`,
+                          "class-name": "!w-4 !h-4 flex-shrink-0"
                         }, null, 8, ["svg-name"]),
                         vue.createElementVNode(
                           "div",
                           {
-                            class: vue.normalizeClass([{ "ml-3": expand.value }, "over_one_line w-full px-2"])
+                            class: vue.normalizeClass([{
+                              "ml-4 mr-3": expand.value,
+                              "text-center mt-1": !expand.value
+                            }, "over_one_line w-full"])
                           },
                           vue.toDisplayString(expand.value ? item.label : item.tip || item.label),
                           3
                           /* TEXT, CLASS */
-                        )
+                        ),
+                        expand.value && __props.modelValue === item.path ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyIcon), {
+                          key: 0,
+                          "svg-name": "analytics-v3-card-bili",
+                          class: "text-theme",
+                          "class-name": "!w-3 !h-3 flex-shrink-0"
+                        })) : vue.createCommentVNode("v-if", true)
                       ])
                     ], 10, ["onClick"])
                   ]),
@@ -95,23 +102,31 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           ]),
           __props.showShrink ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 0,
-            class: vue.normalizeClass(["w-full h-[44px] border-t border-border box-border cursor-pointer relative", { "justify-end pr-3": expand.value, "justify-center": !expand.value }]),
+            class: vue.normalizeClass(["w-full h-[44px] border-t border-border box-border cursor-pointer relative flex items-center", { "justify-end pr-3": expand.value, "justify-center": !expand.value }]),
             onClick: ($event) => onExpandHandler()
           }, [
-            vue.createVNode(vue.unref(elementPlus.ElIcon), {
-              size: "20",
-              style: vue.normalizeStyle({
-                transform: expand.value ? "translate(0px, -50%) rotateY(0deg) rotateZ(90deg)" : "translate(50%, -50%) rotateY(-180deg) rotateZ(90deg)",
-                transition: "all 0.3s linear"
-              }),
-              class: vue.normalizeClass(["absolute top-1/2", { "right-3": expand.value, "right-1/2": !expand.value }])
-            }, {
-              default: vue.withCtx(() => [
-                vue.createVNode(vue.unref(iconsVue.Download))
-              ]),
-              _: 1
-              /* STABLE */
-            }, 8, ["style", "class"])
+            expand.value ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyIcon), {
+              key: 0,
+              "svg-name": "ops-linear-shouqi",
+              "class-name": "!w-4 !h-4 flex-shrink-0"
+            })) : (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyIcon), {
+              key: 1,
+              "svg-name": "ops-linear-zhankai",
+              "class-name": "!w-4 !h-4 flex-shrink-0"
+            })),
+            vue.createCommentVNode("      <el-icon"),
+            vue.createCommentVNode('        size="20"'),
+            vue.createCommentVNode('        :style="{'),
+            vue.createCommentVNode("          transform: expand"),
+            vue.createCommentVNode("            ? 'translate(0px, -50%) rotateY(0deg) rotateZ(90deg)'"),
+            vue.createCommentVNode("            : 'translate(50%, -50%) rotateY(-180deg) rotateZ(90deg)',"),
+            vue.createCommentVNode("          transition: 'all 0.3s linear',"),
+            vue.createCommentVNode('        }"'),
+            vue.createCommentVNode('        class="absolute top-1/2"'),
+            vue.createCommentVNode(`        :class="{ 'right-3': expand, 'right-1/2': !expand }"`),
+            vue.createCommentVNode("      >"),
+            vue.createCommentVNode("        <Download />"),
+            vue.createCommentVNode("      </el-icon>")
           ], 10, ["onClick"])) : vue.createCommentVNode("v-if", true)
         ],
         2

package/lib/components/hyMenu/style/menu.scss

@@ -53,6 +53,7 @@
           left: 0;
           top: 50%;
           transform: translateY(-50%);
+          border-radius: 10px;
           background-color: rgba(var(--hy-theme));
         }
         .operator-label {
@@ -115,6 +116,7 @@
           left: 0;
           top: 50%;
           transform: translateY(-50%);
+          border-radius: 10px;
           background-color: rgba(var(--hy-theme));
         }
         .operator-label {
@@ -138,7 +140,7 @@
           rgba(var(--hy-theme), 0) 2%,
           rgba(var(--hy-theme), 0.4) 100%
         );
-        border-radius: 0px 4px 4px 0px;
+        //border-radius: 0px 4px 4px 0px;
       }
     }
   }

package/lib/components/hyOrgCascader/js/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var axios = require('axios');
+var Axios = require('axios');
 var vue = require('vue');
 var useApi = require('../../../hooks/useApi.js');
 
@@ -12,7 +12,7 @@ function getOrgTreeSimple() {
     if (cancelSource) {
       cancelSource.cancel("\u4E2D\u65AD\u8BF7\u6C42");
     }
-    cancelSource = axios.CancelToken.source();
+    cancelSource = Axios.CancelToken.source();
     throttleFn = new Promise((resolve, reject) => {
       vue.unref(api).post(
         "organization/orgTreeSimple",

package/lib/components/hyRadioGroup/index.js

@@ -0,0 +1,11 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var radioGroup = require('./radioGroup.vue.js');
+var handler = require('../../utils/handler.js');
+
+const HyRadioGroup = handler.withInstall(radioGroup.default);
+
+exports.HyRadioGroup = HyRadioGroup;
+exports.default = HyRadioGroup;

package/lib/components/hyRadioGroup/radioGroup.vue.js

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

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

@@ -60,6 +60,13 @@ const _sfc_main = {
         form.setValueByProp(props.model, prop, val);
       }
     });
+    const columnAttrs = vue.computed(() => {
+      return {
+        ...props.column.attrs,
+        label: form.columnLabelHandler(props.column, props.model),
+        placeholder: form.columnPlaceholderHandler(props.column, props.model)
+      };
+    });
     function onChangeHandler(value, column) {
       emits("search");
     }
@@ -100,14 +107,14 @@ const _sfc_main = {
                   "div",
                   {
                     class: vue.normalizeClass(["flex items-center text-auxiliary text-xs whitespace-nowrap", {
-                      "border-r border-border px-3": __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] || __props.column.label
+                      "border-r border-border px-3": __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] || vue.unref(form.columnLabelHandler)(__props.column, props.model)
                     }])
                   },
                   [
                     __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),
+                      vue.toDisplayString(vue.unref(form.columnLabelHandler)(__props.column, props.model)),
                       1
                       /* TEXT */
                     ))
@@ -132,7 +139,7 @@ const _sfc_main = {
                         vue.createVNode(vue.unref(index$1.HyInput), vue.mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: vue.unref(index.isDisabled)(props, __props.column),
                           onKeydown: vue.withKeys(($event) => onKeydownEnterHander($event, __props.column), ["enter"]),
                           onChange: ($event) => onChangeHandler($event, __props.column)
@@ -148,7 +155,7 @@ const _sfc_main = {
                         vue.createVNode(vue.unref(elementPlus.ElSelect), vue.mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: vue.unref(index.isDisabled)(props, __props.column),
                           options: vue.unref(index.optionsHandler)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
@@ -166,7 +173,7 @@ const _sfc_main = {
                           "daterange",
                           "monthrange",
                           "yearrange"
-                        ].includes(__props.column.attrs?.type) && vue.unref(is.isArray)(__props.column.field) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyDatePicker), vue.mergeProps({
+                        ].includes(columnAttrs.value?.type) && vue.unref(is.isArray)(__props.column.field) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyDatePicker), vue.mergeProps({
                           key: 0,
                           start: bindValue.value,
                           "onUpdate:start": ($event) => bindValue.value = $event,
@@ -175,7 +182,7 @@ const _sfc_main = {
                           "is-range": true,
                           style: { "width": "100%" },
                           timeRangeFill: __props.column.timeRangeFill
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: vue.unref(index.isDisabled)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
                         }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "timeRangeFill", "disabled", "onChange"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyDatePicker), vue.mergeProps({
@@ -185,7 +192,7 @@ const _sfc_main = {
                           "is-range": false,
                           style: { "width": "100%" },
                           timeRangeFill: __props.column.timeRangeFill
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: vue.unref(index.isDisabled)(props, __props.column),
                           onChange: ($event) => onChangeHandler($event, __props.column)
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "timeRangeFill", "disabled", "onChange"]))
@@ -197,7 +204,7 @@ const _sfc_main = {
                       { key: 4 },
                       [
                         vue.createCommentVNode(" \u65F6\u95F4\u9009\u62E9\u6846 "),
-                        __props.column.attrs.isRange ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.HyTimePicker), vue.mergeProps({
+                        columnAttrs.value.isRange ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.HyTimePicker), vue.mergeProps({
                           key: 0,
                           start: bindValue.value,
                           "onUpdate:start": ($event) => bindValue.value = $event,
@@ -205,7 +212,7 @@ const _sfc_main = {
                           "onUpdate:end": ($event) => bindValue2.value = $event,
                           "is-range": true,
                           style: { "width": "100%" }
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: vue.unref(index.isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$3.HyTimePicker), vue.mergeProps({
@@ -214,7 +221,7 @@ const _sfc_main = {
                           "onUpdate:modelValue": ($event) => bindValue.value = $event,
                           "is-range": false,
                           style: { "width": "100%" }
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: vue.unref(index.isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"]))
@@ -229,7 +236,7 @@ const _sfc_main = {
                         vue.createVNode(vue.unref(index$4.HyOrgCascader), vue.mergeProps({
                           modelValue: bindValue.value,
                           "onUpdate:modelValue": ($event) => bindValue.value = $event
-                        }, __props.column.attrs, {
+                        }, columnAttrs.value, {
                           disabled: vue.unref(index.isDisabled)(props, __props.column),
                           onChange: onChangeHandler
                         }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
@@ -245,7 +252,7 @@ const _sfc_main = {
               4
               /* STYLE */
             ),
-            __props.column.type === "date-picker" && ["daterange", "datetimerange"].includes(__props.column.attrs?.type) && __props.column.timeRangeOptions?.length ? (vue.openBlock(), vue.createElementBlock("div", {
+            __props.column.type === "date-picker" && ["daterange", "datetimerange"].includes(columnAttrs.value?.type) && __props.column.timeRangeOptions?.length ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 0,
               class: "flex text-main select-none"
             }, [

package/lib/components/hySearch/js/useAppSearch.js

@@ -6,34 +6,6 @@ var form = require('../../../utils/form.js');
 var useLocale = require('../../../hooks/useLocale.js');
 var is = require('../../../utils/is.js');
 
-const genDefaultLabel = (config) => {
-  if (config.label) return config.label;
-  const { t } = useLocale.useLocale();
-  switch (config.type) {
-    // 部门级联选择框
-    case "org-cascader":
-      return t("form.department");
-  }
-};
-const genPlaceholderHandler = (config) => {
-  const { t } = useLocale.useLocale();
-  const { type, label, attrs = {} } = config || {};
-  let placeholder = attrs.placeholder, startPlaceholder = attrs.startPlaceholder, endPlaceholder = attrs.endPlaceholder;
-  switch (type) {
-    case "input":
-      placeholder = placeholder || t("hy.pleaseEnterPlaceholder", [label]);
-      break;
-    case "select":
-    case "date-picker":
-    case "time-picker":
-    case "org-cascader":
-      placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
-      break;
-    default:
-      placeholder = placeholder || label;
-  }
-  return { placeholder, startPlaceholder, endPlaceholder };
-};
 const genColumnWidth = (config) => {
   let { width, inputWidth, type, attrs } = config || {};
   if (!width && !inputWidth) {
@@ -86,12 +58,10 @@ const timeRangeOptionsHandler = (config) => {
   }, []);
 };
 function appSearchItemHandler(column = {}) {
-  const label = genDefaultLabel(column);
-  const { placeholder} = genPlaceholderHandler({ ...column, label });
+  const label = form.genColumnDefaultLabel(column);
   const attrs = {
     clearable: true,
-    ...column.attrs || {},
-    placeholder
+    ...column.attrs || {}
   };
   const { width, inputWidth } = genColumnWidth(column);
   column = handler.mergeDeep(

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

@@ -461,7 +461,15 @@ const _sfc_main = {
                             }, {
                               default: vue.withCtx(() => [
                                 vue.createElementVNode("div", {
-                                  class: vue.normalizeClass(["w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-xs hover:font-bold border border-transparent hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)] rounded box-border cursor-pointer", citem.className]),
+                                  class: vue.normalizeClass(["w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-xs hover:font-bold border border-transparent rounded box-border", [
+                                    citem.className,
+                                    vue.unref(index.operatorDisabledHandler)(citem, {
+                                      column,
+                                      row,
+                                      $index,
+                                      cellIndex
+                                    }) ? "cursor-not-allowed text-[var(--hy-el-text-color-disabled)] hover:border-[rgba(var(--hy-auxiliary),1)] hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-auxiliary),0.5)]" : "cursor-pointer hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)]"
+                                  ]]),
                                   onClick: ($event) => vue.unref(index.operatorClickHandler)(
                                     cindex,
                                     column,

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

@@ -2,9 +2,9 @@
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
-var is = require('../../../utils/is.js');
-var useLocale = require('../../../hooks/useLocale.js');
 var usePermissionMap = require('../../../hooks/usePermissionMap.js');
+var useLocale = require('../../../hooks/useLocale.js');
+var is = require('../../../utils/is.js');
 
 function tableColumnShowHandler(column) {
   if (column.permission && !is.isPermission(column.permission)) {
@@ -125,6 +125,7 @@ function operatorFilterHandler(column, scope, type = "all") {
 function operatorClickHandler(command, column, scope, type = "all") {
   const operator = operatorFilterHandler(column, scope, type);
   const target = operator[command];
+  if (operatorDisabledHandler(target, scope)) return;
   target?.handler && target.handler(scope);
 }
 function renderHeaderHandler(column, scope) {
@@ -396,7 +397,9 @@ const useAppTableWrapper = (hy) => {
     // 搜索选中
     isSearchFocus,
     onSearchInputHandler,
-    onSearchBlurHandler
+    onSearchBlurHandler,
+    showAppTableLoading,
+    closeAppTableLoading
   };
 };
 

package/lib/components/hyTable/js/search.js

@@ -56,6 +56,7 @@ function useAppTableSearch(hy) {
   }
   async function resetFields() {
     await vue.nextTick();
+    props.filterModel.query = null;
     if (appSearchRef.value) {
       appSearchRef.value.resetFields();
     }