hy-dispatch-ui-v3 0.2.67 → 0.2.68

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

@@ -1,10 +1,12 @@
-import { defineComponent, useModel, useTemplateRef, ref, computed, watch, onUnmounted, openBlock, createElementBlock, createElementVNode, normalizeStyle, createVNode, unref, createSlots, withCtx, renderSlot, toDisplayString, createCommentVNode, createBlock, normalizeClass, mergeModels } from 'vue';
+import { defineComponent, useModel, useTemplateRef, ref, computed, watch, onBeforeUnmount, openBlock, createElementBlock, createElementVNode, normalizeStyle, createVNode, unref, createSlots, withCtx, renderSlot, toDisplayString, createCommentVNode, createBlock, normalizeClass, mergeModels } from 'vue';
 import { ElCascader, ElIcon } from 'element-plus';
 import { Loading } from '@element-plus/icons-vue';
 import '../../hooks/index.mjs';
+import '../index.mjs';
 import { getOrgTreeSimple, orgTreeDatahandler } from './js/index.mjs';
 import { useSubscribe } from '../../hooks/useSubscribe.mjs';
-import { useLocale } from '../../hooks/useLocale.mjs';
+import { HyIcon } from '../hyIcon/index.mjs';
+import { $t } from '../../hooks/useLocale.mjs';
 
 import "./style/orgCascader.scss";
 
@@ -28,8 +30,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     placeholder: {
       type: String,
       default: () => {
-        const { t } = useLocale();
-        return t("cascader.pleaseSelectDepartment");
+        return $t("cascader.pleaseSelectDepartment");
       }
     },
     /*
@@ -83,7 +84,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     "modelValue": { type: [Array, String, Number] },
     "modelModifiers": {}
   }),
-  emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
+  emits: /* @__PURE__ */ mergeModels(["change", "requesting", "fulfilled", "rejected"], ["update:modelValue"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
@@ -100,15 +101,23 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return target?.companyName;
     });
     function getCascaderData() {
-      return new Promise(async (resolve, reject) => {
+      emits("requesting");
+      if (props.options && props.options.length) {
+        emits("fulfilled");
+        resolve();
+        return;
+      }
+      return new Promise(async (resolve2, reject) => {
         loading.value = true;
         try {
           cascaderOptions.value = [];
           const data = await getOrgTreeSimple();
           handlerData(data || []);
-          resolve();
+          emits("fulfilled");
+          resolve2();
         } catch (err) {
           console.error(err);
+          emits("rejected");
           reject();
         }
         loading.value = false;
@@ -142,12 +151,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     function onVisibleChangeHandler(type) {
       focusType.value = type;
-      onVisibleChange(type);
+      props.onVisibleChange && props.onVisibleChange(type);
     }
     if (props.defaultGetData) {
       getCascaderData();
-      subOrgCascader(getCascaderData);
     }
+    subOrgCascader(getCascaderData);
     watch(
       () => props.options,
       () => {
@@ -164,7 +173,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       },
       { immediate: true, deep: true }
     );
-    onUnmounted(() => {
+    onBeforeUnmount(() => {
       unsubOrgCascader(getCascaderData);
     });
     __expose({
@@ -201,6 +210,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 filterable: "",
                 "show-all-levels": false,
                 "virtual-scroll": "",
+                "popper-class": "hy-org-cascader-popper",
                 onChange: onChangeHanlder,
                 onVisibleChange: ($event) => onVisibleChangeHandler($event)
               }, createSlots({
@@ -235,7 +245,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             key: 0,
             style: { "cursor": "pointer" }
           }, [
-            createElementVNode("i", { class: "el-icon-caret-bottom" }),
+            createVNode(unref(HyIcon), {
+              "svg-name": "dispatch-share1-prompt",
+              class: "!w-3 !h-3"
+            }),
             renderSlot(_ctx.$slots, "default"),
             currentCompanyName.value ? (openBlock(), createElementBlock(
               "span",
@@ -264,6 +277,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           filterable: "",
           "show-all-levels": false,
           "virtual-scroll": "",
+          "popper-class": "hy-org-cascader-popper",
           onChange: onChangeHanlder,
           onVisibleChange: __props.onVisibleChange
         }, createSlots({

package/es/components/hyOrgCascader/style/orgCascader.scss

@@ -0,0 +1,7 @@
+.hy-org-cascader-popper {
+  .hy-el-cascader-menu__list {
+    ul > li {
+      box-sizing: border-box;
+    }
+  }
+}

package/es/components/hyRadioGroup/radioGroup.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, useModel, useTemplateRef, ref, computed, nextTick, watch, openBlock, createElementBlock, normalizeClass, Fragment, renderList, renderSlot, createTextVNode, toDisplayString, normalizeStyle, createCommentVNode, mergeModels } from 'vue';
+import { defineComponent, useModel, useTemplateRef, ref, computed, nextTick, watch, openBlock, createElementBlock, normalizeClass, createElementVNode, Fragment, renderList, renderSlot, createTextVNode, toDisplayString, normalizeStyle, createCommentVNode, mergeModels } from 'vue';
 
 import "./style/radioGroup.scss";
 
@@ -18,6 +18,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     size: {
       type: String,
       default: "default"
+    },
+    disabled: {
+      type: Boolean,
+      default: false
     }
   }, {
     "modelValue": {
@@ -41,6 +45,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       };
     });
     function switchSelect(target) {
+      if (target[radioProps.value.disabled] || props.disabled) return;
       const value = target[radioProps.value.value];
       if (modelValue.value === value) return;
       modelValue.value = value;
@@ -68,51 +73,53 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     __expose({});
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(
-        "ul",
+        "div",
         {
-          class: 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]",
+          class: normalizeClass(["hy-radio-group", [
+            __props.size === "large" ? "h-[40px]" : __props.size === "small" ? "h-[30px]" : "h-[34px]",
             __props.size === "small" ? "text-xs" : "text-sm"
           ]])
         },
         [
-          (openBlock(true), createElementBlock(
-            Fragment,
-            null,
-            renderList(__props.options, (item, index) => {
-              return openBlock(), createElementBlock("li", {
-                key: index,
-                class: "w-0 flex-1 flex items-center justify-center text-main user-select-none clickBox",
-                onClick: ($event) => switchSelect(item, index, $event)
-              }, [
-                renderSlot(_ctx.$slots, "default", {
-                  item,
-                  index
-                }, () => [
-                  createTextVNode(
-                    toDisplayString(item[radioProps.value.label]),
-                    1
-                    /* TEXT */
-                  )
-                ])
-              ], 8, ["onClick"]);
-            }),
-            128
-            /* KEYED_FRAGMENT */
-          )),
-          selectIndex.value >= 0 ? (openBlock(), 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: normalizeStyle([{ width: `calc(100% / ${__props.options.length})` }, { "background": "linear-gradient(180deg, #2a4968 0%, #0ea0bb 100%)" }])
-            },
-            null,
-            4
-            /* STYLE */
-          )) : createCommentVNode("v-if", true)
+          createElementVNode("div", { class: "w-full h-full inline-flex box-border relative" }, [
+            (openBlock(true), createElementBlock(
+              Fragment,
+              null,
+              renderList(__props.options, (item, index) => {
+                return openBlock(), createElementBlock("div", {
+                  key: index,
+                  class: normalizeClass(["w-0 flex-1 h-full flex items-center justify-center text-main whitespace-nowrap user-select-none relative z-[2]", [item[radioProps.value.disabled] || __props.disabled ? "cursor-not-allowed opacity-90" : "cursor-pointer"]]),
+                  onClick: ($event) => switchSelect(item, index, $event)
+                }, [
+                  renderSlot(_ctx.$slots, "default", {
+                    item,
+                    index
+                  }, () => [
+                    createTextVNode(
+                      toDisplayString(item[radioProps.value.label]),
+                      1
+                      /* TEXT */
+                    )
+                  ])
+                ], 10, ["onClick"]);
+              }),
+              128
+              /* KEYED_FRAGMENT */
+            )),
+            selectIndex.value >= 0 ? (openBlock(), createElementBlock(
+              "div",
+              {
+                key: 0,
+                ref_key: "sliderRef",
+                ref: sliderRef,
+                class: "slider rounded-[2px] box-border absolute h-full top-0 left-0 z-0 duration-500 border border-theme",
+                style: normalizeStyle([{ width: `calc(100% / ${__props.options.length})` }, { "background": "linear-gradient(180deg, #2a4968 0%, #0ea0bb 100%)" }])
+              },
+              null,
+              4
+              /* STYLE */
+            )) : createCommentVNode("v-if", true)
+          ])
         ],
         2
         /* CLASS */

package/es/components/hyRadioGroup/style/radioGroup.scss

@@ -0,0 +1,9 @@
+.hy-radio-group {
+  width: 100%;
+  display: inline-block;
+  font-size: 12px;
+  border: 1px solid rgba(var(--hy-border));
+  border-radius: 4px;
+  padding: 3px;
+  box-sizing: border-box;
+}

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

@@ -82,19 +82,14 @@ const _sfc_main = {
       return new Promise(async (resolve, reject) => {
         if (props.column.optionsFn) {
           if (!props.column.optionsFn) return;
-          props.column.optionsLoading = true;
-          props.column.optionsError = "";
-          props.column.attrs.options = [];
+          onRequesting();
           if (!(isMountedLoad && props.column.isDefaultGetData === false)) {
             try {
-              props.column.attrs.options = await props.column.optionsFn(
-                props.column,
-                props.model
-              );
-              props.column.optionsError = "";
+              const options = await props.column.optionsFn(props.column, props.model);
+              onFulfilled(options);
               resolve();
             } catch (err) {
-              props.column.optionsError = "error";
+              onRejected();
               console.error(err);
               reject();
             }
@@ -103,13 +98,13 @@ const _sfc_main = {
           }
         } else if (props.column.type === "org-cascader") {
           if (componentRef.value) {
-            props.column.optionsLoading = true;
-            props.column.optionsError = "";
             try {
+              onRequesting();
               await componentRef.value.getData();
+              onFulfilled();
               resolve();
             } catch {
-              props.column.optionsError = "error";
+              onRejected();
               reject();
             }
           } else {
@@ -121,6 +116,21 @@ const _sfc_main = {
         props.column.optionsLoading = false;
       });
     }
+    function onRequesting() {
+      props.column.optionsLoading = true;
+      props.column.optionsError = "";
+      props.column.attrs.options = [];
+    }
+    function onFulfilled(options = []) {
+      props.column.optionsLoading = false;
+      props.column.optionsError = "";
+      props.column.attrs.options = options;
+    }
+    function onRejected() {
+      props.column.optionsLoading = false;
+      props.column.optionsError = "error";
+      props.column.attrs.options = [];
+    }
     function getOptionsHandler(props2, column) {
       if (props2.column.optionsLoading) {
         return [];
@@ -221,7 +231,7 @@ const _sfc_main = {
                   createElementVNode(
                     "div",
                     {
-                      class: normalizeClass(["flex items-center text-auxiliary text-sm whitespace-nowrap", {
+                      class: normalizeClass(["flex items-center text-auxiliary text-sm whitespace-nowrap box-border", {
                         "border-r border-border px-3": __props.column.labelSlot && _ctx.$slots[__props.column.labelSlot] || unref(columnLabelHandler)(__props.column, props.model)
                       }])
                     },
@@ -353,12 +363,7 @@ const _sfc_main = {
                         { key: 4 },
                         [
                           createCommentVNode(" \u65E5\u671F\u9009\u62E9\u6846 "),
-                          [
-                            "datetimerange",
-                            "daterange",
-                            "monthrange",
-                            "yearrange"
-                          ].includes(columnAttrs.value?.type) && unref(isArray)(__props.column.field) ? (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
+                          ["datetimerange", "daterange", "monthrange", "yearrange"].includes(columnAttrs.value?.type) && unref(isArray)(__props.column.field) ? (openBlock(), createBlock(unref(HyDatePicker), mergeProps({
                             key: 0,
                             ref_key: "componentRef",
                             ref: componentRef,
@@ -367,6 +372,7 @@ const _sfc_main = {
                             end: bindValue2.value,
                             "onUpdate:end": ($event) => bindValue2.value = $event,
                             "is-range": true,
+                            class: "box-border",
                             style: { "width": "100%" },
                             timeRangeFill: __props.column.timeRangeFill
                           }, columnAttrs.value, {
@@ -379,6 +385,7 @@ const _sfc_main = {
                             modelValue: bindValue.value,
                             "onUpdate:modelValue": ($event) => bindValue.value = $event,
                             "is-range": false,
+                            class: "box-border",
                             style: { "width": "100%" },
                             timeRangeFill: __props.column.timeRangeFill
                           }, columnAttrs.value, {
@@ -402,6 +409,7 @@ const _sfc_main = {
                             end: bindValue2.value,
                             "onUpdate:end": ($event) => bindValue2.value = $event,
                             "is-range": true,
+                            class: "box-border",
                             style: { "width": "100%" }
                           }, columnAttrs.value, {
                             disabled: unref(isDisabled)(props, __props.column),
@@ -413,6 +421,7 @@ const _sfc_main = {
                             modelValue: bindValue.value,
                             "onUpdate:modelValue": ($event) => bindValue.value = $event,
                             "is-range": false,
+                            class: "box-border",
                             style: { "width": "100%" }
                           }, columnAttrs.value, {
                             disabled: unref(isDisabled)(props, __props.column),
@@ -433,6 +442,10 @@ const _sfc_main = {
                             "onUpdate:modelValue": ($event) => bindValue.value = $event
                           }, columnAttrs.value, {
                             disabled: unref(isDisabled)(props, __props.column),
+                            defaultGetData: false,
+                            onRequesting,
+                            onFulfilled,
+                            onRejected,
                             onChange: onChangeHandler,
                             onVisibleChange
                           }), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
@@ -501,7 +514,7 @@ const _sfc_main = {
                   renderList(__props.column.timeRangeOptions, (item, index) => {
                     return openBlock(), createElementBlock("div", {
                       key: index,
-                      class: normalizeClass(["border-l border-border px-[10px] cursor-pointer", {
+                      class: normalizeClass(["border-l border-border px-[10px] cursor-pointer box-border", {
                         "bg-[rgba(var(--hy-theme),0.2)] text-theme font-bold": unref(isSelectedTimeRange)(__props.column, item, __props.model)
                       }]),
                       onClick: ($event) => onTimeRangeClickHandler(__props.column, item)

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

@@ -48,10 +48,7 @@ function isEmptyValue(e) {
   return isEmpty(e) || isArray(e) && !e.length;
 }
 function useShrink(props, formItemWrapper) {
-  const { removeResize } = useResizeObserver(
-    formItemWrapper,
-    shrinkResizeHandler
-  );
+  const { removeResize } = useResizeObserver(formItemWrapper, shrinkResizeHandler);
   const isExpand = ref(false);
   const showShrink = ref(true);
   const containerHeight = ref(getContainerPickUpHeight());

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

@@ -1,8 +1,8 @@
 import { unref, toRef } from 'vue';
 import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
-import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isNumber } from '../../../utils/is.mjs';
+import { $t } from '../../../hooks/useLocale.mjs';
 import { genColumnDefaultLabel, genValueByProp } from '../../../utils/form.mjs';
 import { mergeDeep, funRunHandler } from '../../../utils/handler.mjs';
 
@@ -32,7 +32,6 @@ const genColumnWidth = (config) => {
   return { width, inputWidth };
 };
 const timeRangeOptionsHandler = (config) => {
-  const { t } = useLocale();
   const { timeRangeOptions } = config || {};
   if (!timeRangeOptions?.length) return timeRangeOptions;
   return timeRangeOptions.reduce((list, item) => {
@@ -42,15 +41,15 @@ const timeRangeOptionsHandler = (config) => {
     if (!label) {
       switch (unit) {
         case "year":
-          label = `${value} ` + t(isPlural ? "hy.years" : "hy.year");
+          label = `${value} ` + $t(isPlural ? "hy.years" : "hy.year");
           break;
         case "month":
-          label = `${value} ` + t(isPlural ? "hy.months" : "hy.month");
+          label = `${value} ` + $t(isPlural ? "hy.months" : "hy.month");
           break;
         case "day":
         default:
           unit = "day";
-          label = value === 1 ? t("hy.today") : `${value} ` + t(isPlural ? "hy.days" : "hy.day");
+          label = value === 1 ? $t("hy.today") : `${value} ` + $t(isPlural ? "hy.days" : "hy.day");
       }
     }
     list.push({ ...item, label, unit });
@@ -107,11 +106,7 @@ const resetAppSearchValue = (columns = [], obj = {}) => {
     const value = funRunHandler(item.defaultValue);
     if (Array.isArray(item.prop)) {
       for (let i = 0; i < item.prop.length; i++) {
-        genValueByProp(
-          obj,
-          item.prop[i],
-          Array.isArray(value) ? value[i] : void 0
-        );
+        genValueByProp(obj, item.prop[i], Array.isArray(value) ? value[i] : void 0);
       }
     } else {
       genValueByProp(obj, item.prop, value);

package/es/components/hySearch/search.vue.mjs

@@ -7,9 +7,9 @@ import '../index.mjs';
 import _sfc_main$1 from './cpns/searchItem.vue.mjs';
 import { useShrink, isEmptyValue, formContextKey } from './js/index.mjs';
 import { resetAppSearchValue } from './js/useAppSearch.mjs';
-import { useLocale } from '../../hooks/useLocale.mjs';
 import { isArray, isObject } from '../../utils/is.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
+import { $t } from '../../hooks/useLocale.mjs';
 
 import "./style/search.scss";
 
@@ -51,7 +51,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
-    const { t } = useLocale();
     const formItemWrapper = useTemplateRef("formItemWrapper");
     const { showShrink, isExpand, containerHeight, switchShrink, shrinkDestroy } = useShrink(props, formItemWrapper);
     const formColumnMap = computed(() => {
@@ -91,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         if (isObject(oldVal)) {
           count += getFilterCount(newVal, oldVal, targetProp);
         } else if (isArray(oldVal)) {
-          if (oldVal.length > 0 && !oldVal.every((t2, i) => t2 === newVal[i])) {
+          if (oldVal.length > 0 && !oldVal.every((t, i) => t === newVal[i])) {
             keySet2.add(unref(formColumnMap).get(key).key);
           }
         } else if (isEmptyValue(oldVal) ? !isEmptyValue(newVal) : oldVal !== newVal) {
@@ -129,15 +128,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     };
     function filterFields(fields2 = [], keys = []) {
       const filterKeys = keys.map((prop) => isArray(prop) ? prop.join(".") : prop);
-      return filterKeys.length ? fields2.filter(
-        (field) => field.propString && filterKeys.includes(field.propString)
-      ) : fields2;
+      return filterKeys.length ? fields2.filter((field) => field.propString && filterKeys.includes(field.propString)) : fields2;
     }
     async function obtainOptionsFields(keys, isMountedLoad = false) {
       const filteredFields = filterFields(fields, keys);
-      await Promise.allSettled(
-        filteredFields.map((field) => field.obtainOptions(isMountedLoad))
-      );
+      await Promise.allSettled(filteredFields.map((field) => field.obtainOptions(isMountedLoad)));
     }
     async function getOptions(isMountedLoad = false) {
       await obtainOptionsFields([], isMountedLoad);
@@ -148,9 +143,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       emitOptionsStatus();
     }
     async function getOptionsError() {
-      const filteredFields = fields.filter(
-        (field) => field.propString && field.optionsError
-      );
+      const filteredFields = fields.filter((field) => field.propString && field.optionsError);
       await Promise.allSettled(filteredFields.map((field) => field.obtainOptions()));
       emitOptionsStatus();
     }
@@ -206,7 +199,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 createElementVNode(
                   "span",
                   null,
-                  toDisplayString(unref(t)("hy.filter")),
+                  toDisplayString(unref($t)("hy.filter")),
                   1
                   /* TEXT */
                 ),
@@ -216,7 +209,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   [
                     createElementVNode(
                       "span",
-                      { class: "bg-theme02 text-theme font-bold leading-4 px-[6px]" },
+                      { class: "bg-theme02 text-theme font-bold leading-4 px-[6px] box-border" },
                       toDisplayString(filterCount.value),
                       1
                       /* TEXT */
@@ -227,7 +220,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         class: "text-auxiliary cursor-pointer",
                         onClick: onResetHandler
                       },
-                      toDisplayString(unref(t)("hy.reset")),
+                      toDisplayString(unref($t)("hy.reset")),
                       1
                       /* TEXT */
                     )
@@ -243,7 +236,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 createElementVNode(
                   "span",
                   { class: "text-auxiliary" },
-                  toDisplayString(unref(isExpand) ? unref(t)("hy.packUp") : unref(t)("hy.expand")),
+                  toDisplayString(unref(isExpand) ? unref($t)("hy.packUp") : unref($t)("hy.expand")),
                   1
                   /* TEXT */
                 ),

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

@@ -6,6 +6,7 @@
   opacity: 1;
   transition: all 0.3s linear;
   overflow: hidden;
+  box-sizing: border-box;
   &.hy-search-hidden {
     padding-top: 0;
     padding-bottom: 0;
@@ -34,6 +35,7 @@
     gap: 16px;
     position: relative;
     padding: 1px;
+    box-sizing: border-box;
     .hy-el-form-item {
       margin-bottom: 0;
       &.hidden {

package/es/components/hyStatus/index.mjs

@@ -0,0 +1,7 @@
+import _sfc_main from './status.vue.mjs';
+import '../../utils/index.mjs';
+import { withInstall } from '../../utils/handler.mjs';
+
+const HyStatus = withInstall(_sfc_main);
+
+export { HyStatus, HyStatus as default };