hy-dispatch-ui-v3 0.2.70 → 0.2.72

package/dist/tailwind.css

@@ -221,10 +221,6 @@
   left: 50%;
 }
 
-.left-4 {
-  left: 1rem;
-}
-
 .left-full {
   left: 100%;
 }
@@ -316,6 +312,11 @@
   margin-right: 0.5rem;
 }
 
+.mx-3 {
+  margin-left: 0.75rem;
+  margin-right: 0.75rem;
+}
+
 .my-0 {
   margin-top: 0px;
   margin-bottom: 0px;
@@ -1147,6 +1148,10 @@
        column-gap: 1.5rem;
 }
 
+.gap-y-3 {
+  row-gap: 0.75rem;
+}
+
 .overflow-auto {
   overflow: auto;
 }
@@ -1281,6 +1286,11 @@
   border-color: rgb(var(--hy-border), 0.5);
 }
 
+.border-danger-2 {
+  --tw-border-opacity: 1;
+  border-color: rgb(var(--hy-danger-2), var(--tw-border-opacity, 1));
+}
+
 .border-theme {
   --tw-border-opacity: 1;
   border-color: rgb(var(--hy-theme), var(--tw-border-opacity, 1));
@@ -1649,6 +1659,10 @@
   padding-top: 0.75rem;
 }
 
+.pt-5 {
+  padding-top: 1.25rem;
+}
+
 .pt-6 {
   padding-top: 1.5rem;
 }
@@ -1959,3 +1973,7 @@ menu {
 .hover\:outline-theme:hover {
   outline-color: rgb(var(--hy-theme), 1);
 }
+
+.active\:opacity-50:active {
+  opacity: 0.5;
+}

package/es/bussiness/hyElectronicFence/cpns/addElectronicFenceDialog/addElectronicFenceDialog.vue.mjs

@@ -1,4 +1,4 @@
-import { useTemplateRef, ref, computed, nextTick, shallowRef, openBlock, createBlock, unref, isRef, withCtx, createElementVNode, createVNode, mergeProps, createTextVNode, createElementBlock, createCommentVNode } from 'vue';
+import { defineComponent, useTemplateRef, ref, computed, nextTick, shallowRef, openBlock, createBlock, unref, isRef, withCtx, createElementVNode, createVNode, mergeProps, createTextVNode, createElementBlock, createCommentVNode } from 'vue';
 import { ElMessage, ElCheckbox } from 'element-plus';
 import { selectApi, saveApi } from '../../../../api/index.mjs';
 import { findAllMapRailLocationApi } from '../../../../api/mapRail.mjs';
@@ -20,8 +20,10 @@ import { HyMap } from '../../../../components/hyMap/index.mjs';
 import { HyIcon } from '../../../../components/hyIcon/index.mjs';
 import { HyButton } from '../../../../components/hyButton/index.mjs';
 
-const _sfc_main = {
-  __name: "addElectronicFenceDialog",
+const __default__ = defineComponent({
+  name: "HyAddElectronicFenceDialog"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     ifDraggable: {
       type: Boolean,
@@ -506,6 +508,6 @@ const _sfc_main = {
       }, 8, ["modelValue", "onUpdate:modelValue", "loading", "onUpdate:loading", "title", "if-draggable", "if-shrink", "on-close", "on-cancel", "on-submit", "onOnMinimized", "onOnDialogMousedown"]);
     };
   }
-};
+});
 
 export { _sfc_main as default };

package/es/bussiness/hyElectronicFence/cpns/batchSetElectronicFenceUserDialog/batchSetElectronicFenceUserDialog.vue.mjs

@@ -1,4 +1,4 @@
-import { useTemplateRef, ref, openBlock, createBlock, unref, withCtx, createCommentVNode, createElementVNode } from 'vue';
+import { defineComponent, useTemplateRef, ref, openBlock, createBlock, unref, withCtx, createCommentVNode, createElementVNode } from 'vue';
 import { batchMapRailUserSaveApi } from '../../../../api/mapRail.mjs';
 import '../../../../hooks/index.mjs';
 import '../../../../components/index.mjs';
@@ -9,8 +9,10 @@ import { useMixins } from '../../../../hooks/useMixins.mjs';
 import { useDialog, useDialogIsEdit, useBatchDialog } from '../../../../hooks/useDialog.mjs';
 import { HyBatchUploadDialog } from '../../../../components/hyBatchUploadDialog/index.mjs';
 
-const _sfc_main = {
-  __name: "batchSetElectronicFenceUserDialog",
+const __default__ = defineComponent({
+  name: "HyBatchSetElectronicFenceUserDialog"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     ifDraggable: {
       type: Boolean,
@@ -127,6 +129,8 @@ const _sfc_main = {
       minimizedShow,
       onClose,
       onMinimized,
+      onSubmitProgress,
+      onTableDataChange,
       HyBatchUploadDialogRef,
       tableColumns,
       formColumns,
@@ -159,8 +163,8 @@ const _sfc_main = {
         "on-cancel": unref(onClose),
         "on-close": unref(onClose),
         onSubmit: unref(onSubmit),
-        onSubmitProgress: _ctx.onSubmitProgress,
-        onTableDataChange: _ctx.onTableDataChange,
+        onSubmitProgress: unref(onSubmitProgress),
+        onTableDataChange: unref(onTableDataChange),
         onOnMinimized: unref(onMinimized),
         onOnDialogMousedown: ($event) => unref(setDragLevelIndex)("HyBatchUploadDialogRef")
       }, {
@@ -173,6 +177,6 @@ const _sfc_main = {
       }, 8, ["title", "table-columns", "form-columns", "rules", "submit-handler", "if-draggable", "if-shrink", "on-cancel", "on-close", "onSubmit", "onSubmitProgress", "onTableDataChange", "onOnMinimized", "onOnDialogMousedown"]);
     };
   }
-};
+});
 
 export { _sfc_main as default };

package/es/bussiness/hyMapAearchPlace/js/index.mjs

@@ -97,7 +97,7 @@ const useMapAearchPlace = (hy) => {
         permission: "commands_dutyStatus"
       }
     ].filter((item) => {
-      if (!item.permission && !isPermission(item.permission)) {
+      if (item.permission && !isPermission(item.permission)) {
         return false;
       }
       return selectIdSet.has(item.value);

package/es/bussiness/hyRuleSetting/cpns/ruleFenceDialog/ruleFenceDialog.vue.mjs

@@ -269,6 +269,27 @@ const _sfc_main = {
         hy.loading.value = false;
         hy.watchResume();
       }
+      function getCacheData() {
+        return {
+          formModel: hy.formModel.value
+        };
+      }
+      async function restoreCache(data = {}) {
+        hy.formModel.value = {
+          ruleName: null,
+          stopHour: null,
+          gatherLimit: null,
+          ruleDateType: 1,
+          apStartDtm: null,
+          apEndDtm: null,
+          startDtm1: null,
+          endDtm1: null,
+          weekDate: [],
+          mapRailId: null,
+          ...data.formModel || {}
+        };
+        hy.dialogVisible.value = true;
+      }
       async function onSubmit2() {
         await hy.formRef.value.validate();
         const form = { ...hy.formModel.value };
@@ -342,6 +363,8 @@ const _sfc_main = {
         tableColumns: tableColumns2,
         rules: rules2,
         show: show2,
+        getCacheData,
+        restoreCache,
         onSubmit: onSubmit2,
         formRef: formRef2,
         setWeekDate: setWeekDate2,
@@ -353,8 +376,9 @@ const _sfc_main = {
       };
     };
     const {
-      onMinimized,
+      minimizedShow,
       setDragLevelIndex,
+      onMinimized,
       dialogVisible,
       loading,
       title,
@@ -381,6 +405,7 @@ const _sfc_main = {
     );
     __expose({
       show,
+      minimizedShow,
       setDragLevelIndex
     });
     return (_ctx, _cache) => {

package/es/bussiness/hyRuleSetting/cpns/ruleSettingDialog/ruleSettingDialog.vue.mjs

@@ -240,6 +240,26 @@ const _sfc_main = {
         hy.loading.value = false;
         hy.watchResume();
       }
+      function getCacheData() {
+        return {
+          formModel: hy.formModel.value
+        };
+      }
+      async function restoreCache(data = {}) {
+        hy.formModel.value = {
+          ruleName: null,
+          stopHour: null,
+          gatherLimit: null,
+          ruleDateType: 1,
+          apStartDtm: null,
+          apEndDtm: null,
+          startDtm1: null,
+          endDtm1: null,
+          weekDate: [],
+          ...data.formModel || {}
+        };
+        hy.dialogVisible.value = true;
+      }
       async function onSubmit2() {
         await hy.formRef.value.validate();
         const form = { ...hy.formModel.value };
@@ -282,14 +302,17 @@ const _sfc_main = {
         formColumns: formColumns2,
         rules: rules2,
         show: show2,
+        getCacheData,
+        restoreCache,
         onSubmit: onSubmit2,
         formRef: formRef2,
         setWeekDate: setWeekDate2
       };
     };
     const {
-      onMinimized,
+      minimizedShow,
       setDragLevelIndex,
+      onMinimized,
       dialogVisible,
       loading,
       title,
@@ -303,6 +326,7 @@ const _sfc_main = {
     } = useMixins({ emits }, [useDialog, useDialogIsEdit, useRuleSettingDialog]);
     __expose({
       show,
+      minimizedShow,
       setDragLevelIndex
     });
     return (_ctx, _cache) => {

package/es/bussiness/hyRuleSetting/js/ruleSetting.mjs

@@ -1,12 +1,9 @@
 import '../../../hooks/index.mjs';
+import '../../../utils/index.mjs';
 import { $t } from '../../../hooks/useLocale.mjs';
+import { isPermission } from '../../../utils/is.mjs';
 
 function getTabsList() {
-  let permissionIdList = window.sessionStorage.getItem("permissionIdList");
-  permissionIdList = JSON.parse(permissionIdList || "[]").reduce((obj, val) => {
-    obj[val] = true;
-    return obj;
-  }, {});
   return [
     {
       name: $t("ruleSetting.noEntry"),
@@ -36,10 +33,12 @@ function getTabsList() {
       name: $t("ruleSetting.gather"),
       permission: "operator_ruleSetting_gatheringPeople"
     }
-  ];
+  ].filter((item) => {
+    return !item.permission || isPermission(item.permission);
+  });
 }
 function weekDateFn(weekDate) {
-  weekDate = weekDate.split(",");
+  weekDate = (weekDate || "").split(",").filter(Boolean);
   const data = [];
   weekDate.forEach((v) => {
     v -= 0;

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

@@ -47,7 +47,7 @@ const _sfc_main = {
       }, 0);
     });
     function isShowColumn(column) {
-      return tableColumnShowHandler(column) && column.editable.edit;
+      return tableColumnShowHandler(column) && column.editable.show;
     }
     function showPopover() {
       initColumnsInfo(props.columns, props.columnsEditable);

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

@@ -335,6 +335,10 @@ const useAppTableWrapper = (hy) => {
     tableRef.value?.clearSelection();
     selectedList.value = [];
   }
+  function cancalAllSelection() {
+    clearSelection();
+    emits("on-select-checkbox", [], null);
+  }
   function getSelectedList() {
     return selectedList.value;
   }
@@ -445,7 +449,8 @@ const useAppTableWrapper = (hy) => {
     closeAppTableLoading,
     scrollToTop,
     scrollToLeft,
-    onScrollHandler
+    onScrollHandler,
+    cancalAllSelection
   };
 };
 

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

@@ -39,7 +39,7 @@ function getColumnDefaultWidth(column) {
   if (column.type === "index") return 80;
   if (column.type === "operator") {
     const length = (column.operator || []).reduce((total, item) => {
-      if (!item.permission && isPermission(item.permission)) {
+      if (!item.permission || isPermission(item.permission)) {
         total++;
       }
       return total;
@@ -68,7 +68,7 @@ function getColumnEditable(column, index) {
     return {
       index,
       lock: false,
-      edit: !type || type === "default",
+      show: !type || type === "default",
       checked: !!editable,
       desc: void 0,
       examples: []
@@ -76,7 +76,7 @@ function getColumnEditable(column, index) {
   }
   return {
     lock: false,
-    edit: !type || type === "default",
+    show: !type || type === "default",
     checked: !type || type !== "default" || type === "operator",
     desc: void 0,
     examples: [],

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, normalizeStyle, 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, createTextVNode, 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';
@@ -259,7 +259,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getOptions,
       getOptionsFields,
       getOptionsError,
-      getOptionsByField
+      getOptionsByField,
+      cancalAllSelection
     } = useMixins(
       {
         props,
@@ -757,17 +758,39 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             createCommentVNode(" \u5206\u9875 "),
             __props.showPagination ? (openBlock(), createElementBlock("div", {
               key: 0,
-              class: "flex items-center justify-center min-h-6 relative pt-3 pb-5"
+              class: "flex flex-wrap gap-y-3 items-center justify-between min-h-6 relative pt-5 pb-5"
             }, [
-              createElementVNode(
-                "div",
-                { class: "absolute left-4 top-1/2 transform -translate-y-1/2 text-sm" },
-                toDisplayString(unref($t)("table.aTotalOfPiecesOfData", [unref(totalElements)])),
-                1
-                /* TEXT */
-              ),
+              createElementVNode("div", { class: "text-sm ml-4" }, [
+                createElementVNode(
+                  "span",
+                  null,
+                  toDisplayString(unref($t)("table.aTotalOfPiecesOfData", [unref(totalElements)])),
+                  1
+                  /* TEXT */
+                ),
+                unref(selectedList) && unref(selectedList).length ? (openBlock(), createElementBlock("span", {
+                  key: 0,
+                  class: "ml-3"
+                }, [
+                  createTextVNode(" \u5DF2\u9009\u4E2D"),
+                  createElementVNode(
+                    "span",
+                    { class: "text-theme" },
+                    toDisplayString(unref(selectedList).length),
+                    1
+                    /* TEXT */
+                  ),
+                  createTextVNode("\u6761\u6570\u636E ")
+                ])) : createCommentVNode("v-if", true),
+                unref(selectedList) && unref(selectedList).length ? (openBlock(), createElementBlock("span", {
+                  key: 1,
+                  onClick: unref(cancalAllSelection),
+                  class: "text-danger-2 ml-3 border-b border-danger-2 cursor-pointer active:opacity-50"
+                }, "\u53D6\u6D88\u5168\u9009", 8, ["onClick"])) : createCommentVNode("v-if", true)
+              ]),
               unref(totalElements) >= 10 ? (openBlock(), createBlock(unref(ElPagination), {
                 key: 0,
+                class: "ml-3",
                 "current-page": __props.filterModel.page,
                 "onUpdate:currentPage": ($event) => __props.filterModel.page = $event,
                 "page-size": __props.filterModel.size,
@@ -781,12 +804,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 onSizeChange: unref(onSizeChangeHandler),
                 onCurrentChange: unref(onCurrentChangeHandler)
               }, null, 8, ["current-page", "onUpdate:currentPage", "page-size", "onUpdate:pageSize", "total", "pager-count", "layout", "onSizeChange", "onCurrentChange"])) : createCommentVNode("v-if", true),
-              unref(selectedList) && unref(selectedList).length > 0 ? (openBlock(), createElementBlock("div", {
-                key: 1,
-                class: "absolute right-4 top-1/2 transform -translate-y-1/2"
-              }, [
-                renderSlot(_ctx.$slots, "multiple-operator-slot")
-              ])) : createCommentVNode("v-if", true)
+              createElementVNode("div", { class: "mx-3" }, [
+                unref(selectedList) && unref(selectedList).length > 0 ? (openBlock(), createElementBlock("div", {
+                  key: 0,
+                  class: ""
+                }, [
+                  renderSlot(_ctx.$slots, "multiple-operator-slot")
+                ])) : createCommentVNode("v-if", true)
+              ])
             ])) : createCommentVNode("v-if", true)
           ]),
           createCommentVNode(" \u8868\u683C\u884C\u53F3\u952E\u5C55\u793A\u64CD\u4F5C\u5217\u8868 "),

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

@@ -263,6 +263,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           errorMsg = data.errorMsg;
         }
         if (errorMsg && errorMsg.message) {
+          target.errorMsg = errorMsg;
           continue;
         }
         try {
@@ -275,7 +276,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               prop: null,
               message: res2.msg
             };
-            if (submitModel.value === "force") {
+            if (submitModel.value === "strict") {
               break;
             }
           }
@@ -285,7 +286,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             message: err?.msg ? err.msg : err
           };
           console.error(err);
-          if (submitModel.value === "force") {
+          if (submitModel.value === "strict") {
             break;
           }
         }

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

@@ -218,8 +218,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 if (data && !data.errorMsg) {
                   data.errorMsg = errData;
                 } else if (data && !data.errorMsg.prop && !data.errorMsg.message) {
-                  data.errorMsg.prop = errData.errorMsg.prop;
-                  data.errorMsg.message = errData.errorMsg.message;
+                  data.errorMsg.prop = errData.prop;
+                  data.errorMsg.message = errData.message;
                 }
                 errorMap.set(errData.prop, errData.message);
               });
@@ -305,7 +305,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       setData(data) {
         dataSource.value = cloneDeep(data, true);
         dataSource.value.forEach((item) => {
-          item.onlyId = /* @__PURE__ */ Symbol("onlyId");
+          item.onlyId = item.onlyId || /* @__PURE__ */ Symbol("onlyId");
         });
         initValidateHandler(dataSource.value);
         setData(dataSource.value);
@@ -334,7 +334,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       },
       getTableDataSource() {
         return dataSource.value.reduce((list, item) => {
-          const { onlyId, errorMsg, errorMap, children, ...data } = item;
+          const { errorMsg, errorMap, children, ...data } = item;
           list.push(data);
           return list;
         }, []);

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

@@ -350,7 +350,11 @@ const useAppTreeWrapper = (hy) => {
   function setDisAbleSelectionMap() {
     const map = /* @__PURE__ */ new Map();
     props.disableSelection.forEach((v) => {
-      map.set(v.id, true);
+      if (props.treeType === "device" || props.treeType === "channel") {
+        map.set(v.channelId || v.deviceId, true);
+      } else if (props.treeType) {
+        map.set(v.id, true);
+      }
     });
     hy.disableSelectionMap.value = map;
   }

package/es/hooks/useBaseMainStore.mjs

@@ -17,7 +17,7 @@ const useBaseMainStore = () => {
   if (getCurrentInstance()) {
     const baseMainStore = inject(localBaseMainStoreKey, ref());
     return {
-      baseMainStore: unref(baseMainStore) ? unref(baseMainStore) : (unref(useGlobalConfig()).baseMainStore || defaultBaseMainStore)()
+      baseMainStore: unref(baseMainStore) ? unref(baseMainStore)() : (unref(useGlobalConfig()).baseMainStore || defaultBaseMainStore)()
     };
   } else {
     return {

package/es/hooks/useDialog.mjs

@@ -1,6 +1,5 @@
 import { getCurrentInstance, ref, onMounted, watch } from 'vue';
 import '../components/index.mjs';
-import { useLocale } from './useLocale.mjs';
 import './index.mjs';
 import { useBaseMainStore } from './useBaseMainStore.mjs';
 import { useCurrentBus } from './useCurrentBus.mjs';
@@ -58,6 +57,7 @@ function useDialog(hy) {
       hy.setIsEdit(false);
       await hy.restoreCache(value);
       hy.setIsEdit(value.isEdit);
+      hy.setDragLevelIndex("HyDialogRef");
     } else {
       hy.setDragLevelIndex("HyDialogRef");
     }
@@ -77,7 +77,6 @@ function useDialog(hy) {
     return Promise.resolve();
   }
   function confirmReplace(type) {
-    const { t } = useLocale();
     return new Promise((resolve, reject) => {
       if (type === "close") {
         HyConfirmDialog.confirm({
@@ -172,6 +171,9 @@ function useDialogIsEdit(hy) {
       resolve({});
     });
   }
+  function setWatchResume(newWatchResume) {
+    hy.isWatchForm.value = newWatchResume;
+  }
   function watchResume() {
     hy.isWatchForm.value = true;
   }
@@ -192,6 +194,7 @@ function useDialogIsEdit(hy) {
   return {
     isWatchForm,
     watchPause,
+    setWatchResume,
     watchResume
   };
 }
@@ -203,7 +206,6 @@ function useBatchDialog(hy) {
     hy.tableDataChange.value = data;
   }
   function confirmReplace(type) {
-    const { t } = useLocale();
     return new Promise((resolve, reject) => {
       if (type === "close") {
         HyConfirmDialog.confirm({

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.2.69";
+const version = "0.2.71";
 
 export { version };

package/lib/bussiness/hyElectronicFence/cpns/addElectronicFenceDialog/addElectronicFenceDialog.vue.js

@@ -24,8 +24,10 @@ var index$5 = require('../../../../components/hyMap/index.js');
 var index$6 = require('../../../../components/hyIcon/index.js');
 var index$7 = require('../../../../components/hyButton/index.js');
 
-const _sfc_main = {
-  __name: "addElectronicFenceDialog",
+const __default__ = vue.defineComponent({
+  name: "HyAddElectronicFenceDialog"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     ifDraggable: {
       type: Boolean,
@@ -510,6 +512,6 @@ const _sfc_main = {
       }, 8, ["modelValue", "onUpdate:modelValue", "loading", "onUpdate:loading", "title", "if-draggable", "if-shrink", "on-close", "on-cancel", "on-submit", "onOnMinimized", "onOnDialogMousedown"]);
     };
   }
-};
+});
 
 exports.default = _sfc_main;

package/lib/bussiness/hyElectronicFence/cpns/batchSetElectronicFenceUserDialog/batchSetElectronicFenceUserDialog.vue.js

@@ -13,8 +13,10 @@ var useMixins = require('../../../../hooks/useMixins.js');
 var useDialog = require('../../../../hooks/useDialog.js');
 var index = require('../../../../components/hyBatchUploadDialog/index.js');
 
-const _sfc_main = {
-  __name: "batchSetElectronicFenceUserDialog",
+const __default__ = vue.defineComponent({
+  name: "HyBatchSetElectronicFenceUserDialog"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   props: {
     ifDraggable: {
       type: Boolean,
@@ -131,6 +133,8 @@ const _sfc_main = {
       minimizedShow,
       onClose,
       onMinimized,
+      onSubmitProgress,
+      onTableDataChange,
       HyBatchUploadDialogRef,
       tableColumns,
       formColumns,
@@ -163,8 +167,8 @@ const _sfc_main = {
         "on-cancel": vue.unref(onClose),
         "on-close": vue.unref(onClose),
         onSubmit: vue.unref(onSubmit),
-        onSubmitProgress: _ctx.onSubmitProgress,
-        onTableDataChange: _ctx.onTableDataChange,
+        onSubmitProgress: vue.unref(onSubmitProgress),
+        onTableDataChange: vue.unref(onTableDataChange),
         onOnMinimized: vue.unref(onMinimized),
         onOnDialogMousedown: ($event) => vue.unref(setDragLevelIndex)("HyBatchUploadDialogRef")
       }, {
@@ -177,6 +181,6 @@ const _sfc_main = {
       }, 8, ["title", "table-columns", "form-columns", "rules", "submit-handler", "if-draggable", "if-shrink", "on-cancel", "on-close", "onSubmit", "onSubmitProgress", "onTableDataChange", "onOnMinimized", "onOnDialogMousedown"]);
     };
   }
-};
+});
 
 exports.default = _sfc_main;

package/lib/bussiness/hyMapAearchPlace/js/index.js

@@ -99,7 +99,7 @@ const useMapAearchPlace = (hy) => {
         permission: "commands_dutyStatus"
       }
     ].filter((item) => {
-      if (!item.permission && !is.isPermission(item.permission)) {
+      if (item.permission && !is.isPermission(item.permission)) {
         return false;
       }
       return selectIdSet.has(item.value);

package/lib/bussiness/hyRuleSetting/cpns/ruleFenceDialog/ruleFenceDialog.vue.js

@@ -273,6 +273,27 @@ const _sfc_main = {
         hy.loading.value = false;
         hy.watchResume();
       }
+      function getCacheData() {
+        return {
+          formModel: hy.formModel.value
+        };
+      }
+      async function restoreCache(data = {}) {
+        hy.formModel.value = {
+          ruleName: null,
+          stopHour: null,
+          gatherLimit: null,
+          ruleDateType: 1,
+          apStartDtm: null,
+          apEndDtm: null,
+          startDtm1: null,
+          endDtm1: null,
+          weekDate: [],
+          mapRailId: null,
+          ...data.formModel || {}
+        };
+        hy.dialogVisible.value = true;
+      }
       async function onSubmit2() {
         await hy.formRef.value.validate();
         const form = { ...hy.formModel.value };
@@ -346,6 +367,8 @@ const _sfc_main = {
         tableColumns: tableColumns2,
         rules: rules2,
         show: show2,
+        getCacheData,
+        restoreCache,
         onSubmit: onSubmit2,
         formRef: formRef2,
         setWeekDate: setWeekDate2,
@@ -357,8 +380,9 @@ const _sfc_main = {
       };
     };
     const {
-      onMinimized,
+      minimizedShow,
       setDragLevelIndex,
+      onMinimized,
       dialogVisible,
       loading,
       title,
@@ -385,6 +409,7 @@ const _sfc_main = {
     );
     __expose({
       show,
+      minimizedShow,
       setDragLevelIndex
     });
     return (_ctx, _cache) => {

package/lib/bussiness/hyRuleSetting/cpns/ruleSettingDialog/ruleSettingDialog.vue.js

@@ -244,6 +244,26 @@ const _sfc_main = {
         hy.loading.value = false;
         hy.watchResume();
       }
+      function getCacheData() {
+        return {
+          formModel: hy.formModel.value
+        };
+      }
+      async function restoreCache(data = {}) {
+        hy.formModel.value = {
+          ruleName: null,
+          stopHour: null,
+          gatherLimit: null,
+          ruleDateType: 1,
+          apStartDtm: null,
+          apEndDtm: null,
+          startDtm1: null,
+          endDtm1: null,
+          weekDate: [],
+          ...data.formModel || {}
+        };
+        hy.dialogVisible.value = true;
+      }
       async function onSubmit2() {
         await hy.formRef.value.validate();
         const form = { ...hy.formModel.value };
@@ -286,14 +306,17 @@ const _sfc_main = {
         formColumns: formColumns2,
         rules: rules2,
         show: show2,
+        getCacheData,
+        restoreCache,
         onSubmit: onSubmit2,
         formRef: formRef2,
         setWeekDate: setWeekDate2
       };
     };
     const {
-      onMinimized,
+      minimizedShow,
       setDragLevelIndex,
+      onMinimized,
       dialogVisible,
       loading,
       title,
@@ -307,6 +330,7 @@ const _sfc_main = {
     } = useMixins.useMixins({ emits }, [useDialog.useDialog, useDialog.useDialogIsEdit, useRuleSettingDialog]);
     __expose({
       show,
+      minimizedShow,
       setDragLevelIndex
     });
     return (_ctx, _cache) => {

package/lib/bussiness/hyRuleSetting/js/ruleSetting.js

@@ -1,14 +1,11 @@
 'use strict';
 
 require('../../../hooks/index.js');
+require('../../../utils/index.js');
 var useLocale = require('../../../hooks/useLocale.js');
+var is = require('../../../utils/is.js');
 
 function getTabsList() {
-  let permissionIdList = window.sessionStorage.getItem("permissionIdList");
-  permissionIdList = JSON.parse(permissionIdList || "[]").reduce((obj, val) => {
-    obj[val] = true;
-    return obj;
-  }, {});
   return [
     {
       name: useLocale.$t("ruleSetting.noEntry"),
@@ -38,10 +35,12 @@ function getTabsList() {
       name: useLocale.$t("ruleSetting.gather"),
       permission: "operator_ruleSetting_gatheringPeople"
     }
-  ];
+  ].filter((item) => {
+    return !item.permission || is.isPermission(item.permission);
+  });
 }
 function weekDateFn(weekDate) {
-  weekDate = weekDate.split(",");
+  weekDate = (weekDate || "").split(",").filter(Boolean);
   const data = [];
   weekDate.forEach((v) => {
     v -= 0;

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

@@ -51,7 +51,7 @@ const _sfc_main = {
       }, 0);
     });
     function isShowColumn(column) {
-      return index.tableColumnShowHandler(column) && column.editable.edit;
+      return index.tableColumnShowHandler(column) && column.editable.show;
     }
     function showPopover() {
       initColumnsInfo(props.columns, props.columnsEditable);

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

@@ -337,6 +337,10 @@ const useAppTableWrapper = (hy) => {
     tableRef.value?.clearSelection();
     selectedList.value = [];
   }
+  function cancalAllSelection() {
+    clearSelection();
+    emits("on-select-checkbox", [], null);
+  }
   function getSelectedList() {
     return selectedList.value;
   }
@@ -447,7 +451,8 @@ const useAppTableWrapper = (hy) => {
     closeAppTableLoading,
     scrollToTop,
     scrollToLeft,
-    onScrollHandler
+    onScrollHandler,
+    cancalAllSelection
   };
 };
 

package/lib/components/hyTable/js/useAppTable.js

@@ -41,7 +41,7 @@ function getColumnDefaultWidth(column) {
   if (column.type === "index") return 80;
   if (column.type === "operator") {
     const length = (column.operator || []).reduce((total, item) => {
-      if (!item.permission && is.isPermission(item.permission)) {
+      if (!item.permission || is.isPermission(item.permission)) {
         total++;
       }
       return total;
@@ -70,7 +70,7 @@ function getColumnEditable(column, index) {
     return {
       index,
       lock: false,
-      edit: !type || type === "default",
+      show: !type || type === "default",
       checked: !!editable,
       desc: void 0,
       examples: []
@@ -78,7 +78,7 @@ function getColumnEditable(column, index) {
   }
   return {
     lock: false,
-    edit: !type || type === "default",
+    show: !type || type === "default",
     checked: !type || type !== "default" || type === "operator",
     desc: void 0,
     examples: [],

package/lib/components/hyTable/table.vue.js

@@ -263,7 +263,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getOptions,
       getOptionsFields,
       getOptionsError,
-      getOptionsByField
+      getOptionsByField,
+      cancalAllSelection
     } = useMixins.useMixins(
       {
         props,
@@ -761,17 +762,39 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             vue.createCommentVNode(" \u5206\u9875 "),
             __props.showPagination ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 0,
-              class: "flex items-center justify-center min-h-6 relative pt-3 pb-5"
+              class: "flex flex-wrap gap-y-3 items-center justify-between min-h-6 relative pt-5 pb-5"
             }, [
-              vue.createElementVNode(
-                "div",
-                { class: "absolute left-4 top-1/2 transform -translate-y-1/2 text-sm" },
-                vue.toDisplayString(vue.unref(useLocale.$t)("table.aTotalOfPiecesOfData", [vue.unref(totalElements)])),
-                1
-                /* TEXT */
-              ),
+              vue.createElementVNode("div", { class: "text-sm ml-4" }, [
+                vue.createElementVNode(
+                  "span",
+                  null,
+                  vue.toDisplayString(vue.unref(useLocale.$t)("table.aTotalOfPiecesOfData", [vue.unref(totalElements)])),
+                  1
+                  /* TEXT */
+                ),
+                vue.unref(selectedList) && vue.unref(selectedList).length ? (vue.openBlock(), vue.createElementBlock("span", {
+                  key: 0,
+                  class: "ml-3"
+                }, [
+                  vue.createTextVNode(" \u5DF2\u9009\u4E2D"),
+                  vue.createElementVNode(
+                    "span",
+                    { class: "text-theme" },
+                    vue.toDisplayString(vue.unref(selectedList).length),
+                    1
+                    /* TEXT */
+                  ),
+                  vue.createTextVNode("\u6761\u6570\u636E ")
+                ])) : vue.createCommentVNode("v-if", true),
+                vue.unref(selectedList) && vue.unref(selectedList).length ? (vue.openBlock(), vue.createElementBlock("span", {
+                  key: 1,
+                  onClick: vue.unref(cancalAllSelection),
+                  class: "text-danger-2 ml-3 border-b border-danger-2 cursor-pointer active:opacity-50"
+                }, "\u53D6\u6D88\u5168\u9009", 8, ["onClick"])) : vue.createCommentVNode("v-if", true)
+              ]),
               vue.unref(totalElements) >= 10 ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElPagination), {
                 key: 0,
+                class: "ml-3",
                 "current-page": __props.filterModel.page,
                 "onUpdate:currentPage": ($event) => __props.filterModel.page = $event,
                 "page-size": __props.filterModel.size,
@@ -785,12 +808,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 onSizeChange: vue.unref(onSizeChangeHandler),
                 onCurrentChange: vue.unref(onCurrentChangeHandler)
               }, null, 8, ["current-page", "onUpdate:currentPage", "page-size", "onUpdate:pageSize", "total", "pager-count", "layout", "onSizeChange", "onCurrentChange"])) : vue.createCommentVNode("v-if", true),
-              vue.unref(selectedList) && vue.unref(selectedList).length > 0 ? (vue.openBlock(), vue.createElementBlock("div", {
-                key: 1,
-                class: "absolute right-4 top-1/2 transform -translate-y-1/2"
-              }, [
-                vue.renderSlot(_ctx.$slots, "multiple-operator-slot")
-              ])) : vue.createCommentVNode("v-if", true)
+              vue.createElementVNode("div", { class: "mx-3" }, [
+                vue.unref(selectedList) && vue.unref(selectedList).length > 0 ? (vue.openBlock(), vue.createElementBlock("div", {
+                  key: 0,
+                  class: ""
+                }, [
+                  vue.renderSlot(_ctx.$slots, "multiple-operator-slot")
+                ])) : vue.createCommentVNode("v-if", true)
+              ])
             ])) : vue.createCommentVNode("v-if", true)
           ]),
           vue.createCommentVNode(" \u8868\u683C\u884C\u53F3\u952E\u5C55\u793A\u64CD\u4F5C\u5217\u8868 "),

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

@@ -267,6 +267,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
           errorMsg = data.errorMsg;
         }
         if (errorMsg && errorMsg.message) {
+          target.errorMsg = errorMsg;
           continue;
         }
         try {
@@ -279,7 +280,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               prop: null,
               message: res2.msg
             };
-            if (submitModel.value === "force") {
+            if (submitModel.value === "strict") {
               break;
             }
           }
@@ -289,7 +290,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             message: err?.msg ? err.msg : err
           };
           console.error(err);
-          if (submitModel.value === "force") {
+          if (submitModel.value === "strict") {
             break;
           }
         }

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

@@ -222,8 +222,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 if (data && !data.errorMsg) {
                   data.errorMsg = errData;
                 } else if (data && !data.errorMsg.prop && !data.errorMsg.message) {
-                  data.errorMsg.prop = errData.errorMsg.prop;
-                  data.errorMsg.message = errData.errorMsg.message;
+                  data.errorMsg.prop = errData.prop;
+                  data.errorMsg.message = errData.message;
                 }
                 errorMap.set(errData.prop, errData.message);
               });
@@ -309,7 +309,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       setData(data) {
         dataSource.value = handler.cloneDeep(data, true);
         dataSource.value.forEach((item) => {
-          item.onlyId = /* @__PURE__ */ Symbol("onlyId");
+          item.onlyId = item.onlyId || /* @__PURE__ */ Symbol("onlyId");
         });
         initValidateHandler(dataSource.value);
         setData(dataSource.value);
@@ -338,7 +338,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       },
       getTableDataSource() {
         return dataSource.value.reduce((list, item) => {
-          const { onlyId, errorMsg, errorMap, children, ...data } = item;
+          const { errorMsg, errorMap, children, ...data } = item;
           list.push(data);
           return list;
         }, []);

package/lib/components/hyTree/js/index.js

@@ -352,7 +352,11 @@ const useAppTreeWrapper = (hy) => {
   function setDisAbleSelectionMap() {
     const map = /* @__PURE__ */ new Map();
     props.disableSelection.forEach((v) => {
-      map.set(v.id, true);
+      if (props.treeType === "device" || props.treeType === "channel") {
+        map.set(v.channelId || v.deviceId, true);
+      } else if (props.treeType) {
+        map.set(v.id, true);
+      }
     });
     hy.disableSelectionMap.value = map;
   }

package/lib/hooks/useBaseMainStore.js

@@ -19,7 +19,7 @@ const useBaseMainStore = () => {
   if (vue.getCurrentInstance()) {
     const baseMainStore = vue.inject(localBaseMainStoreKey, vue.ref());
     return {
-      baseMainStore: vue.unref(baseMainStore) ? vue.unref(baseMainStore) : (vue.unref(useGlobalConfig.useGlobalConfig()).baseMainStore || defaultBaseMainStore)()
+      baseMainStore: vue.unref(baseMainStore) ? vue.unref(baseMainStore)() : (vue.unref(useGlobalConfig.useGlobalConfig()).baseMainStore || defaultBaseMainStore)()
     };
   } else {
     return {

package/lib/hooks/useDialog.js

@@ -2,7 +2,6 @@
 
 var vue = require('vue');
 require('../components/index.js');
-var useLocale = require('./useLocale.js');
 require('./index.js');
 var useBaseMainStore = require('./useBaseMainStore.js');
 var useCurrentBus = require('./useCurrentBus.js');
@@ -60,6 +59,7 @@ function useDialog(hy) {
       hy.setIsEdit(false);
       await hy.restoreCache(value);
       hy.setIsEdit(value.isEdit);
+      hy.setDragLevelIndex("HyDialogRef");
     } else {
       hy.setDragLevelIndex("HyDialogRef");
     }
@@ -79,7 +79,6 @@ function useDialog(hy) {
     return Promise.resolve();
   }
   function confirmReplace(type) {
-    const { t } = useLocale.useLocale();
     return new Promise((resolve, reject) => {
       if (type === "close") {
         index.HyConfirmDialog.confirm({
@@ -174,6 +173,9 @@ function useDialogIsEdit(hy) {
       resolve({});
     });
   }
+  function setWatchResume(newWatchResume) {
+    hy.isWatchForm.value = newWatchResume;
+  }
   function watchResume() {
     hy.isWatchForm.value = true;
   }
@@ -194,6 +196,7 @@ function useDialogIsEdit(hy) {
   return {
     isWatchForm,
     watchPause,
+    setWatchResume,
     watchResume
   };
 }
@@ -205,7 +208,6 @@ function useBatchDialog(hy) {
     hy.tableDataChange.value = data;
   }
   function confirmReplace(type) {
-    const { t } = useLocale.useLocale();
     return new Promise((resolve, reject) => {
       if (type === "close") {
         index.HyConfirmDialog.confirm({

package/lib/version.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "0.2.69";
+const version = "0.2.71";
 
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hy-dispatch-ui-v3",
-  "version": "0.2.70",
+  "version": "0.2.72",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "scripts": {