hy-dispatch-ui-v3 0.2.65 → 0.2.66

package/lib/components/hyTable/cpns/virtualTable.vue.js

@@ -8,12 +8,12 @@ var iconsVue = require('@element-plus/icons-vue');
 require('../../index.js');
 require('../../../hooks/index.js');
 require('../../../utils/index.js');
-var index = require('../js/index.js');
+var index$1 = require('../js/index.js');
 var headerItem = require('./headerItem.vue.js');
 var useLocale = require('../../../hooks/useLocale.js');
 var is = require('../../../utils/is.js');
-var index$1 = require('../../hyTooltip/index.js');
-var index$2 = require('../../hyIcon/index.js');
+var index = require('../../hyIcon/index.js');
+var index$2 = require('../../hyTooltip/index.js');
 
 const _sfc_main = {
   __name: "virtualTable",
@@ -325,11 +325,11 @@ const _sfc_main = {
                   ],
                   64
                   /* STABLE_FRAGMENT */
-                )) : !vue.unref(is.isEmpty)(vue.unref(index.renderHeaderHandler)(column, { column, $index })) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+                )) : !vue.unref(is.isEmpty)(vue.unref(index$1.renderHeaderHandler)(column, { column, $index })) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyTooltip), {
                   key: 1,
                   "is-always": false,
                   "over-line": 1,
-                  content: vue.unref(index.renderHeaderHandler)(column, { column, $index })
+                  content: vue.unref(index$1.renderHeaderHandler)(column, { column, $index })
                 }, null, 8, ["content"])) : vue.createCommentVNode("v-if", true)
               ])
             ]),
@@ -376,16 +376,11 @@ const _sfc_main = {
                               rowKey: getRowKey(row)
                             }), ["stop"])
                           }, [
-                            vue.createVNode(vue.unref(elementPlus.ElIcon), {
-                              class: "text-main",
+                            vue.createVNode(vue.unref(index.HyIcon), {
+                              "svg-name": "dispatch-linear-arrow-down-bold",
+                              "class-name": "!w-3 !h-3 text-main",
                               style: vue.normalizeStyle({ "margin-inline-start": `${depth * 12}px` })
-                            }, {
-                              default: vue.withCtx(() => [
-                                vue.createVNode(vue.unref(iconsVue.ArrowRight))
-                              ]),
-                              _: 1
-                              /* STABLE */
-                            }, 8, ["style"])
+                            }, null, 8, ["style"])
                           ], 10, ["onClick"])) : (vue.openBlock(), vue.createElementBlock(
                             "div",
                             {
@@ -430,12 +425,12 @@ const _sfc_main = {
                         (vue.openBlock(true), vue.createElementBlock(
                           vue.Fragment,
                           null,
-                          vue.renderList(vue.unref(index.operatorFilterHandler)(
+                          vue.renderList(vue.unref(index$1.operatorFilterHandler)(
                             column,
                             { column, row, $index, cellIndex },
                             "default"
                           ), (citem, cindex) => {
-                            return vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+                            return vue.openBlock(), vue.createBlock(vue.unref(index$2.HyTooltip), {
                               key: cindex,
                               "is-always": "",
                               overLine: 1,
@@ -445,21 +440,21 @@ const _sfc_main = {
                                 vue.createElementVNode("div", {
                                   class: vue.normalizeClass(["w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-xs hover:font-bold border border-transparent rounded box-border", [
                                     citem.className,
-                                    vue.unref(index.operatorDisabledHandler)(citem, {
+                                    vue.unref(index$1.operatorDisabledHandler)(citem, {
                                       column,
                                       row,
                                       $index,
                                       cellIndex
                                     }) ? "cursor-not-allowed text-[var(--hy-el-text-color-disabled)] hover:border-[rgba(var(--hy-auxiliary),1)] hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-auxiliary),0.5)]" : "cursor-pointer hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)]"
                                   ]]),
-                                  onClick: ($event) => vue.unref(index.operatorClickHandler)(
+                                  onClick: ($event) => vue.unref(index$1.operatorClickHandler)(
                                     cindex,
                                     column,
                                     { column, row, $index, cellIndex },
                                     "default"
                                   )
                                 }, [
-                                  vue.createVNode(vue.unref(index$2.HyIcon), {
+                                  vue.createVNode(vue.unref(index.HyIcon), {
                                     "svg-name": citem.svgName,
                                     "class-name": "!w-4 !h-4"
                                   }, null, 8, ["svg-name"]),
@@ -485,7 +480,7 @@ const _sfc_main = {
                           128
                           /* KEYED_FRAGMENT */
                         )),
-                        vue.unref(index.operatorFilterHandler)(
+                        vue.unref(index$1.operatorFilterHandler)(
                           column,
                           { column, row, $index, cellIndex },
                           "more"
@@ -496,7 +491,7 @@ const _sfc_main = {
                           trigger: "click",
                           "popper-style": "min-width: 150px",
                           placement: "bottom",
-                          onCommand: ($event) => vue.unref(index.operatorClickHandler)(
+                          onCommand: ($event) => vue.unref(index$1.operatorClickHandler)(
                             $event,
                             column,
                             { column, row, $index, cellIndex },
@@ -506,13 +501,13 @@ const _sfc_main = {
                           dropdown: vue.withCtx(() => [
                             vue.createVNode(
                               vue.unref(elementPlus.ElDropdownMenu),
-                              null,
+                              { class: "hy-table-dropdown-menu" },
                               {
                                 default: vue.withCtx(() => [
                                   (vue.openBlock(true), vue.createElementBlock(
                                     vue.Fragment,
                                     null,
-                                    vue.renderList(vue.unref(index.operatorFilterHandler)(
+                                    vue.renderList(vue.unref(index$1.operatorFilterHandler)(
                                       column,
                                       { column, row, $index, cellIndex },
                                       "more"
@@ -520,7 +515,7 @@ const _sfc_main = {
                                       return vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElDropdownItem), {
                                         key: cindex,
                                         command: cindex,
-                                        disabled: vue.unref(index.operatorDisabledHandler)(citem, {
+                                        disabled: vue.unref(index$1.operatorDisabledHandler)(citem, {
                                           column,
                                           row,
                                           $index,
@@ -536,7 +531,7 @@ const _sfc_main = {
                                               1
                                               /* TEXT */
                                             ),
-                                            vue.unref(index.operatorDisabledHandler)(citem, {
+                                            vue.unref(index$1.operatorDisabledHandler)(citem, {
                                               column,
                                               row,
                                               $index,
@@ -547,7 +542,7 @@ const _sfc_main = {
                                                 key: 0,
                                                 class: "text-xs leading-1"
                                               },
-                                              "\uFF08" + vue.toDisplayString(vue.unref(index.operatorDisableTextdHandler)(citem, {
+                                              "\uFF08" + vue.toDisplayString(vue.unref(index$1.operatorDisableTextdHandler)(citem, {
                                                 column,
                                                 row,
                                                 $index,
@@ -575,7 +570,7 @@ const _sfc_main = {
                           ]),
                           default: vue.withCtx(() => [
                             vue.createElementVNode("span", null, [
-                              vue.createVNode(vue.unref(index$1.HyTooltip), {
+                              vue.createVNode(vue.unref(index$2.HyTooltip), {
                                 "is-always": "",
                                 overLine: 1,
                                 content: vue.unref(t)("table.moreOperations")
@@ -616,21 +611,21 @@ const _sfc_main = {
                         { key: 5 },
                         [
                           !vue.unref(is.isEmpty)(
-                            vue.unref(index.renderContentHandler)(column, {
+                            vue.unref(index$1.renderContentHandler)(column, {
                               column,
                               row,
                               $index,
                               cellIndex
                             })
-                          ) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyTooltip), {
+                          ) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.HyTooltip), {
                             key: 0,
                             "is-always": false,
                             "over-line": 2,
-                            content: vue.unref(index.renderContentHandler)(column, { column, row, $index, cellIndex })
-                          }, null, 8, ["content"])) : (vue.openBlock(), vue.createElementBlock("span", {
+                            content: vue.unref(index$1.renderContentHandler)(column, { column, row, $index, cellIndex })
+                          }, null, 8, ["content"])) : column.type !== "expand" ? (vue.openBlock(), vue.createElementBlock("span", {
                             key: 1,
                             class: "text-auxiliary"
-                          }, "- -"))
+                          }, "- -")) : vue.createCommentVNode("v-if", true)
                         ],
                         64
                         /* STABLE_FRAGMENT */

package/lib/components/hyTable/js/index.js

@@ -351,6 +351,7 @@ const useAppTableWrapper = (hy) => {
   }
   function clearSelection() {
     tableRef.value?.clearSelection();
+    selectedList.value = [];
   }
   function getSelectedList() {
     return selectedList.value;
@@ -374,12 +375,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 || [];
@@ -406,13 +410,6 @@ const useAppTableWrapper = (hy) => {
     }
     return className.filter(Boolean).join(" ");
   }
-  const isSearchFocus = vue.ref(false);
-  function onSearchInputHandler() {
-    isSearchFocus.value = true;
-  }
-  function onSearchBlurHandler() {
-    isSearchFocus.value = false;
-  }
   vue.watchEffect(() => {
     const { columnsList, columnsEditablele, searchText } = tableColumnHandler(
       props.tableColumns,
@@ -446,10 +443,6 @@ const useAppTableWrapper = (hy) => {
     onTableRowContextmenuHandler,
     onTableRowClickHandler,
     onTableColumnsSelectHandler,
-    // 搜索选中
-    isSearchFocus,
-    onSearchInputHandler,
-    onSearchBlurHandler,
     showAppTableLoading,
     closeAppTableLoading
   };

package/lib/components/hyTable/js/search.js

@@ -53,6 +53,7 @@ function useAppTableSearch(hy) {
         tableDataSource.value = data;
       }
       totalElements.value = res.data.totalElements;
+      hy.expandRowKeys.value = [];
       emits("reqSuccess", tableDataSource.value);
     }
   }
@@ -66,7 +67,7 @@ function useAppTableSearch(hy) {
   async function resetFn() {
     await resetFields();
     props.filterModel.query = null;
-    getData(1);
+    await getData(1);
   }
   function getParametersFn() {
     return Object.assign(
@@ -86,6 +87,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/lib/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/lib/components/hyTable/table.vue.js

@@ -239,9 +239,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       onTableRowContextmenuHandler,
       onTableRowExpandChangeHandler,
       onTableSelectHandler,
-      isSearchFocus,
-      onSearchInputHandler,
-      onSearchBlurHandler,
       // useAppTableSearch
       // 表单查询
       totalElements,
@@ -415,8 +412,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   "font-size": `${vue.unref(adaptive.parseRem)(__props.fontSize)}rem`
                 },
                 "expand-row-keys": vue.unref(expandRowKeys),
-                onSelect: vue.unref(onTableSelectHandler),
-                onSelectAll: vue.unref(onTableSelectHandler),
+                onSelect: (list, row) => vue.unref(onTableSelectHandler)(list, row),
+                onSelectAll: (list) => vue.unref(onTableSelectHandler)(list, null, true),
                 onRowClick: vue.unref(onTableRowClickHandler),
                 onRowContextmenu: vue.unref(onTableRowContextmenuHandler),
                 onExpandChange: vue.unref(onTableRowExpandChangeHandler)
@@ -449,7 +446,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               key: 0,
                               ref_for: true
                             }, column, { "render-header": null }),
-                            {
+                            vue.createSlots({
                               header: vue.withCtx((scope) => [
                                 vue.createVNode(headerItem.default, {
                                   type: "default",
@@ -539,7 +536,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                     dropdown: vue.withCtx(() => [
                                       vue.createVNode(
                                         vue.unref(elementPlus.ElDropdownMenu),
-                                        null,
+                                        { class: "hy-table-dropdown-menu" },
                                         {
                                           default: vue.withCtx(() => [
                                             (vue.openBlock(true), vue.createElementBlock(
@@ -652,7 +649,22 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                               ]),
                               _: 2
                               /* DYNAMIC */
-                            },
+                            }, [
+                              column.type === "expand" ? {
+                                name: "expand",
+                                fn: vue.withCtx(({ expandable, expanded }) => [
+                                  expandable ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.HyIcon), {
+                                    key: 0,
+                                    "svg-name": "dispatch-linear-arrow-down-bold",
+                                    "class-name": "!w-3 !h-3 text-main transition",
+                                    style: vue.normalizeStyle({
+                                      transform: expanded ? "rotate(0deg)" : "rotate(-90deg)"
+                                    })
+                                  }, null, 8, ["style"])) : vue.createCommentVNode("v-if", true)
+                                ]),
+                                key: "0"
+                              } : void 0
+                            ]),
                             1040
                             /* FULL_PROPS, DYNAMIC_SLOTS */
                           )) : vue.createCommentVNode("v-if", true)

package/lib/components/hyTableActionButton/tableActionButton.vue.js

@@ -24,7 +24,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,
@@ -54,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     buttonClass: {
       type: String,
       default: () => {
-        return "button_addTo";
+        return "";
       }
     },
     // 操作数据
@@ -197,7 +197,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,
@@ -287,12 +288,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                 placement: "top"
                               }, {
                                 default: vue.withCtx(() => [
-                                  vue.createVNode(vue.unref(elementPlus.ElIcon), { class: "flex-shrink-0 ml-2 text-auxiliary" }, {
-                                    default: vue.withCtx(() => [
-                                      vue.createVNode(vue.unref(iconsVue.Warning))
-                                    ]),
-                                    _: 1
-                                    /* STABLE */
+                                  vue.createVNode(vue.unref(index$2.HyIcon), {
+                                    "svg-name": "dispatch-share1-prompt",
+                                    class: "!w-3 !h-3 ml-2 text-auxiliary"
                                   })
                                 ]),
                                 _: 1

package/lib/components/hyTableForm/batchTableForm.vue.js

@@ -92,7 +92,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;
@@ -127,6 +129,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const submitting = vue.ref(false);
     const submitProgress = vue.ref(0);
     const submitModel = vue.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);
@@ -244,13 +253,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;
         }
@@ -514,6 +523,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               columnNum: __props.columnNum,
               size: __props.size,
               showAddBtn: __props.showAddBtn,
+              onTableDataChange: tableDataChange,
               class: "h-0 flex-1"
             }), vue.createSlots({
               _: 2

package/lib/components/hyTableForm/tableForm.vue.js

@@ -3,8 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
-var elementPlus = require('element-plus');
-var iconsVue = require('@element-plus/icons-vue');
 require('../index.js');
 require('../../utils/index.js');
 var index = require('./js/index.js');
@@ -14,7 +12,8 @@ var is = require('../../utils/is.js');
 var handler = require('../../utils/handler.js');
 var index$1 = require('../hyButton/index.js');
 var index$2 = require('../hyTable/index.js');
-var index$3 = require('../hyForm/index.js');
+var index$3 = require('../hyIcon/index.js');
+var index$4 = require('../hyForm/index.js');
 
 import "./style/tableForm.scss";
 
@@ -72,10 +71,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;
+    vue.onMounted(() => {
+      vue.watch(
+        () => dataSource.value,
+        () => {
+          emits("tableDataChange", dataSource.value);
+        },
+        { deep: true, immediate: true }
+      );
+    });
     const tableRef = vue.useTemplateRef("tableRef");
     const formRef = vue.useTemplateRef("formRef");
     const dataSource = vue.ref([]);
@@ -169,10 +177,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
       });
@@ -439,12 +447,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         class: vue.normalizeClass(["flex items-center gap-1.5 text-danger-2 transition-all duration-300 overflow-hidden", [row.errorMsg ? "h-full" : "h-0"]])
                       },
                       [
-                        row.errorMsg ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElIcon), { key: 0 }, {
-                          default: vue.withCtx(() => [
-                            vue.createVNode(vue.unref(iconsVue.Warning))
-                          ]),
-                          _: 1
-                          /* STABLE */
+                        row.errorMsg ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.HyIcon), {
+                          key: 0,
+                          "svg-name": "dispatch-share1-prompt",
+                          class: "!w-3 !h-3"
                         })) : vue.createCommentVNode("v-if", true),
                         vue.createElementVNode(
                           "span",
@@ -458,7 +464,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                       /* CLASS */
                     )
                   ]),
-                  vue.createVNode(vue.unref(index$3.HyForm), {
+                  vue.createVNode(vue.unref(index$4.HyForm), {
                     ref_key: "formRef",
                     ref: formRef,
                     model: row,

package/lib/components/hyTour/index.js

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

package/lib/components/hyTour/tour.vue.js

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+
+import "./style/tour.scss";
+
+const __default__ = vue.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 vue.openBlock(), vue.createElementBlock("div", null, [
+        vue.createCommentVNode(" HyTour \u5185\u5BB9 ")
+      ]);
+    };
+  }
+});
+
+exports.default = _sfc_main;

package/lib/components/hyTree/config/tree-config.js

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