hy-dispatch-ui-v3 0.2.53 → 0.2.55

package/es/components/hyIconBox/iconBox.vue.mjs

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

package/es/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/es/components/hyMap/index.mjs

@@ -0,0 +1,6 @@
+import _sfc_main from './map.vue.mjs';
+import { withInstall } from '../../utils/handler.mjs';
+
+const HyMap = withInstall(_sfc_main);
+
+export { HyMap, HyMap as default };

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

@@ -0,0 +1,59 @@
+import Map from '../../../utils/map/index.mjs';
+import { nextTick } from 'vue';
+
+const useAppMapWrapper = (hy) => {
+  const {
+    props: { mapConfig },
+    mapRef,
+    emits
+  } = hy;
+  const hyMap = null;
+  const map = null;
+  function newMap(mapType) {
+    hy.hyMap = new Map({
+      ...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: () => {
+        nextTick(() => {
+          emits("complete", hy.hyMap, hy.map);
+        });
+      }
+    });
+  }
+  return {
+    hyMap,
+    map,
+    newMap,
+    initMap
+  };
+};
+
+export { useAppMapWrapper };

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

@@ -0,0 +1,59 @@
+import { ref, onMounted, openBlock, createElementBlock, createElementVNode } from 'vue';
+import { useAppMapWrapper } from './js/index.mjs';
+import { useMixins } from '../../hooks/useMixins.mjs';
+
+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 = ref();
+    const { newMap } = useMixins(
+      {
+        props,
+        emits,
+        mapRef
+      },
+      [useAppMapWrapper]
+    );
+    onMounted(() => {
+      newMap(props.mapType);
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", { class: "w-full h-full p-5 box-border border-border border relative" }, [
+        createElementVNode(
+          "div",
+          {
+            ref_key: "mapRef",
+            ref: mapRef,
+            class: "w-full h-full rounded overflow-hidden"
+          },
+          null,
+          512
+          /* NEED_PATCH */
+        )
+      ]);
+    };
+  }
+};
+
+export { _sfc_main as default };

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

@@ -0,0 +1,53 @@
+import axios from 'axios';
+import { unref } from 'vue';
+import { useApi } from '../../../hooks/useApi.mjs';
+
+let throttleFn = null;
+let cancelSource = null;
+function getOrgTreeSimple() {
+  const { api } = useApi();
+  if (!throttleFn) {
+    if (cancelSource) {
+      cancelSource.cancel("\u4E2D\u65AD\u8BF7\u6C42");
+    }
+    cancelSource = axios.CancelToken.source();
+    throttleFn = new Promise((resolve, reject) => {
+      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
+  };
+}
+
+export { getOrgTreeSimple, orgTreeDatahandler };

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

@@ -1,7 +1,8 @@
-import { defineComponent, useModel, useTemplateRef, ref, computed, watch, openBlock, createElementBlock, createElementVNode, normalizeStyle, createVNode, unref, renderSlot, toDisplayString, createCommentVNode, createBlock, normalizeClass, mergeModels } from 'vue';
+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 { useApi } from '../../hooks/useApi.mjs';
+import { getOrgTreeSimple, orgTreeDatahandler } from './js/index.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
+import { useSubscribe } from '../../hooks/useSubscribe.mjs';
 
 import "./style/orgCascader.scss";
 
@@ -81,9 +82,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emits = __emit;
-    const { api } = useApi();
+    const { subOrgCascader, unsubOrgCascader } = useSubscribe();
     const modelValue = useModel(__props, "modelValue");
     const cascaderRef = useTemplateRef("cascaderRef");
+    const loading = ref(true);
     const focusType = ref(false);
     const cascaderValue = ref(null);
     const cascaderOptions = ref([]);
@@ -92,29 +94,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       const target = cascaderValueMap.value.get(modelValue.value);
       return target?.companyName;
     });
-    function getCascaderData() {
-      unref(api).post("organization/orgTreeSimple").then((res) => {
-        handlerData(res.data);
-      });
+    async function getCascaderData() {
+      loading.value = true;
+      const data = await 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 } = orgTreeDatahandler(data);
+      cascaderOptions.value = cascaderData;
+      cascaderValueMap.value = cascaderDataMap;
       if (modelValue.value) {
         setDefaultValue(modelValue.value);
       }
@@ -142,6 +131,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     }
     if (props.defaultGetData) {
       getCascaderData();
+      subOrgCascader(getCascaderData);
     }
     watch(
       () => props.options,
@@ -159,6 +149,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       },
       { immediate: true, deep: true }
     );
+    onUnmounted(() => {
+      unsubOrgCascader(getCascaderData);
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", { class: "relative" }, [
         __props.contentType ? (openBlock(), createElementBlock("div", {
@@ -231,7 +224,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 ? (openBlock(), createElementBlock("div", {
+          key: 2,
+          class: "absolute left-0 right-0 top-0 bottom-0 cursor-wait"
+        })) : createCommentVNode("v-if", true)
       ]);
     };
   }

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

@@ -1,11 +1,12 @@
-import { defineComponent, useTemplateRef, computed, unref, onUnmounted, openBlock, createElementBlock, normalizeClass, createElementVNode, createVNode, withCtx, toDisplayString, Fragment, createCommentVNode, withDirectives, normalizeStyle, vShow, mergeProps, renderList, createBlock, createSlots, renderSlot } from 'vue';
+import { defineComponent, useTemplateRef, computed, unref, onUnmounted, openBlock, createElementBlock, normalizeClass, createElementVNode, createVNode, toDisplayString, Fragment, createCommentVNode, withDirectives, normalizeStyle, withCtx, vShow, mergeProps, renderList, createBlock, createSlots, renderSlot } from 'vue';
 import { ElIcon, ElForm } from 'element-plus';
-import { Filter, ArrowDown } from '@element-plus/icons-vue';
+import { ArrowDown } from '@element-plus/icons-vue';
 import _sfc_main$1 from './cpns/searchItem.vue.mjs';
 import { useShrink, isEmptyValue } 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 "./style/search.scss";
 
@@ -134,12 +135,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             },
             [
               createElementVNode("div", { class: "flex items-center gap-2" }, [
-                createVNode(unref(ElIcon), { size: "12" }, {
-                  default: withCtx(() => [
-                    createVNode(unref(Filter))
-                  ]),
-                  _: 1
-                  /* STABLE */
+                createVNode(unref(HyIcon), {
+                  "svg-name": "ops-button-screen",
+                  "class-name": "!w-3 !h-3"
                 }),
                 createElementVNode(
                   "span",

package/es/components/hyTable/cpns/columnSelect.vue.mjs

@@ -1,10 +1,11 @@
 import { useTemplateRef, ref, computed, unref, watch, openBlock, createBlock, withCtx, createElementVNode, toDisplayString, createVNode, normalizeClass, createCommentVNode, createElementBlock, Fragment, renderList, createTextVNode, nextTick } from 'vue';
 import Sortable from 'sortablejs';
-import { ElPopover, ElIcon, ElCheckboxGroup, ElMessage } from 'element-plus';
-import { CircleClose, Warning, Edit } from '@element-plus/icons-vue';
+import { ElPopover, ElCheckboxGroup, ElIcon, ElMessage } from 'element-plus';
+import { Warning } from '@element-plus/icons-vue';
 import { tableColumnShowHandler, tableColumnHandler } from '../js/index.mjs';
 import _sfc_main$1 from './columnSelectItem.vue.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
+import { HyIcon } from '../../hyIcon/index.mjs';
 import { HyTooltip } from '../../hyTooltip/index.mjs';
 import { HyButton } from '../../hyButton/index.mjs';
 import { isEmpty } from '../../../utils/is.mjs';
@@ -174,12 +175,10 @@ const _sfc_main = {
         {
           reference: withCtx(() => [
             createElementVNode("div", { class: "flex items-center gap-[10px] clickBox px-3 rounded hover:bg-background-2" }, [
-              createVNode(unref(ElIcon), null, {
-                default: withCtx(() => [
-                  createVNode(unref(Edit))
-                ]),
-                _: 1
-                /* STABLE */
+              createCommentVNode(" <el-icon><Edit /></el-icon> "),
+              createVNode(unref(HyIcon), {
+                "svg-name": "ops-button-edit-column",
+                "class-name": "!w-3 !h-3"
               }),
               createElementVNode(
                 "span",
@@ -200,17 +199,10 @@ const _sfc_main = {
                   1
                   /* TEXT */
                 ),
-                createVNode(unref(ElIcon), {
-                  class: "clickBox",
-                  color: "rgb(var(--hy-danger-2))",
-                  size: "18",
+                createVNode(unref(HyIcon), {
+                  "svg-name": "layout-dialog-close-v2",
+                  "class-name": "!w-[18px] !h-[18px] cursor-pointer",
                   onClick: closePopover
-                }, {
-                  default: withCtx(() => [
-                    createVNode(unref(CircleClose))
-                  ]),
-                  _: 1
-                  /* STABLE */
                 })
               ]),
               createElementVNode("div", { class: "h-[364px] px-4 pt-[11px] pb-1 scroll-body overflow-y-auto" }, [

package/es/components/hyTable/table.vue.mjs

@@ -1,6 +1,6 @@
-import { defineComponent, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, withCtx, toDisplayString, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, mergeModels } from 'vue';
-import { ElIcon, ElTable, ElTableColumn, ElDropdown, ElDropdownMenu, ElDropdownItem, ElAutoResizer, ElPagination } from 'element-plus';
-import { Filter, MoreFilled } from '@element-plus/icons-vue';
+import { defineComponent, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, toDisplayString, withCtx, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, mergeModels } from 'vue';
+import { ElTable, ElTableColumn, ElDropdown, ElIcon, ElDropdownMenu, ElDropdownItem, ElAutoResizer, ElPagination } from 'element-plus';
+import { MoreFilled } from '@element-plus/icons-vue';
 import { operatorFilterHandler, operatorClickHandler, operatorDisabledHandler, operatorDisableTextdHandler, renderContentHandler, renderHeaderHandler, useAppTableWrapper } from './js/index.mjs';
 import { useAppTableSearch } from './js/search.mjs';
 import _sfc_main$2 from './cpns/headerItem.vue.mjs';
@@ -8,10 +8,10 @@ import _sfc_main$1 from './cpns/columnSelect.vue.mjs';
 import _sfc_main$3 from './cpns/virtualTable.vue.mjs';
 import { useLocale } from '../../hooks/useLocale.mjs';
 import { useMixins } from '../../hooks/useMixins.mjs';
+import { HyIcon } from '../hyIcon/index.mjs';
 import { HyTooltip } from '../hyTooltip/index.mjs';
 import { HyInputSearch } from '../hyInput/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
-import { HyIcon } from '../hyIcon/index.mjs';
 import { HySearch } from '../hySearch/index.mjs';
 import { parseRem } from '../../utils/adaptive.mjs';
 import { isEmpty } from '../../utils/is.mjs';
@@ -62,7 +62,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     isShowAllSelect: {
       // 全选禁用
       type: Boolean,
-      default: () => false
+      default: true
     },
     emptyText: {
       // 空数据时显示的文本内容
@@ -304,12 +304,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 class: "h-[32px] flex items-center gap-[10px] clickBox px-3 select-none rounded hover:bg-background-2",
                 onClick: unref(switchShowFilter)
               }, [
-                createVNode(unref(ElIcon), { size: "12" }, {
-                  default: withCtx(() => [
-                    createVNode(unref(Filter))
-                  ]),
-                  _: 1
-                  /* STABLE */
+                createVNode(unref(HyIcon), {
+                  "svg-name": "ops-button-screen",
+                  "class-name": "!w-3 !h-3"
                 }),
                 createElementVNode(
                   "span",

package/es/components/hyTableActionButton/tableActionButton.vue.mjs

@@ -5,7 +5,7 @@ import { useLocale } from '../../hooks/useLocale.mjs';
 import { HyTooltip } from '../hyTooltip/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
-import { isPermission, isBoolean } from '../../utils/is.mjs';
+import { isPermission } from '../../utils/is.mjs';
 
 import "./style/tableActionButton.scss";
 
@@ -115,8 +115,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         return false;
       }
       const show = unref(operate.show);
-      if (isBoolean(show)) return show;
-      return true;
+      if (operate.show === null || operate.show === void 0) {
+        return true;
+      } else {
+        return !!show;
+      }
     }
     watch(() => props.operateList, setSelectedData, { deep: true, immediate: true });
     __expose({});