hy-dispatch-ui-v3 0.2.66 → 0.2.68

package/es/components/hyNoPermissions/noPermissions.vue.mjs

@@ -1,8 +1,8 @@
 import { defineComponent, openBlock, createElementBlock, createVNode, unref, createElementVNode, toDisplayString } from 'vue';
 import '../../hooks/index.mjs';
 import '../index.mjs';
-import { useLocale } from '../../hooks/useLocale.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
+import { $t } from '../../hooks/useLocale.mjs';
 
 import "./style/noPermissions.scss";
 
@@ -20,7 +20,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
-    const { t } = useLocale();
     __expose({});
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", { class: "w-full h-full bg-background-2 text-auxiliary text-base flex flex-col items-center justify-center" }, [
@@ -32,14 +31,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           createElementVNode(
             "p",
             null,
-            toDisplayString(unref(t)("permissino.youDoNotHaveSubordinatePermissionsForThisModule")),
+            toDisplayString(unref($t)("permissino.youDoNotHaveSubordinatePermissionsForThisModule")),
             1
             /* TEXT */
           ),
           createElementVNode(
             "p",
             null,
-            toDisplayString(unref(t)("permissino.pleaseContactTheAdministrator")),
+            toDisplayString(unref($t)("permissino.pleaseContactTheAdministrator")),
             1
             /* TEXT */
           )

package/es/components/hyNoPermissionsMap/noPermissionsMap.vue.mjs

@@ -1,8 +1,8 @@
 import { defineComponent, openBlock, createElementBlock, createVNode, unref, createElementVNode, toDisplayString } from 'vue';
 import '../../hooks/index.mjs';
 import '../index.mjs';
-import { useLocale } from '../../hooks/useLocale.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
+import { $t } from '../../hooks/useLocale.mjs';
 
 import "./style/noPermissionsMap.scss";
 
@@ -20,7 +20,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
-    const { t } = useLocale();
     __expose({});
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", { class: "w-full h-full bg-background-2 text-auxiliary text-base flex flex-col items-center justify-center" }, [
@@ -32,16 +31,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           createElementVNode(
             "p",
             null,
-            toDisplayString(unref(t)("permissino.youDoNotHaveAMapConfigurationForThisModule")),
+            toDisplayString(unref($t)("permissino.youDoNotHaveAMapConfigurationForThisModule")),
             1
             /* TEXT */
           ),
           createElementVNode(
             "p",
             null,
-            toDisplayString(unref(t)(
-              "permissino.pleaseContactTheAdministratorToGoToTheSettingsCenterForConfiguration"
-            )),
+            toDisplayString(_ctx.t("permissino.pleaseContactTheAdministratorToGoToTheSettingsCenterForConfiguration")),
             1
             /* TEXT */
           )

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

@@ -13,11 +13,7 @@ function getOrgTreeSimple() {
     }
     cancelSource = Axios.CancelToken.source();
     throttleFn = new Promise((resolve, reject) => {
-      unref(api).post(
-        "organization/orgTreeSimple",
-        {},
-        { cancelToken: cancelSource.token }
-      ).then((res) => {
+      unref(api).post("organization/orgTreeSimple", {}, { cancelToken: cancelSource.token }).then((res) => {
         resolve(res.data);
         throttleFn = null;
       }).catch((err) => {

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");
       }
     },
     /*
@@ -75,12 +76,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: () => {
         return true;
       }
+    },
+    onVisibleChange: {
+      type: Function
     }
   }, {
     "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;
@@ -97,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;
@@ -139,11 +151,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     function onVisibleChangeHandler(type) {
       focusType.value = type;
+      props.onVisibleChange && props.onVisibleChange(type);
     }
     if (props.defaultGetData) {
       getCascaderData();
-      subOrgCascader(getCascaderData);
     }
+    subOrgCascader(getCascaderData);
     watch(
       () => props.options,
       () => {
@@ -160,7 +173,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       },
       { immediate: true, deep: true }
     );
-    onUnmounted(() => {
+    onBeforeUnmount(() => {
       unsubOrgCascader(getCascaderData);
     });
     __expose({
@@ -197,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({
@@ -231,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",
@@ -260,7 +277,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           filterable: "",
           "show-all-levels": false,
           "virtual-scroll": "",
-          onChange: onChangeHanlder
+          "popper-class": "hy-org-cascader-popper",
+          onChange: onChangeHanlder,
+          onVisibleChange: __props.onVisibleChange
         }, createSlots({
           _: 2
           /* DYNAMIC */
@@ -284,7 +303,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             ]),
             key: "0"
           } : void 0
-        ]), 1032, ["modelValue", "onUpdate:modelValue", "class", "size", "options", "clearable", "disabled", "placeholder"]))
+        ]), 1032, ["modelValue", "onUpdate:modelValue", "class", "size", "options", "clearable", "disabled", "placeholder", "onVisibleChange"]))
       ]);
     };
   }

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;
+}