hy-dispatch-ui-v3 0.2.71 → 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/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/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/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;

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/version.mjs

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

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/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/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;

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/version.js

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

package/package.json

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