hy-dispatch-ui-v3 0.2.65 → 0.2.67

package/es/components/hyForm/js/useAppForm.mjs

@@ -23,11 +23,11 @@ function appFormItemHandler(column = {}) {
     return {
       ...column,
       attrs: {
-        maxlength: attrs.type === "textarea" ? 255 : attrs.type === "text" ? 100 : void 0,
+        maxlength: attrs.type === "text" ? 256 : void 0,
         ...attrs
       }
     };
-  } else if (/^(radio|radio-group|checkbox|select)$/.test(column.type)) {
+  } else if (/^(radio|radio-group|checkbox|select|select-v2)$/.test(column.type)) {
     return {
       ...column,
       attrs: {
@@ -41,7 +41,7 @@ function appFormItemHandler(column = {}) {
         }
       }
     };
-  } else if (/^(extra)$/.test(column.type) || /^(location-select)$/.test(column.type)) {
+  } else if (/^(extra|location-select)$/.test(column.type)) {
     return {
       ...column,
       children: (column.children || []).map((item) => appFormItemHandler(item))

package/es/components/hyIcon/style/icon.scss

@@ -6,6 +6,7 @@
   overflow: hidden;
   fill: currentColor;
   outline: none;
+  flex-shrink: 0;
 }
 .hy-button {
   .hy-icon {

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

@@ -1,5 +1,5 @@
 import { InitMap } from '../../../utils/map/index.mjs';
-import { nextTick } from 'vue';
+import { shallowRef, nextTick } from 'vue';
 
 const useAppMapWrapper = (hy) => {
   const {
@@ -7,8 +7,8 @@ const useAppMapWrapper = (hy) => {
     mapRef,
     emits
   } = hy;
-  const hyMap = null;
-  const map = null;
+  let hyMap = shallowRef(null);
+  let map = shallowRef(null);
   function newMap(mapType) {
     const mapFilters = [
       {
@@ -92,7 +92,7 @@ const useAppMapWrapper = (hy) => {
         filter: "saturate(180%) brightness(105%) contrast(115%)"
       }
     ];
-    hy.hyMap = new InitMap({
+    hy.hyMap.value = new InitMap({
       ...mapConfig,
       mapType,
       BM: window.BM
@@ -115,7 +115,7 @@ const useAppMapWrapper = (hy) => {
     }, 800);
   }
   function initMap() {
-    hy.map = hy.hyMap.InitMap(mapRef.value, {
+    hy.map.value = hy.hyMap.value.InitMap(mapRef.value, {
       minZoom: mapConfig.minZoom || 8,
       maxZoom: mapConfig.maxZoom || 18,
       center: mapConfig.center || {
@@ -125,7 +125,7 @@ const useAppMapWrapper = (hy) => {
       zoom: mapConfig.zoom || 14,
       completeCallbacks: () => {
         nextTick(() => {
-          emits("complete", hy.hyMap, hy.map);
+          emits("complete", hy.hyMap.value, hy.map.value);
         });
       }
     });

package/es/components/hyMap/map.vue.mjs

@@ -1,7 +1,9 @@
-import { ref, onMounted, openBlock, createElementBlock, createElementVNode } from 'vue';
+import { ref, onMounted, onBeforeUnmount, openBlock, createElementBlock, createBlock, unref } from 'vue';
 import '../../hooks/index.mjs';
+import '../../index.mjs';
 import { useAppMapWrapper } from './js/index.mjs';
 import { useMixins } from '../../hooks/useMixins.mjs';
+import { HyNoPermissionsMap } from '../hyNoPermissionsMap/index.mjs';
 import { useMapConfig } from '../../hooks/useMapConfig.mjs';
 
 import "../../static/map/bigemap.css";
@@ -44,13 +46,21 @@ const _sfc_main = {
       [useAppMapWrapper]
     );
     onMounted(() => {
-      newMap(props.mapType);
+      if (props.mapType !== "nomap") {
+        newMap(props.mapType);
+      }
+    });
+    onBeforeUnmount(() => {
+      map.value?.removeMap();
+      map.value = null;
+      hyMap.value = null;
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", { class: "w-full h-full box-border border-border border relative" }, [
-        createElementVNode(
+        props.mapType !== "nomap" ? (openBlock(), createElementBlock(
           "div",
           {
+            key: 0,
             ref_key: "mapRef",
             ref: mapRef,
             class: "w-full h-full rounded overflow-hidden"
@@ -58,7 +68,7 @@ const _sfc_main = {
           null,
           512
           /* NEED_PATCH */
-        )
+        )) : (openBlock(), createBlock(unref(HyNoPermissionsMap), { key: 1 }))
       ]);
     };
   }

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

@@ -26,7 +26,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return openBlock(), createElementBlock("div", { class: "w-full h-full bg-background-2 text-auxiliary text-base flex flex-col items-center justify-center" }, [
         createVNode(unref(HyIcon), {
           "svg-name": __props.svgName,
-          "class-name": "!w-[46px] !h-[46px]"
+          "class-name": "!w-[56px] !h-[56px]"
         }, null, 8, ["svg-name"]),
         createElementVNode("div", { class: "text-center mt-[12px]" }, [
           createElementVNode(

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

@@ -26,7 +26,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       return openBlock(), createElementBlock("div", { class: "w-full h-full bg-background-2 text-auxiliary text-base flex flex-col items-center justify-center" }, [
         createVNode(unref(HyIcon), {
           "svg-name": __props.svgName,
-          "class-name": "!w-[46px] !h-[46px]"
+          "class-name": "!w-[56px] !h-[56px]"
         }, null, 8, ["svg-name"]),
         createElementVNode("div", { class: "text-center mt-[12px]" }, [
           createElementVNode(

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

@@ -1,5 +1,6 @@
-import { defineComponent, useModel, useTemplateRef, ref, computed, watch, onUnmounted, openBlock, createElementBlock, createElementVNode, normalizeStyle, createVNode, unref, renderSlot, toDisplayString, createCommentVNode, createBlock, normalizeClass, mergeModels } from 'vue';
-import { ElCascader } from 'element-plus';
+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 { ElCascader, ElIcon } from 'element-plus';
+import { Loading } from '@element-plus/icons-vue';
 import '../../hooks/index.mjs';
 import { getOrgTreeSimple, orgTreeDatahandler } from './js/index.mjs';
 import { useSubscribe } from '../../hooks/useSubscribe.mjs';
@@ -74,13 +75,16 @@ 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"]),
-  setup(__props, { emit: __emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
     const { subOrgCascader, unsubOrgCascader } = useSubscribe();
@@ -95,11 +99,20 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       const target = cascaderValueMap.value.get(modelValue.value);
       return target?.companyName;
     });
-    async function getCascaderData() {
-      loading.value = true;
-      const data = await getOrgTreeSimple();
-      handlerData(data || []);
-      loading.value = false;
+    function getCascaderData() {
+      return new Promise(async (resolve, reject) => {
+        loading.value = true;
+        try {
+          cascaderOptions.value = [];
+          const data = await getOrgTreeSimple();
+          handlerData(data || []);
+          resolve();
+        } catch (err) {
+          console.error(err);
+          reject();
+        }
+        loading.value = false;
+      });
     }
     function handlerData(data) {
       const { cascaderData, cascaderDataMap } = orgTreeDatahandler(data);
@@ -129,6 +142,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     function onVisibleChangeHandler(type) {
       focusType.value = type;
+      onVisibleChange(type);
     }
     if (props.defaultGetData) {
       getCascaderData();
@@ -153,6 +167,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     onUnmounted(() => {
       unsubOrgCascader(getCascaderData);
     });
+    __expose({
+      getData: getCascaderData
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", { class: "relative" }, [
         __props.contentType ? (openBlock(), createElementBlock("div", {
@@ -186,7 +203,30 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 "virtual-scroll": "",
                 onChange: onChangeHanlder,
                 onVisibleChange: ($event) => onVisibleChangeHandler($event)
-              }, null, 8, ["modelValue", "onUpdate:modelValue", "size", "options", "disabled", "clearable", "placeholder", "onVisibleChange"])
+              }, createSlots({
+                _: 2
+                /* DYNAMIC */
+              }, [
+                loading.value ? {
+                  name: "empty",
+                  fn: withCtx(() => [
+                    createElementVNode("div", { class: "w-full flex items-center justify-center py-2 gap-1.5 text-main text-xs whitespace-nowrap" }, [
+                      createVNode(unref(ElIcon), {
+                        size: "16",
+                        class: "is-loading text-theme"
+                      }, {
+                        default: withCtx(() => [
+                          createVNode(unref(Loading))
+                        ]),
+                        _: 1
+                        /* STABLE */
+                      }),
+                      createElementVNode("span", null, "\u6570\u636E\u6B63\u5728\u52A0\u8F7D\u4E2D")
+                    ])
+                  ]),
+                  key: "0"
+                } : void 0
+              ]), 1032, ["modelValue", "onUpdate:modelValue", "size", "options", "disabled", "clearable", "placeholder", "onVisibleChange"])
             ],
             4
             /* STYLE */
@@ -224,12 +264,32 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           filterable: "",
           "show-all-levels": false,
           "virtual-scroll": "",
-          onChange: onChangeHanlder
-        }, null, 8, ["modelValue", "onUpdate:modelValue", "class", "size", "options", "clearable", "disabled", "placeholder"])),
-        loading.value ? (openBlock(), createElementBlock("div", {
-          key: 2,
-          class: "absolute left-0 right-0 top-0 bottom-0 cursor-wait"
-        })) : createCommentVNode("v-if", true)
+          onChange: onChangeHanlder,
+          onVisibleChange: __props.onVisibleChange
+        }, createSlots({
+          _: 2
+          /* DYNAMIC */
+        }, [
+          loading.value ? {
+            name: "empty",
+            fn: withCtx(() => [
+              createElementVNode("div", { class: "w-full flex items-center justify-center py-2 gap-1.5 text-main text-xs whitespace-nowrap" }, [
+                createVNode(unref(ElIcon), {
+                  size: "16",
+                  class: "is-loading text-theme"
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(Loading))
+                  ]),
+                  _: 1
+                  /* STABLE */
+                }),
+                createElementVNode("span", null, "\u6570\u636E\u6B63\u5728\u52A0\u8F7D\u4E2D")
+              ])
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1032, ["modelValue", "onUpdate:modelValue", "class", "size", "options", "clearable", "disabled", "placeholder", "onVisibleChange"]))
       ]);
     };
   }

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

@@ -41,8 +41,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       };
     });
     function switchSelect(target) {
-      modelValue.value = target[radioProps.value.value];
-      emits("change", modelValue.value);
+      const value = target[radioProps.value.value];
+      if (modelValue.value === value) return;
+      modelValue.value = value;
+      emits("change", value);
     }
     async function sliderHandler() {
       selectIndex.value = props.options.findIndex((item) => {
@@ -53,7 +55,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       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}%`;
       }
     }
@@ -81,7 +82,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             renderList(__props.options, (item, index) => {
               return openBlock(), createElementBlock("li", {
                 key: index,
-                class: "w-0 flex-1 flex items-center justify-center text-main clickBox",
+                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", {