hy-dispatch-ui-v3 0.2.64 → 0.2.66

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

@@ -1,6 +1,6 @@
 import { useModel, computed, ref, openBlock, createBlock, unref, withCtx, renderSlot, createCommentVNode, createElementBlock, Fragment, renderList, normalizeStyle, withModifiers, normalizeClass, createVNode, mergeProps, createTextVNode, toDisplayString, createElementVNode, normalizeProps, guardReactiveProps, mergeModels } from 'vue';
-import { ElTableV2, ElIcon, ElCheckbox, ElDropdown, ElDropdownMenu, ElDropdownItem } from 'element-plus';
-import { ArrowRight, MoreFilled } from '@element-plus/icons-vue';
+import { ElTableV2, ElCheckbox, ElDropdown, ElIcon, ElDropdownMenu, ElDropdownItem } from 'element-plus';
+import { MoreFilled } from '@element-plus/icons-vue';
 import '../../index.mjs';
 import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
@@ -8,8 +8,8 @@ import { operatorFilterHandler, operatorClickHandler, operatorDisabledHandler, o
 import _sfc_main$1 from './headerItem.vue.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 import { isNumber, isString, isFunction, isArray, isBoolean, isEmpty } from '../../../utils/is.mjs';
-import { HyTooltip } from '../../hyTooltip/index.mjs';
 import { HyIcon } from '../../hyIcon/index.mjs';
+import { HyTooltip } from '../../hyTooltip/index.mjs';
 
 const _sfc_main = {
   __name: "virtualTable",
@@ -372,16 +372,11 @@ const _sfc_main = {
                               rowKey: getRowKey(row)
                             }), ["stop"])
                           }, [
-                            createVNode(unref(ElIcon), {
-                              class: "text-main",
+                            createVNode(unref(HyIcon), {
+                              "svg-name": "dispatch-linear-arrow-down-bold",
+                              "class-name": "!w-3 !h-3 text-main",
                               style: normalizeStyle({ "margin-inline-start": `${depth * 12}px` })
-                            }, {
-                              default: withCtx(() => [
-                                createVNode(unref(ArrowRight))
-                              ]),
-                              _: 1
-                              /* STABLE */
-                            }, 8, ["style"])
+                            }, null, 8, ["style"])
                           ], 10, ["onClick"])) : (openBlock(), createElementBlock(
                             "div",
                             {
@@ -502,7 +497,7 @@ const _sfc_main = {
                           dropdown: withCtx(() => [
                             createVNode(
                               unref(ElDropdownMenu),
-                              null,
+                              { class: "hy-table-dropdown-menu" },
                               {
                                 default: withCtx(() => [
                                   (openBlock(true), createElementBlock(
@@ -623,10 +618,10 @@ const _sfc_main = {
                             "is-always": false,
                             "over-line": 2,
                             content: unref(renderContentHandler)(column, { column, row, $index, cellIndex })
-                          }, null, 8, ["content"])) : (openBlock(), createElementBlock("span", {
+                          }, null, 8, ["content"])) : column.type !== "expand" ? (openBlock(), createElementBlock("span", {
                             key: 1,
                             class: "text-auxiliary"
-                          }, "- -"))
+                          }, "- -")) : createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */

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

@@ -349,6 +349,7 @@ const useAppTableWrapper = (hy) => {
   }
   function clearSelection() {
     tableRef.value?.clearSelection();
+    selectedList.value = [];
   }
   function getSelectedList() {
     return selectedList.value;
@@ -372,12 +373,15 @@ const useAppTableWrapper = (hy) => {
       }
     }
   }
-  function onTableSelectHandler(selectList = [], row) {
+  function onTableSelectHandler(selectList = [], row, isAll = false) {
     if (selectList.length === 0 && tableDataSource.value.length === 0) {
       clearSelection();
     }
     selectedList.value = [...selectList];
     emits("on-select-checkbox", [...selectList], row);
+    if (isAll) {
+      emits("select-all", selectList);
+    }
   }
   function clearSelectedList(list = []) {
     selectedList.value = list || [];
@@ -404,13 +408,6 @@ const useAppTableWrapper = (hy) => {
     }
     return className.filter(Boolean).join(" ");
   }
-  const isSearchFocus = ref(false);
-  function onSearchInputHandler() {
-    isSearchFocus.value = true;
-  }
-  function onSearchBlurHandler() {
-    isSearchFocus.value = false;
-  }
   watchEffect(() => {
     const { columnsList, columnsEditablele, searchText } = tableColumnHandler(
       props.tableColumns,
@@ -444,10 +441,6 @@ const useAppTableWrapper = (hy) => {
     onTableRowContextmenuHandler,
     onTableRowClickHandler,
     onTableColumnsSelectHandler,
-    // 搜索选中
-    isSearchFocus,
-    onSearchInputHandler,
-    onSearchBlurHandler,
     showAppTableLoading,
     closeAppTableLoading
   };

package/es/components/hyTable/js/search.mjs

@@ -51,6 +51,7 @@ function useAppTableSearch(hy) {
         tableDataSource.value = data;
       }
       totalElements.value = res.data.totalElements;
+      hy.expandRowKeys.value = [];
       emits("reqSuccess", tableDataSource.value);
     }
   }
@@ -64,7 +65,7 @@ function useAppTableSearch(hy) {
   async function resetFn() {
     await resetFields();
     props.filterModel.query = null;
-    getData(1);
+    await getData(1);
   }
   function getParametersFn() {
     return Object.assign(
@@ -84,6 +85,7 @@ function useAppTableSearch(hy) {
   function setData(dataSource) {
     tableDataSource.value = dataSource || [];
     hy.loading.value = false;
+    emits("reqSuccess", tableDataSource.value);
   }
   function onSizeChangeHandler(val) {
     props.filterModel.page = 1;

package/es/components/hyTable/style/table.scss

@@ -25,6 +25,14 @@
     .hy-el-table-v2__row-cell {
       padding: 8px 12px;
     }
+    .hy-el-table-v2__expand-icon {
+      &:not(.is-expanded) svg {
+        transform: rotate(-90deg) !important;
+      }
+      &.is-expanded svg {
+        transform: rotate(0deg) !important;
+      }
+    }
   }
   .hy-table-search {
     width: 160px;
@@ -46,6 +54,7 @@
 
 .hy-table-dropdown-menu.hy-el-dropdown-menu {
   --hy-el-text-color-regular: rgba(var(--hy-main));
+  --hy-el-dropdown-menuItem-hover-color: rgba(var(--hy-main));
   border: 1px solid rgba(var(--hy-main));
   padding: 0px;
   .hy-el-dropdown-menu__item {
@@ -54,5 +63,9 @@
     &:last-child {
       border-bottom: none;
     }
+    &:not(.is-disabled):focus,
+    &:not(.is-disabled):hover {
+      font-weight: bold;
+    }
   }
 }

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

@@ -1,4 +1,4 @@
-import { defineComponent, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, toDisplayString, withCtx, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, isRef, mergeModels } from 'vue';
+import { defineComponent, useModel, useTemplateRef, openBlock, createElementBlock, createCommentVNode, createElementVNode, createBlock, unref, createVNode, toDisplayString, withCtx, renderSlot, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, mergeProps, Fragment, withModifiers, normalizeStyle, isRef, mergeModels } from 'vue';
 import { ElTable, ElTableColumn, ElDropdown, ElIcon, ElDropdownMenu, ElDropdownItem, ElAutoResizer, ElPagination } from 'element-plus';
 import { MoreFilled } from '@element-plus/icons-vue';
 import '../index.mjs';
@@ -235,9 +235,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       onTableRowContextmenuHandler,
       onTableRowExpandChangeHandler,
       onTableSelectHandler,
-      isSearchFocus,
-      onSearchInputHandler,
-      onSearchBlurHandler,
       // useAppTableSearch
       // 表单查询
       totalElements,
@@ -411,8 +408,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   "font-size": `${unref(parseRem)(__props.fontSize)}rem`
                 },
                 "expand-row-keys": unref(expandRowKeys),
-                onSelect: unref(onTableSelectHandler),
-                onSelectAll: unref(onTableSelectHandler),
+                onSelect: (list, row) => unref(onTableSelectHandler)(list, row),
+                onSelectAll: (list) => unref(onTableSelectHandler)(list, null, true),
                 onRowClick: unref(onTableRowClickHandler),
                 onRowContextmenu: unref(onTableRowContextmenuHandler),
                 onExpandChange: unref(onTableRowExpandChangeHandler)
@@ -445,7 +442,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               key: 0,
                               ref_for: true
                             }, column, { "render-header": null }),
-                            {
+                            createSlots({
                               header: withCtx((scope) => [
                                 createVNode(_sfc_main$2, {
                                   type: "default",
@@ -535,7 +532,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     dropdown: withCtx(() => [
                                       createVNode(
                                         unref(ElDropdownMenu),
-                                        null,
+                                        { class: "hy-table-dropdown-menu" },
                                         {
                                           default: withCtx(() => [
                                             (openBlock(true), createElementBlock(
@@ -648,7 +645,22 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               ]),
                               _: 2
                               /* DYNAMIC */
-                            },
+                            }, [
+                              column.type === "expand" ? {
+                                name: "expand",
+                                fn: withCtx(({ expandable, expanded }) => [
+                                  expandable ? (openBlock(), createBlock(unref(HyIcon), {
+                                    key: 0,
+                                    "svg-name": "dispatch-linear-arrow-down-bold",
+                                    "class-name": "!w-3 !h-3 text-main transition",
+                                    style: normalizeStyle({
+                                      transform: expanded ? "rotate(0deg)" : "rotate(-90deg)"
+                                    })
+                                  }, null, 8, ["style"])) : createCommentVNode("v-if", true)
+                                ]),
+                                key: "0"
+                              } : void 0
+                            ]),
                             1040
                             /* FULL_PROPS, DYNAMIC_SLOTS */
                           )) : createCommentVNode("v-if", true)

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

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, unref, watch, openBlock, createElementBlock, createBlock, withCtx, createVNode, normalizeClass, createTextVNode, toDisplayString, createElementVNode, Fragment, renderList, createCommentVNode, normalizeStyle } from 'vue';
 import { ElPopover, ElIcon } from 'element-plus';
-import { Warning, ArrowDown } from '@element-plus/icons-vue';
+import { ArrowDown } from '@element-plus/icons-vue';
 import '../../hooks/index.mjs';
 import '../../utils/index.mjs';
 import '../index.mjs';
@@ -20,7 +20,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     type: {
       type: String,
       default: "default"
-      // default 默认 primary 亮色 success 添加 danger 删除
+      // default 默认 primary 亮色 success 添加 danger 删除 operate 操作
     },
     size: {
       type: String,
@@ -50,7 +50,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     buttonClass: {
       type: String,
       default: () => {
-        return "button_addTo";
+        return "";
       }
     },
     // 操作数据
@@ -193,7 +193,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         "bg-auxiliary": __props.type === "default",
                         "bg-success": __props.type === "success",
                         "bg-theme": __props.type === "primary",
-                        "bg-danger-2": __props.type === "danger"
+                        "bg-danger-2": __props.type === "danger",
+                        "bg-success-3": __props.type === "operate"
                       }])
                     },
                     null,
@@ -283,12 +284,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 placement: "top"
                               }, {
                                 default: withCtx(() => [
-                                  createVNode(unref(ElIcon), { class: "flex-shrink-0 ml-2 text-auxiliary" }, {
-                                    default: withCtx(() => [
-                                      createVNode(unref(Warning))
-                                    ]),
-                                    _: 1
-                                    /* STABLE */
+                                  createVNode(unref(HyIcon), {
+                                    "svg-name": "dispatch-share1-prompt",
+                                    class: "!w-3 !h-3 ml-2 text-auxiliary"
                                   })
                                 ]),
                                 _: 1

package/es/components/hyTableForm/batchTableForm.vue.mjs

@@ -88,7 +88,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     "uploaded",
     "reset",
     "submitting",
-    "submit"
+    "submit",
+    "submitProgress",
+    "tableDataChange"
   ], ["update:step"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
@@ -123,6 +125,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const submitting = ref(false);
     const submitProgress = ref(0);
     const submitModel = ref("default");
+    function tableDataChange(e) {
+      emits("tableDataChange", e);
+    }
+    function setSubmitProgress(newSubmitProgress = 0) {
+      submitProgress.value = newSubmitProgress;
+      emits("submitProgress", newSubmitProgress);
+    }
     function setData(data = []) {
       if (!tableRef.value) return;
       tableRef.value.setData(data);
@@ -240,13 +249,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         }
       }
       const submitList = [];
-      submitProgress.value = 0;
+      setSubmitProgress(0);
       submitting.value = true;
       emits("submitting");
       for (let i = 0; i <= dataSource.length - 1; i++) {
         const target = dataSource[i];
         const { onlyId, errorMsg, errorMap, children, ...data } = target;
-        submitProgress.value = Math.floor((i + 1) / total * 100);
+        setSubmitProgress(Math.floor((i + 1) / total * 100));
         if (errorMsg) {
           continue;
         }
@@ -510,6 +519,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               columnNum: __props.columnNum,
               size: __props.size,
               showAddBtn: __props.showAddBtn,
+              onTableDataChange: tableDataChange,
               class: "h-0 flex-1"
             }), createSlots({
               _: 2

package/es/components/hyTableForm/tableForm.vue.mjs

@@ -1,6 +1,4 @@
-import { defineComponent, useTemplateRef, ref, computed, nextTick, openBlock, createElementBlock, createElementVNode, toDisplayString, createCommentVNode, createBlock, unref, withCtx, createTextVNode, Fragment, renderList, normalizeClass, createVNode, mergeProps, createSlots, renderSlot, normalizeProps, guardReactiveProps } from 'vue';
-import { ElIcon } from 'element-plus';
-import { Warning } from '@element-plus/icons-vue';
+import { defineComponent, onMounted, watch, useTemplateRef, ref, computed, nextTick, openBlock, createElementBlock, createElementVNode, toDisplayString, createCommentVNode, createBlock, unref, withCtx, createTextVNode, Fragment, renderList, normalizeClass, createVNode, mergeProps, createSlots, renderSlot, normalizeProps, guardReactiveProps } from 'vue';
 import '../index.mjs';
 import '../../utils/index.mjs';
 import { doValidate } from './js/index.mjs';
@@ -10,6 +8,7 @@ import { isArray, isObject } from '../../utils/is.mjs';
 import { cloneDeep } from '../../utils/handler.mjs';
 import { HyButton } from '../hyButton/index.mjs';
 import { HyTable } from '../hyTable/index.mjs';
+import { HyIcon } from '../hyIcon/index.mjs';
 import { HyForm } from '../hyForm/index.mjs';
 
 import "./style/tableForm.scss";
@@ -68,10 +67,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       default: true
     }
   },
-  emits: ["validate"],
+  emits: ["validate", "tableDataChange"],
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
+    onMounted(() => {
+      watch(
+        () => dataSource.value,
+        () => {
+          emits("tableDataChange", dataSource.value);
+        },
+        { deep: true, immediate: true }
+      );
+    });
     const tableRef = useTemplateRef("tableRef");
     const formRef = useTemplateRef("formRef");
     const dataSource = ref([]);
@@ -165,10 +173,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       await initValidateHandler([data]);
       if (!dataSource.value.length) {
         dataSource.value = [data];
-        setData(dataSource.value);
       } else {
         dataSource.value.push(data);
       }
+      setData(dataSource.value);
       emits("validate", {
         ...statistics.value
       });
@@ -435,12 +443,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         class: normalizeClass(["flex items-center gap-1.5 text-danger-2 transition-all duration-300 overflow-hidden", [row.errorMsg ? "h-full" : "h-0"]])
                       },
                       [
-                        row.errorMsg ? (openBlock(), createBlock(unref(ElIcon), { key: 0 }, {
-                          default: withCtx(() => [
-                            createVNode(unref(Warning))
-                          ]),
-                          _: 1
-                          /* STABLE */
+                        row.errorMsg ? (openBlock(), createBlock(unref(HyIcon), {
+                          key: 0,
+                          "svg-name": "dispatch-share1-prompt",
+                          class: "!w-3 !h-3"
                         })) : createCommentVNode("v-if", true),
                         createElementVNode(
                           "span",

package/es/components/hyTour/index.mjs

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

package/es/components/hyTour/tour.vue.mjs

@@ -0,0 +1,23 @@
+import { defineComponent, openBlock, createElementBlock, createCommentVNode } from 'vue';
+
+import "./style/tour.scss";
+
+const __default__ = defineComponent({
+  name: "HyTour"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
+  props: {},
+  emits: [],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
+    __expose({});
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", null, [
+        createCommentVNode(" HyTour \u5185\u5BB9 ")
+      ]);
+    };
+  }
+});
+
+export { _sfc_main as default };

package/es/components/hyTree/config/tree-config.mjs

@@ -9,13 +9,16 @@ const treeTypeConfig = {
   // 群组设备树形
   group: "group",
   // 群组树形
-  planGroupDevicee: "planGroupDevicee",
+  planGroupDevice: "planGroupDevice",
   // 预案分组树形
   cs: "cs",
   // 采集站树形
   teamUser: "teamUser",
   // 队伍树形
-  userMail: "userMail"
+  userMail: "userMail",
+  // 用户通讯录树形
+  mapRail: "mapRail"
+  // 电子围栏树形
 };
 const searchTypeConfig = {
   fullSearch: 1,