hy-dispatch-ui-v3 0.1.2 → 0.1.4

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

@@ -250,13 +250,27 @@ const useAppTableWrapper = (hy) => {
       emits("on-select-checkbox", selectedList.value, row);
     }
   }
-  function onTableSelectAllHandler(selectList = [], row) {
+  function onTableSelectHandler(selectList = [], row) {
     if (selectList.length === 0 && tableDataSource.value.length === 0) {
-      tableRef.value.clearSelection();
+      clearSelection();
     }
     selectedList.value = [...selectList];
     emits("on-select-checkbox", [...selectList], row);
   }
+  function clearSelectedList(list = []) {
+    selectedList.value = list || [];
+    clearSelection();
+    list.forEach((row) => {
+      const item = tableDataSource.value.find(
+        (v) => getRowKey(row) === getRowKey(v)
+      );
+      if (item) {
+        tableRef.value.toggleRowSelection(item, true);
+      } else {
+        tableRef.value.toggleRowSelection(row, true);
+      }
+    });
+  }
   function setTableRowClassName(obj) {
     const row = obj.row;
     let className = [];
@@ -293,12 +307,13 @@ const useAppTableWrapper = (hy) => {
     selectedList,
     tableTriggerRef,
     setTableRowClassName,
-    onTableSelectAllHandler,
+    getSelectedList,
+    clearSelection,
+    clearSelectedList,
+    onTableSelectHandler,
     onTableRowContextmenuHandler,
     onTableRowClickHandler,
-    onTableColumnsSelectHandler,
-    getSelectedList,
-    clearSelection
+    onTableColumnsSelectHandler
   };
 };
 

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

@@ -1,5 +1,4 @@
 import { ref, nextTick, unref } from 'vue';
-import { useAppSearch } from '../../appSearch/js/useAppSearch.mjs';
 import { useApi } from '../../../hooks/useApi.mjs';
 import { isEmpty, isNumber, isString } from '../../../utils/is.mjs';
 
@@ -14,12 +13,6 @@ function useAppTableSearch(hy) {
     clearSelection
   } = hy;
   const { api } = useApi();
-  const { formModel, formColumns } = useAppSearch(props.filterColumns, {
-    page: 1,
-    // 当前分页数
-    size: 15
-    // 每页数量
-  });
   const totalElements = ref(0);
   const showFilter = ref(true);
   function switchShowFilter() {
@@ -31,7 +24,7 @@ function useAppTableSearch(hy) {
     return new Promise((resolve, reject) => {
       if (!isEmpty(page)) {
         if (isNumber(page) || isString(page)) {
-          formModel.value.page = page;
+          props.filterModel.page = page;
         }
       }
       const params = getParametersFn();
@@ -40,13 +33,11 @@ function useAppTableSearch(hy) {
         unref(api).post(`${props.controller}/page`, params, options).then(successFun).finally(() => {
           resolve();
           closeAppTableLoading();
-          clearSelection();
         });
       } else if (props.url) {
         unref(api).post(props.url, params, options).then(successFun).finally(() => {
           resolve();
           closeAppTableLoading();
-          clearSelection();
         });
       } else {
         closeAppTableLoading();
@@ -55,11 +46,10 @@ function useAppTableSearch(hy) {
     });
     function successFun(res) {
       var _a;
-      if (!((_a = res.data.content) == null ? void 0 : _a.length) && formModel.value.page !== 1) {
+      if (!((_a = res.data.content) == null ? void 0 : _a.length) && props.filterModel.page !== 1) {
         getData(1);
         return;
       }
-      console.log("res", res);
       const data = res.data.content ? res.data.content : res.data || [];
       if (props.beforeDataHandler) {
         tableDataSource.value = props.beforeDataHandler(data);
@@ -73,14 +63,14 @@ function useAppTableSearch(hy) {
   async function resetFn() {
     await nextTick();
     appSearchRef.value.resetFields();
-    formModel.value.query = null;
+    props.filterModel.query = null;
     getData(1);
   }
   function getParametersFn() {
     return Object.assign(
       {
-        ...unref(formModel),
-        page: unref(formModel).page - 1
+        ...props.filterModel,
+        page: props.filterModel.page - 1
       },
       unref(props.requestParams)
     );
@@ -96,22 +86,20 @@ function useAppTableSearch(hy) {
     closeAppTableLoading();
   }
   function onSizeChangeHandler(val) {
-    formModel.value.page = 1;
-    formModel.value.size = val;
+    props.filterModel.page = 1;
+    props.filterModel.size = val;
     getData();
   }
   function onCurrentChangeHandler(val) {
-    formModel.value.page = val;
+    props.filterModel.page = val;
     getData();
   }
   let oldQueryValue;
   function onSearchQueryHandler() {
-    const isReset = !(isEmpty(oldQueryValue) && isEmpty(formModel.value.query) || oldQueryValue === formModel.value.query);
+    const isReset = !(isEmpty(oldQueryValue) && isEmpty(props.filterModel.query) || oldQueryValue === props.filterModel.query);
     getData(isReset ? 1 : null);
   }
   return {
-    formModel,
-    formColumns,
     totalElements,
     showFilter,
     getData,

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

@@ -1,7 +1,24 @@
 import { toRef } from 'vue';
+import { useAppSearch } from '../../appSearch/js/useAppSearch.mjs';
 import { isEmpty, isBoolean } from '../../../utils/is.mjs';
 import { useLocale } from '../../../hooks/useLocale.mjs';
 
+function getColumnDefaultConfig(column) {
+  switch (column.type) {
+    case "selection":
+      return {
+        prop: `${column.type}_prop`,
+        reserveSelection: true
+      };
+    case "index":
+    case "expand":
+      return {
+        prop: `${column.type}_prop`
+      };
+    default:
+      return {};
+  }
+}
 function getColumnDefaultWidth(column) {
   if (column.width) return column.width;
   if (column.type === "index") return 80;
@@ -46,7 +63,7 @@ const useAppTable = (config = {}) => {
         throw Error("\u3010column.prop\u3011\u4E0D\u80FD\u4E3A\u7A7A");
       }
       tableColumns.push({
-        prop: column.prop || column.type !== "default" ? `${column.type}_prop` : column.prop,
+        ...getColumnDefaultConfig(column),
         ...column,
         type: column.type || "default",
         width: getColumnDefaultWidth(column),
@@ -57,9 +74,17 @@ const useAppTable = (config = {}) => {
   } catch (err) {
     console.error(err);
   }
+  const appSearchForm = useAppSearch(filterColumns, {
+    page: 1,
+    // 当前分页数
+    size: 15
+    // 每页数量
+  });
+  console.log("appSearchFormappSearchFormappSearchForm", appSearchForm);
   return {
     tableColumns: toRef(tableColumns),
-    filterColumns: toRef(filterColumns)
+    filterModel: appSearchForm.formModel,
+    filterColumns: appSearchForm.formColumns
   };
 };
 

package/es/components/index.mjs

@@ -10,6 +10,8 @@ export { AppTooltip } from './appTooltip/index.mjs';
 export { AppConfigProvider } from './appConfigProvider/index.mjs';
 export { AppButton } from './appButton/index.mjs';
 export { AppUserAvatar } from './appUserAvatar/index.mjs';
+export { AppNoPermissions } from './appNoPermissions/index.mjs';
+export { AppNoPermissionsMap } from './appNoPermissionsMap/index.mjs';
 export { useAppForm } from './appForm/js/useAppForm.mjs';
 export { useAppSearch } from './appSearch/js/useAppSearch.mjs';
 export { useAppTable } from './appTable/js/useAppTable.mjs';

package/es/index.mjs

@@ -6,6 +6,8 @@ export { AppDatePicker } from './components/appDatePicker/index.mjs';
 export { AppForm } from './components/appForm/index.mjs';
 export { AppIcon } from './components/appIcon/index.mjs';
 export { AppIconBox } from './components/appIconBox/index.mjs';
+export { AppNoPermissions } from './components/appNoPermissions/index.mjs';
+export { AppNoPermissionsMap } from './components/appNoPermissionsMap/index.mjs';
 export { AppOrgCascader } from './components/appOrgCascader/index.mjs';
 export { AppSearch } from './components/appSearch/index.mjs';
 export { AppTable } from './components/appTable/index.mjs';

package/es/locale/en.mjs

@@ -31,6 +31,9 @@ var en = {
     confirm: "Confirm",
     loading: "Loading"
   },
+  form: {
+    department: "Department"
+  },
   table: {
     hideFilter: "Hide filter",
     displayFilter: "Display filter",
@@ -64,6 +67,12 @@ var en = {
   },
   userAvatar: {
     userAvatar: "User Avatar"
+  },
+  permissino: {
+    youDoNotHaveSubordinatePermissionsForThisModule: "You Do Not Have Subordinate Permissions For This Module",
+    pleaseContactTheAdministrator: "Please Contact The Administrator",
+    youDoNotHaveAMapConfigurationForThisModule: "You Do Not Have A Map Configuration For This Module",
+    pleaseContactTheAdministratorToGoToTheSettingsCenterForConfiguration: "Please Contact The Administrator To Go To The Settings Center For Configuration"
   }
 };
 

package/es/locale/zh_CN.mjs

@@ -31,6 +31,9 @@ var Chinese = {
     confirm: "\u786E\u8BA4",
     loading: "\u52A0\u8F7D\u4E2D"
   },
+  form: {
+    department: "\u6240\u5C5E\u90E8\u95E8"
+  },
   table: {
     hideFilter: "\u9690\u85CF\u7B5B\u9009\u5668",
     displayFilter: "\u663E\u793A\u7B5B\u9009\u5668",
@@ -60,10 +63,16 @@ var Chinese = {
     dangerousOperation: "\u5371\u9669\u64CD\u4F5C"
   },
   cascader: {
-    pleaseSelectDepartment: "\u8BF7\u9009\u62E9\u90E8\u95E8"
+    pleaseSelectDepartment: "\u8BF7\u9009\u62E9\u6240\u5C5E\u90E8\u95E8"
   },
   userAvatar: {
     userAvatar: "\u7528\u6237\u5934\u50CF"
+  },
+  permissino: {
+    youDoNotHaveSubordinatePermissionsForThisModule: "\u60A8\u6CA1\u6709\u8BE5\u6A21\u5757\u4E0B\u7EA7\u6743\u9650",
+    pleaseContactTheAdministrator: "\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458",
+    youDoNotHaveAMapConfigurationForThisModule: "\u60A8\u6CA1\u6709\u8BE5\u6A21\u5757\u7684\u5730\u56FE\u914D\u7F6E",
+    pleaseContactTheAdministratorToGoToTheSettingsCenterForConfiguration: "\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u524D\u5F80\u8BBE\u7F6E\u4E2D\u5FC3\u8FDB\u884C\u914D\u7F6E"
   }
 };
 

package/es/style/index.scss

@@ -1,6 +1,4 @@
 @use './element/index.scss';
-@use './theme.scss';
-// @use './style/tailwind.scss';
 
 * {
   margin: 0;

package/es/version.mjs

@@ -1,3 +1,3 @@
-const version = "0.1.2";
+const version = "0.1.4";
 
 export { version };

package/lib/components/appButton/appButton.vue.js

@@ -42,10 +42,10 @@ const _sfc_main = {
   setup(__props, { emit: __emit }) {
     const props = __props;
     const typeObj = {
-      default: "button_default",
-      primary: "button_function",
-      success: "button_addTo",
-      danger: "button_delete"
+      default: "hy-button_default",
+      primary: "hy-button_function",
+      success: "hy-button_addTo",
+      danger: "hy-button_delete"
     };
     const emit = __emit;
     const handleClick = (event) => {

package/lib/components/appButton/style/appButton.scss

@@ -32,7 +32,7 @@
   }
 }
 
-.button_default {
+.hy-button_default {
   background: rgba(94, 157, 180, 0.32);
 
   .hy-button__border {
@@ -96,7 +96,7 @@
   }
 }
 
-.button_function {
+.hy-button_function {
   background: rgba(45, 242, 255, 0.32);
 
   .hy-button__border {
@@ -160,7 +160,7 @@
   }
 }
 
-.button_addTo {
+.hy-button_addTo {
   background: rgba(44, 232, 152, 0.32);
 
   .hy-button__border {
@@ -224,7 +224,7 @@
   }
 }
 
-.button_delete {
+.hy-button_delete {
   background: rgba(255, 77, 77, 0.32);
 
   .hy-button__border {

package/lib/components/appForm/appForm.vue.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var index$1 = require('../appIcon/index.js');
-var appDatePicker = require('../appDatePicker/appDatePicker.vue.js');
+var index$2 = require('../appDatePicker/index.js');
+var index$3 = require('../appOrgCascader/index.js');
 var index = require('./js/index.js');
 var useAppForm = require('./js/useAppForm.js');
 var useLocale = require('../../hooks/useLocale.js');
@@ -251,7 +252,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                       "daterange",
                                       "monthrange",
                                       "yearrange"
-                                    ].includes((_a = column.attrs) == null ? void 0 : _a.type) && vue.unref(is.isArray)(column.field) ? (vue.openBlock(), vue.createBlock(appDatePicker.default, vue.mergeProps({
+                                    ].includes((_a = column.attrs) == null ? void 0 : _a.type) && vue.unref(is.isArray)(column.field) ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.AppDatePicker), vue.mergeProps({
                                       key: 0,
                                       start: __props.model[column.field[0]],
                                       "onUpdate:start": ($event) => __props.model[column.field[0]] = $event,
@@ -261,7 +262,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                       style: { "width": "100%" }
                                     }, { ref_for: true }, column.attrs, {
                                       disabled: vue.unref(index.isDisabled)(props, column)
-                                    }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (vue.openBlock(), vue.createBlock(appDatePicker.default, vue.mergeProps({
+                                    }), null, 16, ["start", "onUpdate:start", "end", "onUpdate:end", "disabled"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$2.AppDatePicker), vue.mergeProps({
                                       key: 1,
                                       modelValue: __props.model[column.field],
                                       "onUpdate:modelValue": ($event) => __props.model[column.field] = $event,
@@ -299,6 +300,19 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   ],
                                   2112
                                   /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+                                )) : column.type === "org-cascader" ? (vue.openBlock(), vue.createElementBlock(
+                                  vue.Fragment,
+                                  { key: 6 },
+                                  [
+                                    vue.createCommentVNode(" \u90E8\u95E8\u7EA7\u8054\u9009\u62E9\u6846 "),
+                                    vue.createVNode(vue.unref(index$3.AppOrgCascader), vue.mergeProps({
+                                      modelValue: __props.model[column.field],
+                                      "onUpdate:modelValue": ($event) => __props.model[column.field] = $event,
+                                      disabled: vue.unref(index.isDisabled)(props, column)
+                                    }, { ref_for: true }, column.attrs), null, 16, ["modelValue", "onUpdate:modelValue", "disabled"])
+                                  ],
+                                  2112
+                                  /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
                                 )) : vue.createCommentVNode("v-if", true)
                               ],
                               64

package/lib/components/appForm/js/useAppForm.js

@@ -6,6 +6,15 @@ var date = require('../../../utils/date.js');
 var useLocale = require('../../../hooks/useLocale.js');
 var is = require('../../../utils/is.js');
 
+const genDefaultLabel = (config) => {
+  if (config.label) return config.label;
+  const { t } = useLocale.useLocale();
+  switch (config.type) {
+    // 部门级联选择框
+    case "org-cascader":
+      return t("form.department");
+  }
+};
 const genPlaceholderHandler = (config) => {
   const { t } = useLocale.useLocale();
   const { type, label, attrs = {} } = config || {};
@@ -13,8 +22,10 @@ const genPlaceholderHandler = (config) => {
   switch (type) {
     case "input":
       placeholder = placeholder || t("hy.pleaseEnterPlaceholder", [label]);
+      break;
     case "select":
       placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
+      break;
     case "date-picker":
       if (["datetimerange", "daterange", "monthrange", "yearrange"].includes(
         attrs == null ? void 0 : attrs.type
@@ -40,6 +51,7 @@ const genPlaceholderHandler = (config) => {
       } else {
         placeholder = placeholder || t("hy.pleaseSelectPlaceholder", [label]);
       }
+      break;
     default:
       placeholder = placeholder || label;
   }
@@ -74,13 +86,15 @@ const rulesHandler = (config) => {
   return rules;
 };
 function appFormItemHandler(column = {}) {
-  const { placeholder, startPlaceholder, endPlaceholder } = genPlaceholderHandler(column);
+  const label = genDefaultLabel(column);
+  const { placeholder, startPlaceholder, endPlaceholder } = genPlaceholderHandler({ ...column, label });
   const attrs = { ...column.attrs || {}, placeholder };
   column = handler.mergeDeep(
     { ...column },
     {
       key: /* @__PURE__ */ Symbol("appFormItemKey"),
       field: column.prop,
+      label,
       readonly: column.readonly || false,
       rules: rulesHandler(column)
     }

package/lib/components/appIcon/style/appIcon.scss

@@ -1,8 +1,8 @@
 .app-icon {
   width: 16px;
   height: 16px;
-  vertical-align: -0.15em;
-  stroke: currentColor;
+  vertical-align: -0.1em;
+  display: inline-block;
   overflow: hidden;
   fill: currentColor;
   outline: none;

package/lib/components/appNoPermissions/appNoPermissions.vue.js

@@ -0,0 +1,52 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+var index = require('../appIcon/index.js');
+var useLocale = require('../../hooks/useLocale.js');
+
+import "./style/appNoPermissions.scss";
+
+const __default__ = vue.defineComponent({
+  name: "AppNoPermissions"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
+  props: {
+    svgName: {
+      type: String,
+      default: "2-v3-base-no-data-noData"
+    }
+  },
+  emits: [],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const { t } = useLocale.useLocale();
+    __expose({});
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", { class: "w-full h-full bg-background-2 text-auxiliary text-base flex flex-col items-center justify-center" }, [
+        vue.createVNode(vue.unref(index.AppIcon), {
+          "svg-name": __props.svgName,
+          "class-name": "!w-[46px] !h-[46px]"
+        }, null, 8, ["svg-name"]),
+        vue.createElementVNode("div", { class: "text-center mt-[12px]" }, [
+          vue.createElementVNode(
+            "p",
+            null,
+            vue.toDisplayString(vue.unref(t)("permissino.youDoNotHaveSubordinatePermissionsForThisModule")),
+            1
+            /* TEXT */
+          ),
+          vue.createElementVNode(
+            "p",
+            null,
+            vue.toDisplayString(vue.unref(t)("permissino.pleaseContactTheAdministrator")),
+            1
+            /* TEXT */
+          )
+        ])
+      ]);
+    };
+  }
+});
+
+exports.default = _sfc_main;

package/lib/components/appNoPermissions/index.js

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

package/lib/components/appNoPermissionsMap/appNoPermissionsMap.vue.js

@@ -0,0 +1,54 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+var index = require('../appIcon/index.js');
+var useLocale = require('../../hooks/useLocale.js');
+
+import "./style/appNoPermissionsMap.scss";
+
+const __default__ = vue.defineComponent({
+  name: "AppNoPermissionsMap"
+});
+const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
+  props: {
+    svgName: {
+      type: String,
+      default: "2-v3-base-no-data-noData"
+    }
+  },
+  emits: [],
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const { t } = useLocale.useLocale();
+    __expose({});
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", { class: "w-full h-full bg-background-2 text-auxiliary text-base flex flex-col items-center justify-center" }, [
+        vue.createVNode(vue.unref(index.AppIcon), {
+          "svg-name": __props.svgName,
+          "class-name": "!w-[46px] !h-[46px]"
+        }, null, 8, ["svg-name"]),
+        vue.createElementVNode("div", { class: "text-center mt-[12px]" }, [
+          vue.createElementVNode(
+            "p",
+            null,
+            vue.toDisplayString(vue.unref(t)("permissino.youDoNotHaveAMapConfigurationForThisModule")),
+            1
+            /* TEXT */
+          ),
+          vue.createElementVNode(
+            "p",
+            null,
+            vue.toDisplayString(vue.unref(t)(
+              "permissino.pleaseContactTheAdministratorToGoToTheSettingsCenterForConfiguration"
+            )),
+            1
+            /* TEXT */
+          )
+        ])
+      ]);
+    };
+  }
+});
+
+exports.default = _sfc_main;

package/lib/components/appNoPermissionsMap/index.js

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

package/lib/components/appOrgCascader/appOrgCascader.vue.js

@@ -70,7 +70,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     changeLastLayer: {
       type: Boolean,
       default: () => {
-        return false;
+        return true;
       }
     }
   }, {