hy-dispatch-ui-v3 0.2.53 → 0.2.55

package/lib/components/hyDialog/dialog.vue.js

@@ -225,13 +225,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   class: vue.normalizeClass(["box-border w-full border-0 border-b border-solid border-background-3 px-4 py-[10px] text-main text-sm font-bold flex justify-between items-center relative", { "!justify-center": __props.titleAlign === "center" }])
                 },
                 [
-                  vue.createElementVNode(
-                    "div",
-                    { class: "flex-grow w-0 mr-2 over_one_line" },
-                    vue.toDisplayString(__props.title),
-                    1
-                    /* TEXT */
-                  ),
+                  vue.createElementVNode("div", { class: "flex-grow w-0 mr-2 over_one_line" }, [
+                    vue.renderSlot(_ctx.$slots, "title", {}, () => [
+                      vue.createTextVNode(
+                        vue.toDisplayString(__props.title),
+                        1
+                        /* TEXT */
+                      )
+                    ])
+                  ]),
                   vue.createElementVNode("div", { class: "text-lg cursor-pointer" }, [
                     vue.renderSlot(_ctx.$slots, "title-operate-box"),
                     __props.ifShrink ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyIcon), {

package/lib/components/hyForm/cpns/arrayItem.vue.js

@@ -11,7 +11,6 @@ var useAppForm = require('../js/useAppForm.js');
 var useLocale = require('../../../hooks/useLocale.js');
 var form = require('../../../utils/form.js');
 var is = require('../../../utils/is.js');
-var handler = require('../../../utils/handler.js');
 var index$1 = require('../../hyTooltip/index.js');
 
 const _sfc_main = {
@@ -109,11 +108,11 @@ const _sfc_main = {
                   /* TEXT */
                 )
               ]),
-              vue.unref(handler.funRunHandler)(__props.column.help) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+              vue.unref(index.columnHelpHandler)(props, __props.column) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
                 key: 0,
                 "is-always": "",
                 overLine: 1,
-                content: vue.unref(handler.funRunHandler)(__props.column.help)
+                content: vue.unref(index.columnHelpHandler)(props, __props.column)
               }, {
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(elementPlus.ElIcon), {
@@ -256,6 +255,7 @@ const _sfc_main = {
                               "parent-prop": __props.column.field,
                               index: index$1,
                               loading: __props.loading,
+                              size: __props.size,
                               disabled: __props.disabled,
                               readonly: __props.readonly,
                               level: 3
@@ -271,7 +271,7 @@ const _sfc_main = {
                                   ])
                                 };
                               })
-                            ]), 1032, ["model", "column", "rules", "parent-prop", "index", "loading", "disabled", "readonly"]);
+                            ]), 1032, ["model", "column", "rules", "parent-prop", "index", "loading", "size", "disabled", "readonly"]);
                           }),
                           128
                           /* KEYED_FRAGMENT */

package/lib/components/hyForm/cpns/extraItem.vue.js

@@ -39,6 +39,10 @@ const _sfc_main = {
     readonly: {
       type: Boolean,
       default: false
+    },
+    size: {
+      type: String,
+      default: "default"
     }
   },
   setup(__props) {
@@ -118,6 +122,7 @@ const _sfc_main = {
                       model: __props.model,
                       column: item,
                       rules: __props.rules,
+                      size: __props.size,
                       loading: __props.loading,
                       disabled: __props.disabled,
                       readonly: __props.readonly
@@ -133,7 +138,7 @@ const _sfc_main = {
                           ])
                         };
                       })
-                    ]), 1032, ["model", "column", "rules", "loading", "disabled", "readonly"]);
+                    ]), 1032, ["model", "column", "rules", "size", "loading", "disabled", "readonly"]);
                   }),
                   128
                   /* KEYED_FRAGMENT */

package/lib/components/hyForm/cpns/formItem.vue.js

@@ -8,7 +8,6 @@ var iconsVue = require('@element-plus/icons-vue');
 var index = require('../js/index.js');
 var is = require('../../../utils/is.js');
 var form = require('../../../utils/form.js');
-var handler = require('../../../utils/handler.js');
 var index$1 = require('../../hyTooltip/index.js');
 var index$2 = require('../../hyInput/index.js');
 var index$3 = require('../../hyDatePicker/index.js');
@@ -51,10 +50,15 @@ const _sfc_main = {
     level: {
       type: Number,
       default: 2
+    },
+    size: {
+      type: String,
+      default: "default"
     }
   },
   setup(__props) {
     const props = __props;
+    const formItemRef = vue.useTemplateRef("formItemRef");
     const columnProp = vue.computed(() => {
       let field = is.isArray(props.column.field) ? props.column.field[0] : props.column.field;
       if (props.parentProp) {
@@ -82,7 +86,13 @@ const _sfc_main = {
         form.setValueByProp(props.model, prop, val);
       }
     });
-    function onChangeHandler(...args) {
+    function getColumnRuleHandler(column, model) {
+      if (!index.isRequired(props, column) && formItemRef.value) {
+        formItemRef.value.clearValidate();
+      }
+      return form.columnRuleHandler(column, model);
+    }
+    function onChangeHandler() {
       const { onChange } = props.column;
       if (!onChange) return;
       onChange(props.column, props.model);
@@ -90,8 +100,10 @@ const _sfc_main = {
     return (_ctx, _cache) => {
       return vue.unref(index.columnShowHandler)(props, __props.column) ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElFormItem), {
         key: 0,
-        rules: __props.column.rules,
+        ref_key: "formItemRef",
+        ref: formItemRef,
         prop: columnProp.value,
+        rules: getColumnRuleHandler(__props.column, props.model),
         style: vue.normalizeStyle(vue.unref(index.columnItemStyle)(props, __props.column))
       }, {
         default: vue.withCtx(() => [
@@ -115,11 +127,11 @@ const _sfc_main = {
                 key: 0,
                 class: "label-required"
               })) : vue.createCommentVNode("v-if", true),
-              vue.unref(handler.funRunHandler)(__props.column.help) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+              vue.unref(index.columnHelpHandler)(props, __props.column) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
                 key: 1,
                 "is-always": "",
                 overLine: 1,
-                content: vue.unref(handler.funRunHandler)(__props.column.help)
+                content: vue.unref(index.columnHelpHandler)(props, __props.column)
               }, {
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(elementPlus.ElIcon), {
@@ -150,14 +162,14 @@ const _sfc_main = {
             ])) : vue.createCommentVNode("v-if", true)
           ]),
           vue.createCommentVNode(" \u5185\u5BB9\u4EC5\u67E5\u770B "),
-          __props.column.readonly || __props.readonly || !__props.column.type && !__props.column.slot ? (vue.openBlock(), vue.createElementBlock(
+          vue.unref(index.isReadonly)(props, __props.column) || !__props.column.type && !__props.column.slot ? (vue.openBlock(), vue.createElementBlock(
             "div",
             {
               key: 0,
               class: vue.normalizeClass(["w-full flex items-center text-main px-2", {
-                "min-h-[40px]": _ctx.size === "large",
-                "min-h-[32px]": _ctx.size === "default",
-                "min-h-[24px]": _ctx.size === "small",
+                "min-h-[40px]": __props.size === "large",
+                "min-h-[32px]": __props.size === "default",
+                "min-h-[24px]": __props.size === "small",
                 "bg-background": __props.level === 1,
                 "bg-background-2": __props.level === 2,
                 "bg-background-3": __props.level === 3,
@@ -324,7 +336,10 @@ const _sfc_main = {
                   vue.createCommentVNode(" \u5F00\u5173 "),
                   vue.createVNode(vue.unref(elementPlus.ElSwitch), vue.mergeProps({
                     modelValue: bindValue.value,
-                    "onUpdate:modelValue": ($event) => bindValue.value = $event
+                    "onUpdate:modelValue": ($event) => bindValue.value = $event,
+                    "inline-prompt": "",
+                    width: "80",
+                    style: { "--hy-el-switch-on-color": "#5ab95f", "--hy-el-switch-off-color": "rgba(var(--hy-background), 1)" }
                   }, __props.column.attrs, {
                     disabled: vue.unref(index.isDisabled)(props, __props.column),
                     onChange: onChangeHandler
@@ -371,7 +386,7 @@ const _sfc_main = {
         ]),
         _: 3
         /* FORWARDED */
-      }, 8, ["rules", "prop", "style"])) : vue.createCommentVNode("v-if", true);
+      }, 8, ["prop", "rules", "style"])) : vue.createCommentVNode("v-if", true);
     };
   }
 };

package/lib/components/hyForm/js/index.js

@@ -3,6 +3,7 @@
 var vue = require('vue');
 var handler = require('../../../utils/handler.js');
 var is = require('../../../utils/is.js');
+var form = require('../../../utils/form.js');
 var useLocale = require('../../../hooks/useLocale.js');
 
 function columnItemStyle(props, column) {
@@ -28,15 +29,29 @@ function columnShowHandler(props, column) {
   if (is.isFunction(show)) return show(column, props.model);
   return true;
 }
+function columnHelpHandler(props, column) {
+  const help = vue.unref(column.help);
+  if (is.isString(help)) return help;
+  if (is.isFunction(help)) return help(column, props.model);
+  return;
+}
+function isReadonly(props, column) {
+  if (props.readonly) return props.readonly;
+  const readonly = vue.unref(column.readonly);
+  if (is.isBoolean(readonly)) return readonly;
+  if (is.isFunction(readonly)) return readonly(column, props.model);
+  return false;
+}
 function isRequired(props, column) {
-  let { readonly, field, rules } = column;
-  if (props.readonly || readonly) {
+  let { field } = column;
+  let rules = form.columnRuleHandler(column, props.model);
+  if (isReadonly(props, column)) {
     return false;
   }
   if (Array.isArray(field)) {
     return field.find((key) => isRequired(props, { ...column, field: key }));
   }
-  rules = is.isArray(rules) && rules?.length || is.isObject(rules) ? rules : props.rules?.[field];
+  rules = is.isArray(rules) && rules?.length ? rules : props.rules?.[field];
   if (is.isArray(rules)) {
     return rules.some((item) => item.required);
   }
@@ -55,39 +70,28 @@ function isDisabled(props, column) {
 function renderText(props, column = {}) {
   const { type, field, customRender } = column;
   const { props: fieldNames } = column.attrs || {};
+  const columnValue = form.getValueByProp(props.model, field);
   if (customRender && typeof customRender === "function") {
     return customRender({
       column,
       model: props.model,
-      value: props.model[field]
+      value: columnValue
     });
   }
-  if (type === "range-picker") {
-    const [start, end] = field;
-    return props.model?.[start] ? `${props.model?.[start]} ~ ${props.model?.[end]}` : "";
-  }
-  if (type === "location") {
-    const [lon, lat] = field;
-    return [props.model[lon], props.model[lat]].filter(Boolean).join("\uFF0C");
-  }
   if (/^(select|radio|checkbox)$/.test(type)) {
     const optionList = optionsHandler(props, column);
     const target = optionList.find(
-      (item) => item[fieldNames.value] === props.model?.[field]
+      (item) => item[fieldNames.value] === columnValue
     );
-    return target?.[fieldNames.label] || props.model?.[field] || "";
-  }
-  if (/^dept-select(-all)?$/.test(type)) {
-    const dict = /^dept-select$/.test(type) ? deptTreeDict.value : deptTreeAllDict.value;
-    return dict[props.model?.[field]] || props.model?.[field] || "";
-  }
-  if (type === "area-select") {
-    return areaTreeDict.value[props.model?.[field]] || props.model?.[field] || "";
+    return target?.[fieldNames.label] || columnValue || "";
   }
   if (Array.isArray(field)) {
-    return field.map((key) => props.model?.[key] || "").filter(Boolean).join(" - ");
+    return field.map((key) => form.getValueByProp(props.model, key) || "").filter(Boolean).join(" - ");
+  }
+  if (type === "switch") {
+    return columnValue === column.attrs.activeValue ? column.attrs.activeText : column.attrs.inactiveText;
   }
-  return props.model?.[field] || props.model?.[field] || "";
+  return columnValue || "";
 }
 function renderArrayItemLabel(props, column, index) {
   const { t } = useLocale.useLocale();
@@ -108,9 +112,11 @@ function optionsHandler(props, column) {
   return [];
 }
 
+exports.columnHelpHandler = columnHelpHandler;
 exports.columnItemStyle = columnItemStyle;
 exports.columnShowHandler = columnShowHandler;
 exports.isDisabled = isDisabled;
+exports.isReadonly = isReadonly;
 exports.isRequired = isRequired;
 exports.optionsHandler = optionsHandler;
 exports.renderAddLabel = renderAddLabel;

package/lib/components/hyForm/js/useAppForm.js

@@ -34,34 +34,6 @@ const genPlaceholderHandler = (config) => {
   }
   return { placeholder, startPlaceholder, endPlaceholder };
 };
-const genRuleRequiredMsgHandler = (config) => {
-  const { t } = useLocale.useLocale();
-  const { type, prop, label } = config || {};
-  if (!prop || !prop?.length) return "";
-  switch (type) {
-    case "input":
-    case "input-number":
-      return t("hy.pleaseEnterPlaceholder", [label]);
-    case "select":
-    case "radio":
-    case "checkbox":
-    case "date-picker":
-      return t("hy.pleaseSelectPlaceholder", [label]);
-    default:
-      return t("hy.cannotBeEmpty", [label]);
-  }
-};
-const rulesHandler = (config) => {
-  let { rules, required } = config || {};
-  rules = is.isArray(rules) ? [...rules] : is.isObject(rules) ? [rules] : [];
-  if (!rules.some((item) => item.required) && required) {
-    rules.unshift({
-      required: true,
-      message: genRuleRequiredMsgHandler(config)
-    });
-  }
-  return rules;
-};
 function appFormItemHandler(column = {}) {
   const label = genDefaultLabel(column);
   const { placeholder} = genPlaceholderHandler({ ...column, label });
@@ -73,7 +45,7 @@ function appFormItemHandler(column = {}) {
       field: column.prop,
       label,
       readonly: column.readonly || false,
-      rules: rulesHandler(column),
+      rules: column.rules,
       attrs
     }
   );
@@ -111,6 +83,17 @@ function appFormItemHandler(column = {}) {
       ...column,
       children: (column.children || []).map((item) => appFormItemHandler(item))
     };
+  } else if (/^switch$/.test(column.type)) {
+    column = {
+      ...column,
+      attrs: {
+        activeText: "\u5F00\u542F",
+        inactiveText: "\u5173\u95ED",
+        activeValue: true,
+        inactiveValue: false,
+        ...attrs
+      }
+    };
   }
   return column;
 }
@@ -124,6 +107,8 @@ const resetAppFormValue = (columns = [], obj = {}) => {
         const childValue = resetAppFormValue(item.children);
         obj[item.prop] = [childValue];
       }
+    } else if (item.type === "extra") {
+      resetAppFormValue(item.children, obj);
     } else if (Array.isArray(item.prop)) {
       for (let i = 0; i < item.prop.length; i++) {
         form.genValueByProp(

package/lib/components/hyIconBox/iconBox.vue.js

@@ -58,7 +58,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", { class: "hy-icon-box" }, [
         vue.createVNode(vue.unref(elementPlus.ElTooltip), {
-          "open-delay": 500,
+          "show-after": 500,
           class: "item",
           effect: "dark",
           placement: "top",

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

@@ -1,5 +1,6 @@
 .hy-icon-box {
   display: inline-block;
+  color: rgb(var(--hy-main));
   border-radius: 4px;
   & + & {
     margin-left: 12px;
@@ -11,7 +12,6 @@
     justify-content: center;
     padding: 5px;
     user-select: none;
-    color: rgb(var(--hy-main));
     border-radius: 100%;
     background:
       radial-gradient(

package/lib/components/hyMap/index.js

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

package/lib/components/hyMap/js/index.js

@@ -0,0 +1,61 @@
+'use strict';
+
+var index = require('../../../utils/map/index.js');
+var vue = require('vue');
+
+const useAppMapWrapper = (hy) => {
+  const {
+    props: { mapConfig },
+    mapRef,
+    emits
+  } = hy;
+  const hyMap = null;
+  const map = null;
+  function newMap(mapType) {
+    hy.hyMap = new index.default({
+      ...mapConfig,
+      mapType,
+      BM: window.BM
+      // defaultMapStyle: 'amap://styles/b5d280643c6525a8f6b2a07521f639ef', // 地图样式
+      // bmHttpsUrl: 'http://www.bigemap.com:9000' /* 内网部署的地址 */,
+      // bmUiName:
+      //   'bigemap.amap-map' /* bmUiName 内网部署的地址里面的离线地图名称 */,
+      // crs: null,
+      // layersUrlList: [
+      //   {
+      //     layersUrls:
+      //       'http://t7.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk={mapKey},http://t7.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk={mapKey}',
+      //     filter: mapFilters[0].filter,
+      //     key: 'db848f59ddd50debfb774811bbdfb327',
+      //   },
+      // ], // 地图瓦片地址
+    });
+    setTimeout(() => {
+      hy.initMap();
+    }, 800);
+  }
+  function initMap() {
+    hy.map = hy.hyMap.InitMap(mapRef.value, {
+      minZoom: mapConfig.minZoom || 8,
+      maxZoom: mapConfig.maxZoom || 18,
+      center: mapConfig.center || {
+        lat: 22.553681,
+        lng: 113.931936
+      },
+      zoom: mapConfig.zoom || 14,
+      completeCallbacks: () => {
+        vue.nextTick(() => {
+          emits("complete", hy.hyMap, hy.map);
+        });
+      }
+    });
+  }
+  return {
+    hyMap,
+    map,
+    newMap,
+    initMap
+  };
+};
+
+exports.useAppMapWrapper = useAppMapWrapper;

package/lib/components/hyMap/map.vue.js

@@ -0,0 +1,63 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+var index = require('./js/index.js');
+var useMixins = require('../../hooks/useMixins.js');
+
+import "@hy-dispatch-ui-v3/static/map/bigemap.css";
+
+import "@hy-dispatch-ui-v3/static/map/MarkerCluster.css";
+
+import "@hy-dispatch-ui-v3/static/map/bmDraw.css";
+
+const _sfc_main = {
+  __name: "map",
+  props: {
+    // 地图配置
+    mapConfig: {
+      type: Object,
+      default: () => ({})
+    },
+    // 地图类型 gaode leaflet bugMap
+    mapType: {
+      type: String,
+      default: "gaode"
+    }
+  },
+  emits: ["complete"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
+    const mapRef = vue.ref();
+    const { newMap } = useMixins.useMixins(
+      {
+        props,
+        emits,
+        mapRef
+      },
+      [index.useAppMapWrapper]
+    );
+    vue.onMounted(() => {
+      newMap(props.mapType);
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", { class: "w-full h-full p-5 box-border border-border border relative" }, [
+        vue.createElementVNode(
+          "div",
+          {
+            ref_key: "mapRef",
+            ref: mapRef,
+            class: "w-full h-full rounded overflow-hidden"
+          },
+          null,
+          512
+          /* NEED_PATCH */
+        )
+      ]);
+    };
+  }
+};
+
+exports.default = _sfc_main;

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

@@ -0,0 +1,56 @@
+'use strict';
+
+var axios = require('axios');
+var vue = require('vue');
+var useApi = require('../../../hooks/useApi.js');
+
+let throttleFn = null;
+let cancelSource = null;
+function getOrgTreeSimple() {
+  const { api } = useApi.useApi();
+  if (!throttleFn) {
+    if (cancelSource) {
+      cancelSource.cancel("\u4E2D\u65AD\u8BF7\u6C42");
+    }
+    cancelSource = axios.CancelToken.source();
+    throttleFn = new Promise((resolve, reject) => {
+      vue.unref(api).post(
+        "organization/orgTreeSimple",
+        {},
+        { cancelToken: cancelSource.token }
+      ).then((res) => {
+        resolve(res.data);
+        throttleFn = null;
+      }).catch((err) => {
+        reject(err);
+      });
+    });
+    return throttleFn;
+  } else {
+    return throttleFn;
+  }
+}
+function orgTreeDatahandler(data) {
+  const cascaderMap = /* @__PURE__ */ new Map();
+  const handler = (list = [], parentIdsList = []) => {
+    (list || []).forEach((item) => {
+      item.label = item.companyName;
+      item.value = item.id;
+      item.parentIdsList = [...parentIdsList, item.id];
+      cascaderMap.set(item.value, item);
+      if (item.children && item.children.length > 0) {
+        handler(item.children, item.parentIdsList);
+      } else {
+        delete item.children;
+      }
+    });
+  };
+  handler(data);
+  return {
+    cascaderData: data,
+    cascaderDataMap: cascaderMap
+  };
+}
+
+exports.getOrgTreeSimple = getOrgTreeSimple;
+exports.orgTreeDatahandler = orgTreeDatahandler;

package/lib/components/hyOrgCascader/orgCascader.vue.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var elementPlus = require('element-plus');
-var useApi = require('../../hooks/useApi.js');
+var index = require('./js/index.js');
 var useLocale = require('../../hooks/useLocale.js');
+var useSubscribe = require('../../hooks/useSubscribe.js');
 
 import "./style/orgCascader.scss";
 
@@ -85,9 +86,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emits = __emit;
-    const { api } = useApi.useApi();
+    const { subOrgCascader, unsubOrgCascader } = useSubscribe.useSubscribe();
     const modelValue = vue.useModel(__props, "modelValue");
     const cascaderRef = vue.useTemplateRef("cascaderRef");
+    const loading = vue.ref(true);
     const focusType = vue.ref(false);
     const cascaderValue = vue.ref(null);
     const cascaderOptions = vue.ref([]);
@@ -96,29 +98,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       const target = cascaderValueMap.value.get(modelValue.value);
       return target?.companyName;
     });
-    function getCascaderData() {
-      vue.unref(api).post("organization/orgTreeSimple").then((res) => {
-        handlerData(res.data);
-      });
+    async function getCascaderData() {
+      loading.value = true;
+      const data = await index.getOrgTreeSimple();
+      handlerData(data || []);
+      loading.value = false;
     }
     function handlerData(data) {
-      const cascaderMap = /* @__PURE__ */ new Map();
-      const handler = (list = [], parentIdsList = []) => {
-        (list || []).forEach((item) => {
-          item.label = item.companyName;
-          item.value = item.id;
-          item.parentIdsList = [...parentIdsList, item.id];
-          cascaderMap.set(item.value, item);
-          if (item.children && item.children.length > 0) {
-            handler(item.children, item.parentIdsList);
-          } else {
-            delete item.children;
-          }
-        });
-      };
-      handler(data);
-      cascaderOptions.value = data;
-      cascaderValueMap.value = cascaderMap;
+      const { cascaderData, cascaderDataMap } = index.orgTreeDatahandler(data);
+      cascaderOptions.value = cascaderData;
+      cascaderValueMap.value = cascaderDataMap;
       if (modelValue.value) {
         setDefaultValue(modelValue.value);
       }
@@ -146,6 +135,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     if (props.defaultGetData) {
       getCascaderData();
+      subOrgCascader(getCascaderData);
     }
     vue.watch(
       () => props.options,
@@ -163,6 +153,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       },
       { immediate: true, deep: true }
     );
+    vue.onUnmounted(() => {
+      unsubOrgCascader(getCascaderData);
+    });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", { class: "relative" }, [
         __props.contentType ? (vue.openBlock(), vue.createElementBlock("div", {
@@ -235,7 +228,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           "show-all-levels": false,
           "virtual-scroll": "",
           onChange: onChangeHanlder
-        }, null, 8, ["modelValue", "onUpdate:modelValue", "class", "size", "options", "clearable", "disabled", "placeholder"]))
+        }, null, 8, ["modelValue", "onUpdate:modelValue", "class", "size", "options", "clearable", "disabled", "placeholder"])),
+        loading.value ? (vue.openBlock(), vue.createElementBlock("div", {
+          key: 2,
+          class: "absolute left-0 right-0 top-0 bottom-0 cursor-wait"
+        })) : vue.createCommentVNode("v-if", true)
       ]);
     };
   }