@witlink/usercenter 1.2.59 → 1.2.60

package/dist/usercenter.es.js

@@ -1,4 +1,4 @@
-import './assets/main.b5420456.css';var __defProp = Object.defineProperty;
+import './assets/main.fec19ffc.css';var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -8,13 +8,13 @@ import { useI18n } from "vue-i18n";
 import { defineStore, createPinia } from "pinia";
 import Axios from "axios";
 import { notification, message, App, Drawer, Button, ConfigProvider, Modal, Checkbox as Checkbox$1, Divider as Divider$1 } from "ant-design-vue";
-import { ref, render, h, reactive, inject, computed, provide, createCommentVNode, defineComponent, watch, onMounted, nextTick, onUnmounted, TransitionGroup, Teleport, resolveComponent, onActivated, onDeactivated, onBeforeUnmount, openBlock, createElementBlock, createVNode, withCtx, createElementVNode, createTextVNode, toDisplayString, createBlock, unref, Fragment, renderList, normalizeClass, normalizeStyle, mergeProps, withDirectives, vShow, onBeforeMount, useSlots, createSlots, renderSlot, normalizeProps, guardReactiveProps, withModifiers, watchEffect, mergeModels, useModel, resolveDirective } from "vue";
-import { hasPermission, getUserInfo as getUserInfo$1 } from "@witlink/components/utils";
+import { ref, render, h, reactive, inject, computed, provide, createCommentVNode, defineComponent, watch, onMounted, nextTick, onUnmounted, TransitionGroup, Teleport, resolveComponent, onActivated, onDeactivated, onBeforeUnmount, openBlock, createElementBlock, createVNode, withCtx, createElementVNode, createTextVNode, toDisplayString, createBlock, unref, Fragment, renderList, normalizeClass, normalizeStyle, mergeProps, onBeforeMount, withDirectives, vShow, useSlots, createSlots, renderSlot, normalizeProps, guardReactiveProps, withModifiers, watchEffect, mergeModels, useModel, resolveDirective } from "vue";
+import { getUserInfo as getUserInfo$1, hasPermission } from "@witlink/components/utils";
 import en_US from "ant-design-vue/es/locale/en_US";
 import zh_CN from "ant-design-vue/es/locale/zh_CN";
 import fr_FR from "ant-design-vue/es/locale/fr_FR";
-import { Input, FormItem, Select, CheckboxGroup, Form, Button as Button$1, Space, ConfigProvider as ConfigProvider$1, Textarea, Modal as Modal$1, DescriptionsItem, Descriptions, Divider, Drawer as Drawer$1, AutoComplete, Tooltip, MenuItem, Menu, Dropdown, Table, Checkbox, SelectOption, Cascader, Col, Row, InputPassword, Upload, Spin, ListItem, List, InputNumber, Card, Switch, InputSearch, DatePicker } from "ant-design-vue/es";
-import Icon, { RedoOutlined, ExclamationCircleOutlined, DownOutlined, LeftOutlined, UploadOutlined, PlusOutlined, MinusOutlined, EditOutlined, FormOutlined, DeleteOutlined, DownloadOutlined } from "@ant-design/icons-vue";
+import { Input, FormItem, Select, CheckboxGroup, Form, Button as Button$1, Space, ConfigProvider as ConfigProvider$1, Textarea, Modal as Modal$1, DescriptionsItem, Descriptions, Divider, Drawer as Drawer$1, AutoComplete, Tooltip, MenuItem, Menu, Dropdown, Table, Col, Row, Checkbox, SelectOption, Cascader, InputPassword, Upload, Spin, ListItem, List, InputNumber, Switch, InputSearch, DatePicker } from "ant-design-vue/es";
+import Icon, { RedoOutlined, ExclamationCircleOutlined, DownOutlined, LeftOutlined, UploadOutlined, PlusOutlined, MinusOutlined, EditOutlined, FormOutlined, InfoCircleOutlined, DeleteOutlined, DownloadOutlined } from "@ant-design/icons-vue";
 import dayjs from "dayjs";
 import { cloneDeep } from "lodash-es";
 const APIBASEURL = "/usercenter/";
@@ -491,7 +491,7 @@ const useModalStore = defineStore(`${TOKEN_PREFIX}modal`, {
           Drawer,
           {
             title,
-            maskClosable: false,
+            maskClosable: true,
             width,
             open: true,
             class: "drawer-class",
@@ -534,6 +534,7 @@ createPinia();
 function setStore(instance2, app) {
   const modalStore = useModalStore();
   modalStore.setAppContext(app);
+  initUserInfo();
 }
 function changeTheme$1(options) {
   document.documentElement.style.setProperty(
@@ -543,6 +544,17 @@ function changeTheme$1(options) {
   const appStore = useAppStore();
   appStore.setAntConfigToken(options);
 }
+function initUserInfo() {
+  const userStore = useUserStore();
+  if (userStore.roles.length > 0)
+    return;
+  const userInfo = getUserInfo$1();
+  if (userInfo) {
+    userStore.setUserInfo(userInfo);
+  } else {
+    userStore.getUserInfo();
+  }
+}
 function getLang(isoCode) {
   return handleRespPost({
     url: "/api/auth/lang-info",
@@ -5447,7 +5459,7 @@ function formatText(value, placeholder) {
 function eqEmptyValue(cellValue) {
   return cellValue === "" || xeUtils.eqNull(cellValue);
 }
-const version$1 = "4.17.14";
+const version$1 = "4.17.25";
 VxeUI.version = version$1;
 VxeUI.tableVersion = version$1;
 VxeUI.setConfig({
@@ -5671,9 +5683,10 @@ VxeUI.setConfig({
       showResponseMsg: true,
       showActionMsg: true,
       response: {
-        list: null,
+        list: "list",
         result: "result",
         total: "page.total",
+        footerData: "footerData",
         message: "message"
       }
     }
@@ -6445,11 +6458,12 @@ default_1$2 = zhCN.default = {
           fixedRight: "\u51BB\u7ED3\u53F3\u4FA7",
           clearFilter: "\u6E05\u9664\u7B5B\u9009",
           textOption: "\u6587\u672C\u7B5B\u9009",
-          numberOption: "\u6570\u503C\u7B5B\u9009"
+          numberOption: "\u6570\u503C\u7B5B\u9009",
+          dateOption: "\u65E5\u671F\u7B5B\u9009"
         },
         popup: {
           title: "\u81EA\u5B9A\u4E49\u7B5B\u9009\u7684\u65B9\u5F0F",
-          currColumnTitle: "\u5F53\u524D\u5217\uFF1A",
+          currColumnTitle: "\u663E\u793A\u884C\uFF1A",
           and: "\u4E0E",
           or: "\u6216",
           describeHtml: "\u53EF\u7528 ? \u4EE3\u8868\u5355\u4E2A\u5B57\u7B26<br/>\u7528 * \u4EE3\u8868\u4EFB\u610F\u591A\u4E2A\u5B57\u7B26"
@@ -6468,6 +6482,28 @@ default_1$2 = zhCN.default = {
           include: "\u5305\u542B",
           exclude: "\u4E0D\u5305\u542B",
           between: "\u4ECB\u4E8E",
+          isAfter: "\u5728\u4EE5\u4E0B\u65E5\u671F\u4E4B\u540E",
+          eqAfter: "\u5728\u4EE5\u4E0B\u65E5\u671F\u4E4B\u540E\u6216\u4E0E\u4E4B\u76F8\u540C",
+          isBefore: "\u5728\u4EE5\u4E0B\u65E5\u671F\u4E4B\u524D",
+          eqBefore: "\u5728\u4EE5\u4E0B\u65E5\u671F\u4E4B\u524D\u6216\u4E0E\u4E4B\u76F8\u540C",
+          top10: "\u524D10\u9879",
+          aboveAverage: "\u9AD8\u4E8E\u5E73\u5747\u503C",
+          belowAverage: "\u4F4E\u4E8E\u5E73\u5747\u503C",
+          before: "\u4E4B\u524D",
+          after: "\u4E4B\u540E",
+          tomorrow: "\u660E\u5929",
+          today: "\u4ECA\u5929",
+          yesterday: "\u6628\u5929",
+          nextWeek: "\u4E0B\u5468",
+          thisWeek: "\u672C\u5468",
+          lastWeek: "\u4E0A\u5468",
+          nextMonth: "\u4E0B\u6708",
+          thisMonth: "\u672C\u6708",
+          lastMonth: "\u4E0A\u6708",
+          nextYear: "\u660E\u5E74",
+          thisYear: "\u4ECA\u5E74",
+          lastYear: "\u53BB\u5E74",
+          yearToDate: "\u672C\u5E74\u5EA6\u622A\u6B62\u5230\u73B0\u5728",
           custom: "\u81EA\u5B9A\u4E49\u7B5B\u9009",
           insensitive: "\u4E0D\u533A\u5206\u5927\u5C0F\u5199",
           isSensitive: "\u533A\u5206\u5927\u5C0F\u5199"
@@ -6533,6 +6569,9 @@ default_1$2 = zhCN.default = {
         include: "\u5305\u542B",
         exclude: "\u4E0D\u5305\u542B",
         between: "\u4ECB\u4E8E",
+        top10: "\u524D10\u9879",
+        aboveAverage: "\u9AD8\u4E8E\u5E73\u5747\u503C",
+        belowAverage: "\u4F4E\u4E8E\u5E73\u5747\u503C",
         custom: "\u81EA\u5B9A\u4E49\u7B5B\u9009",
         insensitive: "\u4E0D\u533A\u5206\u5927\u5C0F\u5199",
         isSensitive: "\u533A\u5206\u5927\u5C0F\u5199"
@@ -6550,11 +6589,12 @@ default_1$2 = zhCN.default = {
           fixedRight: "\u51BB\u7ED3\u5230\u53F3\u4FA7",
           clearFilter: "\u6E05\u9664\u7B5B\u9009",
           textOption: "\u6587\u672C\u7B5B\u9009",
-          numberOption: "\u6570\u503C\u7B5B\u9009"
+          numberOption: "\u6570\u503C\u7B5B\u9009",
+          dateOption: "\u65E5\u671F\u7B5B\u9009"
         },
         popup: {
           title: "\u81EA\u5B9A\u4E49\u7B5B\u9009\u7684\u65B9\u5F0F",
-          currColumnTitle: "\u5F53\u524D\u5217\uFF1A",
+          currColumnTitle: "\u663E\u793A\u884C\uFF1A",
           and: "\u4E0E",
           or: "\u6216",
           describeHtml: "\u53EF\u7528 ? \u4EE3\u8868\u5355\u4E2A\u5B57\u7B26<br/>\u7528 * \u4EE3\u8868\u4EFB\u610F\u591A\u4E2A\u5B57\u7B26"
@@ -7236,12 +7276,13 @@ default_1$1 = enUS.default = {
           fixedLeft: "Freeze left",
           fixedRight: "Freeze right",
           clearFilter: "Clear Filter",
-          textOption: "Text filter",
-          numberOption: "Numerical filter"
+          textOption: "Text filters",
+          numberOption: "Number filters",
+          dateOption: "Date filters"
         },
         popup: {
           title: "Custom filtering methods",
-          currColumnTitle: "Current column:",
+          currColumnTitle: "Show rows where:",
           and: "and",
           or: "or",
           describeHtml: "Available? Represents a single character<br/>Use * Represents any multiple characters"
@@ -7260,6 +7301,28 @@ default_1$1 = enUS.default = {
           include: "Include",
           exclude: "Not included",
           between: "Between",
+          isAfter: "Is after",
+          eqAfter: "Is after or equal to",
+          isBefore: "Is before",
+          eqBefore: "Is before or equal to",
+          top10: "Top 10",
+          aboveAverage: "Above average",
+          belowAverage: "Below average",
+          before: "Before",
+          after: "After",
+          tomorrow: "Tomorrow",
+          today: "Today",
+          yesterday: "Yesterday",
+          nextWeek: "Next Week",
+          thisWeek: "This Week",
+          lastWeek: "Last Week",
+          nextMonth: "Next Month",
+          thisMonth: "This Month",
+          lastMonth: "Last Month",
+          nextYear: "Next Year",
+          thisYear: "This Year",
+          lastYear: "Last Year",
+          yearToDate: "Year to Date",
           custom: "Custom filter",
           insensitive: "Case insensitive",
           isSensitive: "case sensitive"
@@ -7325,6 +7388,9 @@ default_1$1 = enUS.default = {
         include: "Include",
         exclude: "Not included",
         between: "Between",
+        top10: "Top 10",
+        aboveAverage: "Above average",
+        belowAverage: "Below average",
         custom: "Custom filter",
         insensitive: "Case insensitive",
         isSensitive: "case sensitive"
@@ -7341,12 +7407,13 @@ default_1$1 = enUS.default = {
           fixedLeft: "Freeze left",
           fixedRight: "Freeze right",
           clearFilter: "Clear Filter",
-          textOption: "Text filtering",
-          numberOption: "Numerical filtering"
+          textOption: "Text filters",
+          numberOption: "Number filters",
+          dateOption: "Date filters"
         },
         popup: {
           title: "Custom filtering methods",
-          currColumnTitle: "Current column:",
+          currColumnTitle: "Show rows where:",
           and: "and",
           or: "or",
           describeHtml: "Available? Represents a single character<br/>Use * Represents any multiple characters"
@@ -8029,7 +8096,8 @@ default_1 = frFR.default = {
           fixedRight: "Geler \xE0 droite",
           clearFilter: "Filtre effacer",
           textOption: "Filtre \xE0 texte",
-          numberOption: "Filtre num\xE9rique"
+          numberOption: "Filtre num\xE9rique",
+          dateOption: "\u65E5\u671F\u7B5B\u9009"
         },
         popup: {
           title: "M\xE9thodes de filtrage personnalis\xE9es",
@@ -8052,6 +8120,28 @@ default_1 = frFR.default = {
           include: "Inclure",
           exclude: "Pas inclus",
           between: "Entre",
+          isAfter: "\u5728\u4EE5\u4E0B\u65E5\u671F\u4E4B\u540E",
+          eqAfter: "\u5728\u4EE5\u4E0B\u65E5\u671F\u4E4B\u540E\u6216\u4E0E\u4E4B\u76F8\u540C",
+          isBefore: "\u5728\u4EE5\u4E0B\u65E5\u671F\u4E4B\u524D",
+          eqBefore: "\u5728\u4EE5\u4E0B\u65E5\u671F\u4E4B\u524D\u6216\u4E0E\u4E4B\u76F8\u540C",
+          top10: "\u524D10\u9879",
+          aboveAverage: "\u9AD8\u4E8E\u5E73\u5747\u503C",
+          belowAverage: "\u4F4E\u4E8E\u5E73\u5747\u503C",
+          before: "\u4E4B\u524D",
+          after: "\u4E4B\u540E",
+          tomorrow: "\u660E\u5929",
+          today: "\u4ECA\u5929",
+          yesterday: "\u6628\u5929",
+          nextWeek: "\u4E0B\u5468",
+          thisWeek: "\u672C\u5468",
+          lastWeek: "\u4E0A\u5468",
+          nextMonth: "\u4E0B\u6708",
+          thisMonth: "\u672C\u6708",
+          lastMonth: "\u4E0A\u6708",
+          nextYear: "\u660E\u5E74",
+          thisYear: "\u4ECA\u5E74",
+          lastYear: "\u53BB\u5E74",
+          yearToDate: "\u672C\u5E74\u5EA6\u622A\u6B62\u5230\u73B0\u5728",
           custom: "Filtre personnalis\xE9",
           insensitive: "Cas insensible au cas",
           isSensitive: "sensible aux majuscules et minuscules"
@@ -8117,6 +8207,9 @@ default_1 = frFR.default = {
         include: "Inclure",
         exclude: "Pas inclus",
         between: "Entre",
+        top10: "\u524D10\u9879",
+        aboveAverage: "\u9AD8\u4E8E\u5E73\u5747\u503C",
+        belowAverage: "\u4F4E\u4E8E\u5E73\u5747\u503C",
         custom: "Filtre personnalis\xE9",
         insensitive: "Cas insensible au cas",
         isSensitive: "sensible aux majuscules et minuscules"
@@ -8134,7 +8227,8 @@ default_1 = frFR.default = {
           fixedRight: "Geler \xE0 droite",
           clearFilter: "Filtre effacer",
           textOption: "Filtrage de texte",
-          numberOption: "Filtrage num\xE9rique"
+          numberOption: "Filtrage num\xE9rique",
+          dateOption: "\u65E5\u671F\u7B5B\u9009"
         },
         popup: {
           title: "M\xE9thodes de filtrage personnalis\xE9es",
@@ -8232,10 +8326,10 @@ function getClsRE(cls) {
   return reClsMap[cls];
 }
 function isPx(val) {
-  return val && /^\d+(px)?$/.test(val);
+  return val && /^\d+(\.\d+)?(px)?$/.test(val);
 }
 function isScale(val) {
-  return val && /^\d+%$/.test(val);
+  return val && /^\d+(\.\d+)?%$/.test(val);
 }
 function hasClass(elem, cls) {
   return !!(elem && elem.className && elem.className.match && elem.className.match(getClsRE(cls)));
@@ -8355,7 +8449,7 @@ function triggerEvent(targetElem, type) {
   }
 }
 const { log } = VxeUI;
-const version = `table v${"4.17.14"}`;
+const version = `table v${"4.17.25"}`;
 const warnLog = log.create("warn", version);
 const errLog = log.create("error", version);
 const { getI18n: getI18n$b, formats: formats$1, renderer: renderer$a } = VxeUI;
@@ -9576,8 +9670,9 @@ const Cell = {
       const { fullColumnFieldData } = tableInternalData;
       const { computeAggregateOpts } = $table.getComputeMaps();
       const aggregateOpts = computeAggregateOpts.value;
-      const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts;
-      const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
+      const { mode, showTotal, totalMethod, countFields, contentMethod, formatValuesMethod, mapChildrenField } = aggregateOpts;
+      const aggData = aggRow.aggData;
+      const currAggData = aggData ? aggData[field] : null;
       const groupField = aggRow.groupField;
       const groupContent = aggRow.groupContent;
       const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
@@ -9609,9 +9704,10 @@ const Cell = {
       } else if ($table.getPivotTableAggregateCellAggValue) {
         cellValue = $table.getPivotTableAggregateCellAggValue(params);
       } else if (aggFunc === true || countFields && countFields.includes(field)) {
-        if (aggCalcMethod) {
-          ctParams.aggValue = childCount;
-          cellValue = `${aggCalcMethod(ctParams)}`;
+        cellValue = currAggData ? currAggData.value : childCount;
+        ctParams.aggValue = cellValue;
+        if (formatValuesMethod) {
+          cellValue = formatValuesMethod(ctParams);
         }
       }
     } else {
@@ -9657,7 +9753,7 @@ const Cell = {
     const { rowGroupExpandedFlag } = tableReactData;
     const { rowGroupExpandedMaps } = tableInternalData;
     const aggregateOpts = computeAggregateOpts.value;
-    const { mode, padding, indent } = aggregateOpts;
+    const { mode, padding, indent, showIcon, iconOpen, iconClose } = aggregateOpts;
     const rowid = getRowid($table, row);
     const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
     return h("div", {
@@ -9668,14 +9764,14 @@ const Cell = {
         paddingLeft: `${level * indent}px`
       } : void 0
     }, [
-      row.isAggregate ? h("span", {
+      showIcon && row.isAggregate ? h("span", {
         class: "vxe-row-group--node-btn",
         onClick(evnt) {
           $table.triggerRowGroupExpandEvent(evnt, params);
         }
       }, [
         h("i", {
-          class: isExpand ? getIcon$6().TABLE_ROW_GROUP_OPEN : getIcon$6().TABLE_ROW_GROUP_CLOSE
+          class: isExpand ? iconOpen || getIcon$6().TABLE_ROW_GROUP_OPEN : iconClose || getIcon$6().TABLE_ROW_GROUP_CLOSE
         })
       ]) : renderEmptyElement$9($table),
       h("div", {
@@ -10294,7 +10390,7 @@ const Cell = {
   }
 };
 const { getI18n: getI18n$9, renderer: renderer$8, renderEmptyElement: renderEmptyElement$8 } = VxeUI;
-const sourceType$2 = "table";
+const sourceType$3 = "table";
 const renderType$2 = "body";
 const TableBodyComponent = defineVxeComponent({
   name: "VxeTableBody",
@@ -10448,7 +10544,7 @@ const TableBodyComponent = defineVxeComponent({
         $columnIndex,
         _columnIndex,
         fixed: fixedType,
-        source: sourceType$2,
+        source: sourceType$3,
         type: renderType$2,
         isHidden: !!fixedHiddenColumn,
         level: rowLevel,
@@ -10839,7 +10935,7 @@ const TableBodyComponent = defineVxeComponent({
               $columnIndex,
               _columnIndex,
               fixed: fixedType,
-              source: sourceType$2,
+              source: sourceType$3,
               type: renderType$2,
               level: rowLevel,
               row,
@@ -11086,22 +11182,8 @@ const TableBodyComponent = defineVxeComponent({
   }
 });
 const { renderer: renderer$7, renderEmptyElement: renderEmptyElement$7 } = VxeUI;
-const sourceType$1 = "table";
+const sourceType$2 = "table";
 const renderType$1 = "header";
-function getColumnFirstChild(column) {
-  const { children } = column;
-  if (children && children.length) {
-    return getColumnFirstChild(children[0]);
-  }
-  return column;
-}
-function getColumnLastChild(column) {
-  const { children } = column;
-  if (children && children.length) {
-    return getColumnLastChild(children[children.length - 1]);
-  }
-  return column;
-}
 const TableHeaderComponent = defineVxeComponent({
   name: "VxeTableHeader",
   props: {
@@ -11190,7 +11272,7 @@ const TableHeaderComponent = defineVxeComponent({
           _columnIndex,
           firstFilterOption,
           fixed: fixedType,
-          source: sourceType$1,
+          source: sourceType$2,
           type: renderType$1,
           isHidden: fixedHiddenColumn,
           hasFilter
@@ -11260,15 +11342,13 @@ const TableHeaderComponent = defineVxeComponent({
         if (showCustomHeader)
           ;
         else if (isColGroup && !isLastRow) {
-          const firstCol = getColumnFirstChild(column);
-          const lastCol = getColumnLastChild(column);
-          if (firstCol && lastCol && firstCol.id !== lastCol.id) {
-            const firstColRest = fullColumnIdData[firstCol.id];
-            const lastColRest = fullColumnIdData[lastCol.id];
-            if (firstColRest && lastColRest) {
-              tcStyle.width = `${lastColRest.oLeft - firstColRest.oLeft + lastCol.renderWidth}px`;
+          let childWidth = 0;
+          xeUtils.eachTree(column.children, (childRow) => {
+            if (childRow.visible && (!childRow.children || !childRow.children.length)) {
+              childWidth += childRow.renderWidth;
             }
-          }
+          });
+          tcStyle.width = `${childWidth}px`;
         }
         return h("th", Object.assign(Object.assign(Object.assign({ class: [
           "vxe-table--column vxe-header--column",
@@ -11360,7 +11440,7 @@ const TableHeaderComponent = defineVxeComponent({
           _columnIndex,
           option: firstFilterOption,
           fixed: fixedType,
-          source: sourceType$1,
+          source: sourceType$2,
           type: renderType$1,
           isHidden: fixedHiddenColumn,
           hasFilter
@@ -11581,7 +11661,7 @@ const TableHeaderComponent = defineVxeComponent({
   }
 });
 const { renderer: renderer$6, renderEmptyElement: renderEmptyElement$6 } = VxeUI;
-const sourceType = "table";
+const sourceType$1 = "table";
 const renderType = "footer";
 const TableFooterComponent = defineVxeComponent({
   name: "VxeTableFooter",
@@ -11665,7 +11745,7 @@ const TableFooterComponent = defineVxeComponent({
           itemIndex,
           items: row,
           fixed: fixedType,
-          source: sourceType,
+          source: sourceType$1,
           type: renderType,
           data: footerTableData
         };
@@ -14927,7 +15007,7 @@ hooks$5.add("tableMenuModule", {
               handleOpenMenuEvent(evnt, layout, params);
               $xeTable.dispatchEvent(eventType, params, evnt);
               return;
-            } else if (getEventTargetNode(evnt, el, `vxe-table--${layout}-wrapper`, (target) => target.getAttribute("xid") === xID).flag) {
+            } else if (getEventTargetNode(evnt, el, `vxe-table--${layout}-wrapper`, (target) => target.getAttribute("xid") === xID).flag || layout === "body" && getEventTargetNode(evnt, el, "vxe-table--empty-place-wrapper", (target) => target.getAttribute("xid") === xID).flag) {
               if (menuOpts.trigger === "cell") {
                 evnt.preventDefault();
               } else {
@@ -18415,7 +18495,7 @@ VxeUI.hooks.add("tableCustomModule", {
           }
         }
         if (allowResizable) {
-          if (column.renderVisible && (!column.children || column.children.length)) {
+          if (column.renderVisible && (!column.children || !column.children.length)) {
             if (column.renderResizeWidth !== column.renderWidth) {
               column.resizeWidth = column.renderResizeWidth;
               column.renderWidth = column.renderResizeWidth;
@@ -19099,9 +19179,8 @@ function oldSelectEditRender(renderOpts, params) {
     h(getOldComponent(renderOpts), Object.assign(Object.assign({}, getCellEditProps(renderOpts, params, cellValue, { options, optionProps, optionGroups, optionGroupProps })), getEditOns(renderOpts, params)))
   ];
 }
-function getSelectCellValue(renderOpts, { row, column }) {
+function handleSelectCellValue(cellValue, renderOpts) {
   const { options, optionGroups, optionProps = {}, optionGroupProps = {}, props = {} } = renderOpts;
-  const cellValue = xeUtils.get(row, column.field);
   let selectItem;
   const labelProp = optionProps.label || "label";
   const valueProp = optionProps.value || "value";
@@ -19132,13 +19211,16 @@ function getSelectCellValue(renderOpts, { row, column }) {
   }
   return "";
 }
+function getSelectCellValue(renderOpts, { row, column }) {
+  const cellValue = xeUtils.get(row, column.field);
+  return handleSelectCellValue(cellValue, renderOpts);
+}
 function handleExportSelectMethod(params) {
   const { row, column, options } = params;
   return options.original ? getCellValue(row, column) : getSelectCellValue(column.editRender || column.cellRender, params);
 }
-function getTreeSelectCellValue(renderOpts, { row, column }) {
+function handleTreeSelectCellValue(cellValue, renderOpts) {
   const { options, optionProps = {} } = renderOpts;
-  const cellValue = xeUtils.get(row, column.field);
   const labelProp = optionProps.label || "label";
   const valueProp = optionProps.value || "value";
   const childrenProp = optionProps.children || "children";
@@ -19154,6 +19236,10 @@ function getTreeSelectCellValue(renderOpts, { row, column }) {
   }
   return "";
 }
+function getTreeSelectCellValue(renderOpts, { row, column }) {
+  const cellValue = xeUtils.get(row, column.field);
+  return handleTreeSelectCellValue(cellValue, renderOpts);
+}
 function handleExportTreeSelectMethod(params) {
   const { row, column, options } = params;
   return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
@@ -19211,6 +19297,83 @@ function handleNumberCell(renderOpts, params) {
     class: "is--negative"
   } : {});
 }
+function handleFormatSelect(renderOpts, params) {
+  const { cellValue } = params;
+  return handleSelectCellValue(cellValue, renderOpts);
+}
+function handleSetSelectValue(renderOpts, params) {
+  const { row, column, cellValue } = params;
+  const { field } = column;
+  if (field) {
+    const { options, optionGroups, optionProps = {}, optionGroupProps = {}, props } = renderOpts;
+    if (isEmptyValue(cellValue)) {
+      xeUtils.set(row, field, props && props.multiple ? [] : null);
+      return;
+    }
+    const isMultiVal = xeUtils.indexOf(`${cellValue}`, ",") > -1;
+    const labelProp = optionProps.label || "label";
+    const valueProp = optionProps.value || "value";
+    const labelMpas = {};
+    if (optionGroups && optionGroups.length) {
+      const groupOptions = optionGroupProps.options || "options";
+      for (let i = 0; i < optionGroups.length; i++) {
+        const opts = optionGroups[i][groupOptions] || {};
+        for (let j = 0; j < opts.length; j++) {
+          const item = opts[j];
+          if (isMultiVal) {
+            labelMpas[item[labelProp]] = item;
+          } else if (item[labelProp] == cellValue) {
+            xeUtils.set(row, field, item[valueProp]);
+            return;
+          }
+        }
+      }
+    } else {
+      if (options) {
+        for (let i = 0; i < options.length; i++) {
+          const item = options[i];
+          if (isMultiVal) {
+            labelMpas[item[labelProp]] = item;
+          } else if (item[labelProp] == cellValue) {
+            xeUtils.set(row, field, item[valueProp]);
+            return;
+          }
+        }
+      }
+    }
+    if (isMultiVal) {
+      xeUtils.set(row, field, (isMultiVal ? cellValue.split(",") : [cellValue]).map((label) => {
+        const item = labelMpas[label];
+        return item ? item[valueProp] : label;
+      }));
+    } else {
+      xeUtils.set(row, field, cellValue);
+    }
+  }
+}
+function handleFormatTreeSelect(renderOpts, params) {
+  const { cellValue } = params;
+  return handleTreeSelectCellValue(cellValue, renderOpts);
+}
+function handleSetTreeSelectValue(renderOpts, params) {
+  const { row, column, cellValue } = params;
+  const { field } = column;
+  if (field) {
+    const { options, optionProps = {} } = renderOpts;
+    const labelProp = optionProps.label || "label";
+    const valueProp = optionProps.value || "value";
+    const childrenProp = optionProps.children || "children";
+    const matchRest = xeUtils.findTree(options || [], (item) => xeUtils.get(item, labelProp) === cellValue, { children: childrenProp });
+    if (matchRest) {
+      const selectItem = matchRest.item;
+      if (selectItem) {
+        xeUtils.set(row, field, selectItem[valueProp]);
+        return;
+      }
+    }
+    xeUtils.set(row, field, cellValue);
+  }
+}
 renderer$1.mixin({
   input: {
     tableAutoFocus: "input",
@@ -19235,6 +19398,9 @@ renderer$1.mixin({
         return h("select", Object.assign(Object.assign({ key: oIndex, class: "vxe-default-select" }, getNativeAttrs(renderOpts)), getNativeFilterOns(renderOpts, params, option)), renderOpts.optionGroups ? renderNativeOptgroups(renderOpts, params, renderNativeOptions) : renderNativeOptions(renderOpts.options, renderOpts, params));
       });
     },
+    tableCellFormatter: handleFormatSelect,
+    tableCellCopyMethod: handleFormatSelect,
+    tableCellPasteMethod: handleSetSelectValue,
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
@@ -19457,6 +19623,9 @@ renderer$1.mixin({
       const optionValue = option.data;
       return h(getDefaultComponent(renderOpts), Object.assign(Object.assign({}, getCellEditFilterProps(renderOpts, params, optionValue, { options, optionProps, optionGroups, optionGroupProps })), getFloatingFilterOns(renderOpts, params, option)));
     },
+    tableCellFormatter: handleFormatSelect,
+    tableCellCopyMethod: handleFormatSelect,
+    tableCellPasteMethod: handleSetSelectValue,
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
@@ -19490,6 +19659,9 @@ renderer$1.mixin({
     renderTableDefault(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
     },
+    tableCellFormatter: handleFormatSelect,
+    tableCellCopyMethod: handleFormatSelect,
+    tableCellPasteMethod: handleSetSelectValue,
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
@@ -19499,6 +19671,9 @@ renderer$1.mixin({
     renderTableCell(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     },
+    tableCellFormatter: handleFormatTreeSelect,
+    tableCellCopyMethod: handleFormatTreeSelect,
+    tableCellPasteMethod: handleSetTreeSelectValue,
     tableExportMethod: handleExportTreeSelectMethod
   },
   formatTree: {
@@ -19510,6 +19685,9 @@ renderer$1.mixin({
     renderTableDefault(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     },
+    tableCellFormatter: handleFormatTreeSelect,
+    tableCellCopyMethod: handleFormatTreeSelect,
+    tableCellPasteMethod: handleSetTreeSelectValue,
     tableExportMethod: handleExportTreeSelectMethod
   },
   VxeTableSelect: {
@@ -19518,6 +19696,9 @@ renderer$1.mixin({
     renderTableCell(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     },
+    tableCellFormatter: handleFormatTreeSelect,
+    tableCellCopyMethod: handleFormatTreeSelect,
+    tableCellPasteMethod: handleSetTreeSelectValue,
     tableExportMethod: handleExportTreeSelectMethod
   },
   VxeColorPicker: {
@@ -19690,6 +19871,7 @@ const supportMaxRow = 5e6;
 const customStorageKey = "VXE_CUSTOM_STORE";
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
+const sourceType = "table";
 let crossTableDragRowObj = null;
 const VxeTableComponent = defineVxeComponent({
   name: "VxeTable",
@@ -20408,6 +20590,13 @@ const VxeTableComponent = defineVxeComponent({
       });
       return rgColumns;
     });
+    const computeAggFuncColumns = computed(() => {
+      const { rowGroupList, tableColumn } = reactData;
+      if (rowGroupList.length) {
+        return tableColumn.filter((column) => column.aggFunc);
+      }
+      return [];
+    });
     const refMaps = {
       refElem,
       refTooltip,
@@ -20507,6 +20696,7 @@ const VxeTableComponent = defineVxeComponent({
       computeVirtualScrollBars,
       computeRowGroupFields,
       computeRowGroupColumns,
+      computeAggFuncColumns,
       computeFNROpts,
       computeSXOpts,
       computeSYOpts
@@ -21586,8 +21776,29 @@ const VxeTableComponent = defineVxeComponent({
       }
     };
     const getOrderField = (column) => {
-      const { sortBy: sortBy2, sortType } = column;
-      return (row) => {
+      const { isRowGroupStatus } = reactData;
+      const { sortBy: sortBy2, sortType, aggFunc } = column;
+      return isRowGroupStatus && aggFunc ? (row) => {
+        if (row.isAggregate) {
+          const aggData = row.aggData;
+          const currAggData = aggData ? aggData[column.field] : null;
+          return currAggData ? currAggData.value : null;
+        }
+        let cellValue;
+        if (sortBy2) {
+          cellValue = xeUtils.isFunction(sortBy2) ? sortBy2({ row, column }) : xeUtils.get(row, sortBy2);
+        } else {
+          cellValue = tableMethods.getCellLabel(row, column);
+        }
+        if (!sortType || sortType === "auto") {
+          return isNaN(cellValue) ? cellValue : xeUtils.toNumber(cellValue);
+        } else if (sortType === "number") {
+          return xeUtils.toNumber(cellValue);
+        } else if (sortType === "string") {
+          return xeUtils.toValueString(cellValue);
+        }
+        return cellValue;
+      } : (row) => {
         let cellValue;
         if (sortBy2) {
           cellValue = xeUtils.isFunction(sortBy2) ? sortBy2({ row, column }) : xeUtils.get(row, sortBy2);
@@ -22768,8 +22979,11 @@ const VxeTableComponent = defineVxeComponent({
       handleUpdateAggValues();
     };
     const handleeGroupSummary = (aggList) => {
+      const { fullColumnFieldData } = internalData;
       const aggregateOpts = computeAggregateOpts.value;
+      const aggFuncColumns = computeAggFuncColumns.value;
       const { mapChildrenField } = aggregateOpts;
+      const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
       if (mapChildrenField) {
         xeUtils.lastEach(aggList, (aggRow) => {
           let count = 0;
@@ -22784,6 +22998,53 @@ const VxeTableComponent = defineVxeComponent({
         });
         if ($xeTable.handlePivotTableAggregateData) {
           $xeTable.handlePivotTableAggregateData(aggList);
+        } else {
+          if (aggFuncColumns.length) {
+            xeUtils.lastEach(aggList, (aggRow) => {
+              const aggDtObj = {};
+              const aggData = aggRow.aggData;
+              const groupField = aggRow.groupField;
+              const groupContent = aggRow.groupContent;
+              const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
+              const childCount = aggRow.childCount;
+              const colRest = fullColumnFieldData[groupField] || {};
+              aggFuncColumns.forEach((column) => {
+                const { field } = column;
+                const currAggData = aggData ? aggData[field] : null;
+                const ctParams = {
+                  $table: $xeTable,
+                  groupField,
+                  groupColumn: colRest ? colRest.column : null,
+                  column,
+                  groupValue: groupContent,
+                  childList,
+                  childCount,
+                  aggValue: currAggData ? currAggData.value : 0,
+                  children: childList,
+                  totalValue: childCount
+                };
+                let aggVal = 0;
+                if (childList.length && childList[0].isAggregate) {
+                  xeUtils.each(childList, (row) => {
+                    if (row.isAggregate) {
+                      const currAggData2 = row.aggData[field];
+                      if (currAggData2) {
+                        aggVal += currAggData2.value;
+                      }
+                    }
+                  });
+                } else {
+                  aggVal = aggCalcMethod ? aggCalcMethod(ctParams) : aggRow.childCount;
+                }
+                aggDtObj[field] = {
+                  type: "count",
+                  value: aggVal,
+                  label: aggVal
+                };
+              });
+              aggRow.aggData = aggDtObj;
+            });
+          }
         }
       }
     };
@@ -23032,7 +23293,7 @@ const VxeTableComponent = defineVxeComponent({
                 handleRecalculateStyle(false, true, true);
                 updateRowOffsetTop();
                 updateTreeLineStyle();
-                resolve();
+                nextTick(() => resolve());
               });
             } else {
               setTimeout(() => {
@@ -23040,7 +23301,7 @@ const VxeTableComponent = defineVxeComponent({
                   handleRecalculateStyle(false, true, true);
                   updateRowOffsetTop();
                   updateTreeLineStyle();
-                  resolve();
+                  nextTick(() => resolve());
                 });
               });
             }
@@ -23530,6 +23791,43 @@ const VxeTableComponent = defineVxeComponent({
         loadScrollYData();
       }, fpsTime);
     };
+    const handleSyncScroll = (isRollX, isRollY) => {
+      const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
+      internalData.lcsRunTime = Date.now();
+      internalData.lcsTimeout = void 0;
+      internalData.intoRunScroll = false;
+      internalData.inVirtualScroll = false;
+      internalData.inWheelScroll = false;
+      internalData.inHeaderScroll = false;
+      internalData.inBodyScroll = false;
+      internalData.inFooterScroll = false;
+      reactData.lazScrollLoading = false;
+      internalData.scrollRenderType = "";
+      let xRest = null;
+      let yRest = null;
+      if (!isAllOverflow) {
+        calcCellHeight();
+        updateRowOffsetTop();
+      }
+      if (isRollX && scrollXLoad) {
+        xRest = $xeTable.updateScrollXData();
+      }
+      if (isRollY && scrollYLoad) {
+        yRest = $xeTable.updateScrollYData().then(() => {
+          if (!isAllOverflow) {
+            calcCellHeight();
+            updateRowOffsetTop();
+          }
+          return $xeTable.updateScrollYSpace();
+        });
+      }
+      updateRowExpandStyle();
+      return Promise.all([
+        xRest,
+        yRest,
+        $xeTable.updateCellAreas()
+      ]);
+    };
     const checkLastSyncScroll = (isRollX, isRollY) => {
       const { lcsTimeout } = internalData;
       reactData.lazScrollLoading = true;
@@ -23537,35 +23835,16 @@ const VxeTableComponent = defineVxeComponent({
         clearTimeout(lcsTimeout);
       }
       internalData.lcsTimeout = setTimeout(() => {
-        const { scrollXLoad, scrollYLoad, isAllOverflow } = reactData;
-        internalData.lcsRunTime = Date.now();
-        internalData.lcsTimeout = void 0;
-        internalData.intoRunScroll = false;
-        internalData.inVirtualScroll = false;
-        internalData.inWheelScroll = false;
-        internalData.inHeaderScroll = false;
-        internalData.inBodyScroll = false;
-        internalData.inFooterScroll = false;
-        reactData.lazScrollLoading = false;
-        internalData.scrollRenderType = "";
-        if (!isAllOverflow) {
-          calcCellHeight();
-          updateRowOffsetTop();
-        }
-        if (isRollX && scrollXLoad) {
-          $xeTable.updateScrollXData();
-        }
-        if (isRollY && scrollYLoad) {
-          $xeTable.updateScrollYData().then(() => {
-            if (!isAllOverflow) {
-              calcCellHeight();
-              updateRowOffsetTop();
-            }
-            $xeTable.updateScrollYSpace();
-          });
-        }
-        updateRowExpandStyle();
-        $xeTable.updateCellAreas();
+        handleSyncScroll(isRollX, isRollY).then(() => {
+          if (reactData.scrollXLoad || reactData.scrollYLoad) {
+            nextTick(() => {
+              updateRowExpandStyle();
+              if (!internalData.lcsTimeout) {
+                handleSyncScroll(isRollX, isRollY);
+              }
+            });
+          }
+        });
       }, 200);
     };
     const getWheelSpeed = (lastScrollTime) => {
@@ -23834,6 +24113,33 @@ const VxeTableComponent = defineVxeComponent({
         rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
       }
     };
+    const handleColumnVisible = (visible) => {
+      return function(fieldOrColumn) {
+        let status = false;
+        const cols = xeUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        cols.forEach((item) => {
+          const column = handleFieldOrColumn($xeTable, item);
+          if (column) {
+            if (column.children && column.children.length) {
+              xeUtils.eachTree([column], (item2) => {
+                item2.visible = visible;
+                item2.renderVisible = visible;
+              });
+            } else {
+              column.visible = visible;
+              column.renderVisible = visible;
+            }
+            if (!status) {
+              status = true;
+            }
+          }
+        });
+        if (status) {
+          return $xeTable.handleCustom();
+        }
+        return nextTick();
+      };
+    };
     tableMethods = {
       dispatchEvent,
       getEl() {
@@ -23915,15 +24221,15 @@ const VxeTableComponent = defineVxeComponent({
           if ($xeTable.isAggregateRecord(row)) {
             return nextTick();
           }
-          const oRow = sourceDataRowIdData[getRowid($xeTable, row)];
+          const rowkey = getRowkey($xeTable);
+          const rowid = xeUtils.get(row, rowkey);
+          const oRow = sourceDataRowIdData[rowid];
           if (oRow && row) {
             if (field) {
               const newValue = xeUtils.clone(xeUtils.get(record || row, field), true);
               xeUtils.set(row, field, newValue);
               xeUtils.set(oRow, field, newValue);
             } else {
-              const rowkey = getRowkey($xeTable);
-              const rowid = getRowid($xeTable, row);
               const newRecord = xeUtils.clone(Object.assign({}, record), true);
               xeUtils.set(newRecord, rowkey, rowid);
               xeUtils.destructuring(oRow, Object.assign(row, newRecord));
@@ -24176,10 +24482,14 @@ const VxeTableComponent = defineVxeComponent({
         if (!column) {
           return null;
         }
-        const { formatter } = column;
+        const { editConfig } = props;
+        const { formatter, editRender, cellRender } = column;
+        const renderOpts = formatter ? null : editConfig && isEnableConf(editRender) ? editRender : isEnableConf(cellRender) ? cellRender : null;
+        const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
+        const tcFormatter = compConf ? compConf.tableCellFormatter : null;
         const cellValue = getCellValue(row, column);
         let cellLabel = cellValue;
-        if (formatter) {
+        if (formatter || tcFormatter) {
           let formatData;
           const { fullAllDataRowIdData } = internalData;
           const rowid = getRowid($xeTable, row);
@@ -24197,22 +24507,27 @@ const VxeTableComponent = defineVxeComponent({
             }
           }
           const formatParams = {
+            $table: $xeTable,
             cellValue,
             row,
             rowIndex: $xeTable.getRowIndex(row),
             column,
             columnIndex: $xeTable.getColumnIndex(column)
           };
-          if (xeUtils.isString(formatter)) {
-            const gFormatOpts = formats.get(formatter);
-            const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
-            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : "";
-          } else if (xeUtils.isArray(formatter)) {
-            const gFormatOpts = formats.get(formatter[0]);
-            const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
-            cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : "";
-          } else {
-            cellLabel = formatter(formatParams);
+          if (formatter) {
+            if (xeUtils.isString(formatter)) {
+              const gFormatOpts = formats.get(formatter);
+              const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
+              cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : "";
+            } else if (xeUtils.isArray(formatter)) {
+              const gFormatOpts = formats.get(formatter[0]);
+              const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
+              cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : "";
+            } else {
+              cellLabel = `${formatter(formatParams)}`;
+            }
+          } else if (renderOpts && tcFormatter) {
+            cellLabel = `${tcFormatter(renderOpts, formatParams)}`;
           }
           if (formatData) {
             formatData[colid] = { value: cellValue, label: cellLabel };
@@ -24257,6 +24572,7 @@ const VxeTableComponent = defineVxeComponent({
             }
           }
           const footerFormatParams = {
+            $table: $xeTable,
             cellValue: itemValue,
             itemValue,
             row,
@@ -24422,7 +24738,6 @@ const VxeTableComponent = defineVxeComponent({
           }
         }
         const rest = $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
-        clearRowDragData();
         return rest;
       },
       getFullColumns() {
@@ -24623,40 +24938,8 @@ const VxeTableComponent = defineVxeComponent({
         }
         return nextTick();
       },
-      hideColumn(fieldOrColumn) {
-        let status = false;
-        const cols = xeUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-        cols.forEach((item) => {
-          const column = handleFieldOrColumn($xeTable, item);
-          if (column && column.visible) {
-            column.visible = false;
-            if (!status) {
-              status = true;
-            }
-          }
-        });
-        if (status) {
-          return tablePrivateMethods.handleCustom();
-        }
-        return nextTick();
-      },
-      showColumn(fieldOrColumn) {
-        let status = false;
-        const cols = xeUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-        cols.forEach((item) => {
-          const column = handleFieldOrColumn($xeTable, item);
-          if (column && !column.visible) {
-            column.visible = true;
-            if (!status) {
-              status = true;
-            }
-          }
-        });
-        if (status) {
-          return tablePrivateMethods.handleCustom();
-        }
-        return nextTick();
-      },
+      hideColumn: handleColumnVisible(false),
+      showColumn: handleColumnVisible(true),
       setColumnWidth(fieldOrColumn, width) {
         const { elemStore } = internalData;
         let status = false;
@@ -25714,6 +25997,10 @@ const VxeTableComponent = defineVxeComponent({
         const { isRowGroupStatus } = reactData;
         return isRowGroupStatus && row && row.isAggregate && childrenField && mapChildrenField ? row[mapChildrenField] || [] : [];
       },
+      refreshAggregateCalcValues() {
+        updateGroupData();
+        return nextTick();
+      },
       isAggregateExpandByRow(row) {
         const { rowGroupExpandedFlag } = reactData;
         const { rowGroupExpandedMaps } = internalData;
@@ -27044,6 +27331,15 @@ const VxeTableComponent = defineVxeComponent({
       reactData.dragRow = null;
       reactData.dragCol = null;
     };
+    const clearColDragData = () => {
+      const el = refElem.value;
+      hideDropTip();
+      clearColDropOrigin();
+      clearColAnimate(el, [".vxe-table--column"]);
+      internalData.prevDragToChild = false;
+      reactData.dragRow = null;
+      reactData.dragCol = null;
+    };
     const handleTooltip = (evnt, tipOpts, type, tdEl, overflowElem, tipElem, params) => {
       const tipOverEl = overflowElem || tdEl;
       if (!tipOverEl) {
@@ -28063,7 +28359,7 @@ const VxeTableComponent = defineVxeComponent({
         reactData.mergeFootFlag++;
       },
       handleAggregateSummaryData() {
-        return updateGroupData();
+        return $xeTable.refreshAggregateCalcValues();
       },
       triggerHeaderTitleEvent(evnt, iconParams, params) {
         const tipContent = iconParams.content || iconParams.message;
@@ -28683,6 +28979,8 @@ const VxeTableComponent = defineVxeComponent({
           const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
           return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
             if (!status) {
+              clearRowDragData();
+              clearCrossTableDragStatus();
               return errRest;
             }
             const dragRowid = getRowid($xeTable, dragRow);
@@ -28792,6 +29090,8 @@ const VxeTableComponent = defineVxeComponent({
               afterFullData.splice(nafIndex, 0, dragRow);
               tableFullData.splice(ntfIndex, 0, dragRow);
             }
+            clearRowDragData();
+            clearCrossTableDragStatus();
             $xeTable.handleTableData(treeConfig && transform);
             $xeTable.cacheRowMap(false);
             updateScrollYStatus();
@@ -28892,8 +29192,14 @@ const VxeTableComponent = defineVxeComponent({
             return errRest;
           });
         }
+        clearRowDragData();
+        clearCrossTableDragStatus();
         return Promise.resolve(errRest);
       },
+      handleCrossTableRowDragCancelEvent() {
+        clearRowDragData();
+        clearCrossTableDragStatus();
+      },
       handleCrossTableRowDragFinishEvent(evnt) {
         const { tableData } = reactData;
         const { fullAllDataRowIdData } = internalData;
@@ -29011,6 +29317,13 @@ const VxeTableComponent = defineVxeComponent({
             };
             Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
               if (!status) {
+                if ($oldTable) {
+                  if ($oldTable.xID !== $xeTable.xID) {
+                    $oldTable.handleCrossTableRowDragCancelEvent(evnt);
+                  }
+                }
+                clearRowDragData();
+                clearCrossTableDragStatus();
                 return errRest;
               }
               let insertRest = Promise.resolve();
@@ -29132,8 +29445,6 @@ const VxeTableComponent = defineVxeComponent({
         } else {
           $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
         }
-        clearRowDragData();
-        clearCrossTableDragStatus();
       },
       handleRowDragDragoverEvent(evnt) {
         const { treeConfig } = props;
@@ -29272,6 +29583,8 @@ const VxeTableComponent = defineVxeComponent({
           const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
           return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
             if (!status) {
+              clearColDragData();
+              clearCrossTableDragStatus();
               return errRest;
             }
             let dragTargetColumn = null;
@@ -29398,6 +29711,8 @@ const VxeTableComponent = defineVxeComponent({
                 $xeTable.clearCopyCellArea();
               }
             }
+            clearColDragData();
+            clearCrossTableDragStatus();
             if (evnt) {
               dispatchEvent("column-dragend", {
                 oldColumn: dragColumn,
@@ -29497,20 +29812,14 @@ const VxeTableComponent = defineVxeComponent({
             return errRest;
           });
         }
+        clearColDragData();
+        clearCrossTableDragStatus();
         return Promise.resolve(errRest);
       },
       handleHeaderCellDragDragendEvent(evnt) {
         const { dragCol } = reactData;
         const { prevDragCol, prevDragPos, prevDragToChild } = internalData;
-        const el = refElem.value;
         $xeTable.handleColDragSwapEvent(evnt, true, dragCol, prevDragCol, prevDragPos, prevDragToChild);
-        hideDropTip();
-        clearColDropOrigin();
-        clearColAnimate(el, [".vxe-table--column"]);
-        internalData.prevDragToChild = false;
-        reactData.dragRow = null;
-        reactData.dragCol = null;
-        clearCrossTableDragStatus();
       },
       handleHeaderCellDragDragoverEvent(evnt) {
         const { dragCol } = reactData;
@@ -29669,6 +29978,7 @@ const VxeTableComponent = defineVxeComponent({
         }
         reactData.lastScrollTime = Date.now();
         const evntParams = Object.assign({
+          source: sourceType,
           scrollTop,
           scrollLeft,
           bodyHeight,
@@ -30315,7 +30625,7 @@ const VxeTableComponent = defineVxeComponent({
           $xeGanttView.handleUpdateSYSpace();
         }
         return nextTick().then(() => {
-          updateStyle();
+          return updateStyle();
         });
       },
       updateScrollXData() {
@@ -30880,7 +31190,8 @@ const VxeTableComponent = defineVxeComponent({
         h("div", {
           key: "tn",
           ref: refEmptyPlaceholder,
-          class: "vxe-table--empty-place-wrapper"
+          class: "vxe-table--empty-place-wrapper",
+          xid: xID
         }, [
           h("div", {
             class: "vxe-table--empty-placeholder"
@@ -31263,7 +31574,7 @@ const VxeTableComponent = defineVxeComponent({
       }
       handleUpdateRowGroup(groupFields);
       nextTick(() => {
-        const { exportConfig, importConfig, treeConfig, highlightCurrentRow, highlightCurrentColumn } = props;
+        const { exportConfig, importConfig, treeConfig } = props;
         const { scrollXStore, scrollYStore } = internalData;
         const editOpts = computeEditOpts.value;
         const treeOpts = computeTreeOpts.value;
@@ -31275,9 +31586,6 @@ const VxeTableComponent = defineVxeComponent({
         const mouseOpts = computeMouseOpts.value;
         const exportOpts = computeExportOpts.value;
         const importOpts = computeImportOpts.value;
-        const currentRowOpts = computeCurrentRowOpts.value;
-        const currentColumnOpts = computeCurrentColumnOpts.value;
-        const keyboardOpts = computeKeyboardOpts.value;
         const aggregateOpts2 = computeAggregateOpts.value;
         const rowDragOpts = computeRowDragOpts.value;
         if (props.rowId) {
@@ -31420,12 +31728,6 @@ const VxeTableComponent = defineVxeComponent({
         if (columnOpts.currentMethod) {
           warnLog("vxe.error.delProp", ["row-config.currentMethod", "current-column-config.beforeSelectMethod"]);
         }
-        if ((rowOpts2.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !xeUtils.isBoolean(currentRowOpts.isFollowSelected)) {
-          warnLog("vxe.error.notConflictProp", ["row-config.isCurrent", "current-row-config.isFollowSelected"]);
-        }
-        if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !xeUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
-          warnLog("vxe.error.notConflictProp", ["column-config.isCurrent", "current-column-config.isFollowSelected"]);
-        }
         Object.assign(scrollYStore, {
           startIndex: 0,
           endIndex: 0,
@@ -31481,6 +31783,7 @@ const VxeTableComponent = defineVxeComponent({
       if (resizeObserver) {
         resizeObserver.disconnect();
       }
+      $xeTable.closeTooltip();
       tableMethods.closeFilter();
       if ($xeTable.closeMenu) {
         $xeTable.closeMenu();
@@ -31794,9 +32097,9 @@ function updateMenuTreeOrder(params) {
     data: params
   });
 }
-const _hoisted_1$n = { class: "add-menu" };
+const _hoisted_1$m = { class: "add-menu" };
 const _hoisted_2$d = { class: "actions-wrap" };
-const _sfc_main$K = /* @__PURE__ */ defineComponent({
+const _sfc_main$I = /* @__PURE__ */ defineComponent({
   __name: "AddMenu",
   props: {
     data: {
@@ -31867,7 +32170,7 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
       const _component_a_form = Form;
       const _component_a_button = Button$1;
       const _component_a_space = Space;
-      return openBlock(), createElementBlock("div", _hoisted_1$n, [
+      return openBlock(), createElementBlock("div", _hoisted_1$m, [
         createVNode(_component_a_form, {
           model: formState.value,
           ref_key: "formRef",
@@ -31884,7 +32187,8 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
                 createVNode(_component_a_input, {
                   placeholder: _ctx.$t("uc_common.plsEnter"),
                   value: formState.value.funName,
-                  "onUpdate:value": _cache[0] || (_cache[0] = ($event) => formState.value.funName = $event)
+                  "onUpdate:value": _cache[0] || (_cache[0] = ($event) => formState.value.funName = $event),
+                  autocomplete: "off"
                 }, null, 8, ["placeholder", "value"])
               ]),
               _: 1
@@ -31898,7 +32202,8 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
                 createVNode(_component_a_input, {
                   placeholder: _ctx.$t("uc_common.plsEnter"),
                   value: formState.value.url,
-                  "onUpdate:value": _cache[1] || (_cache[1] = ($event) => formState.value.url = $event)
+                  "onUpdate:value": _cache[1] || (_cache[1] = ($event) => formState.value.url = $event),
+                  autocomplete: "off"
                 }, null, 8, ["placeholder", "value"])
               ]),
               _: 1
@@ -31911,7 +32216,8 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
                 createVNode(_component_a_input, {
                   placeholder: _ctx.$t("uc_common.plsEnter"),
                   value: formState.value.image,
-                  "onUpdate:value": _cache[2] || (_cache[2] = ($event) => formState.value.image = $event)
+                  "onUpdate:value": _cache[2] || (_cache[2] = ($event) => formState.value.image = $event),
+                  autocomplete: "off"
                 }, null, 8, ["placeholder", "value"])
               ]),
               _: 1
@@ -31981,14 +32287,14 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const AddMenu = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__scopeId", "data-v-1d0da3f2"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/functions/AddMenu.vue"]]);
+const AddMenu = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__scopeId", "data-v-1d0da3f2"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/functions/AddMenu.vue"]]);
 const cssvar = "";
-const _hoisted_1$m = { class: "sys-functions" };
+const _hoisted_1$l = { class: "sys-functions" };
 const _hoisted_2$c = {
   key: 0,
   class: "left-syslist"
 };
-const _hoisted_3$a = { class: "page-title" };
+const _hoisted_3$9 = { class: "page-title" };
 const _hoisted_4$8 = ["onClick"];
 const _hoisted_5$5 = ["src"];
 const _hoisted_6$5 = { class: "sys-item-name" };
@@ -32004,7 +32310,7 @@ const _hoisted_10$4 = {
 };
 const _hoisted_11$4 = { class: "no-data-text" };
 const _hoisted_12$4 = { style: { "height": "32px", "margin-bottom": "10px" } };
-const _sfc_main$J = /* @__PURE__ */ defineComponent({
+const _sfc_main$H = /* @__PURE__ */ defineComponent({
   __name: "index",
   setup(__props) {
     const { t: t2 } = useI18n();
@@ -32307,9 +32613,9 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
         prefixCls: unref(prefixCls)
       }, {
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$m, [
+          createElementVNode("div", _hoisted_1$l, [
             unref(systemId) === "usercenter" ? (openBlock(), createElementBlock("div", _hoisted_2$c, [
-              createElementVNode("div", _hoisted_3$a, toDisplayString(_ctx.$t("uc_fun.syslist")), 1),
+              createElementVNode("div", _hoisted_3$9, toDisplayString(_ctx.$t("uc_fun.syslist")), 1),
               (openBlock(true), createElementBlock(Fragment, null, renderList(sysList.value, (item) => {
                 return openBlock(), createElementBlock("div", {
                   class: normalizeClass(["sys-item", { "sys-item-active": selectedSys.value === item.systemId }]),
@@ -32345,6 +32651,7 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
             <a-input\r
               v-model:value="queryParam.funName"\r
               :placeholder="$t('uc_common.plsEnter')"\r
+              autocomplete="off"\r
             />\r
           </a-form-item>\r
           <a-form-item :label="$t('uc_fun.status')">\r
@@ -32460,7 +32767,7 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
   }
 });
 const index_vue_vue_type_style_index_0_scoped_04710d5f_lang = "";
-const index$8 = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-04710d5f"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/functions/index.vue"]]);
+const index$8 = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__scopeId", "data-v-04710d5f"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/functions/index.vue"]]);
 function usePermissionId() {
   const hasPermissionId = (id) => {
     const hasPermission$1 = hasPermission(id);
@@ -32468,24 +32775,71 @@ function usePermissionId() {
   };
   return { hasPermissionId };
 }
+function toFormatDate(date, format) {
+  const o = {
+    "M+": date.getMonth() + 1,
+    "d+": date.getDate(),
+    "H+": date.getHours(),
+    "m+": date.getMinutes(),
+    "s+": date.getSeconds(),
+    "q+": Math.floor((date.getMonth() + 3) / 3),
+    S: date.getMilliseconds()
+  };
+  let result = format;
+  if (/(y+)/.test(result)) {
+    result = result.replace(
+      RegExp.$1,
+      (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+    );
+  }
+  for (const k2 in o) {
+    if (new RegExp("(" + k2 + ")").test(result)) {
+      result = result.replace(
+        RegExp.$1,
+        RegExp.$1.length == 1 ? o[k2] : ("00" + o[k2]).substr(("" + o[k2]).length)
+      );
+    }
+  }
+  return result;
+}
+function toUTC(date) {
+  const UTCyear = date.getUTCFullYear();
+  let UTCmonth = date.getUTCMonth() + 1;
+  let UTCday = date.getUTCDate();
+  let UTChours = date.getUTCHours();
+  let UTCmin = date.getUTCMinutes();
+  let UTCseconds = date.getUTCSeconds();
+  UTCmonth = UTCmonth < 10 ? "0" + UTCmonth : UTCmonth;
+  UTCday = UTCday < 10 ? "0" + UTCday : UTCday;
+  UTChours = UTChours < 10 ? "0" + UTChours : UTChours;
+  UTCmin = UTCmin < 10 ? "0" + UTCmin : UTCmin;
+  UTCseconds = UTCseconds < 10 ? "0" + UTCseconds : UTCseconds;
+  return UTCyear + "-" + UTCmonth + "-" + UTCday + "T" + UTChours + ":" + UTCmin + ":" + UTCseconds + ".000+0000";
+}
+function getOffset(timezone) {
+  let offset = timezone.substr(7);
+  if (!offset) {
+    offset = 0;
+  } else {
+    offset = offset * 1;
+  }
+  offset = offset * 60 + new Date().getTimezoneOffset();
+  return offset;
+}
 function useSysParams() {
   const userStore = useUserStore();
-  function formatDate(date, showTime = true) {
-    if (date === null || date === void 0 || date === "") {
+  function formatDate(dateTime, showTime = true) {
+    if (!dateTime) {
       return "";
     }
-    let dateFormat = "YYYY-MM-DD HH:mm:ss";
+    let dateFormat = userStore.dateFormat || "yyyy-MM-dd HH:mm:ss";
     if (!showTime) {
-      dateFormat = "YYYY-MM-DD";
-    } else if (typeof showTime === "string") {
-      dateFormat = showTime;
-    }
-    let d = dayjs(date);
-    const offset = Number(userStore.timezone.replace("Etc/GMT", ""));
-    if (!isNaN(offset)) {
-      d = d.utcOffset(offset * 60);
+      dateFormat = dateFormat.replace(/[H,m,s,:,\s]/g, "");
     }
-    return d.isValid() ? d.format(dateFormat) : date;
+    const date = new Date(dateTime);
+    const offset = getOffset(userStore.timezone || "Etc/GMT");
+    date.setMinutes(date.getMinutes() + offset);
+    return toFormatDate(date, dateFormat);
   }
   function toUtcDate(date) {
     if (date === null || date === void 0 || date === "") {
@@ -32606,8 +32960,8 @@ function getRegionListById(params) {
     params
   });
 }
-const _hoisted_1$l = { class: "textarea-wrapper" };
-const _sfc_main$I = /* @__PURE__ */ defineComponent({
+const _hoisted_1$k = { class: "textarea-wrapper" };
+const _sfc_main$G = /* @__PURE__ */ defineComponent({
   __name: "InputTextarea",
   props: {
     showCount: {
@@ -32640,7 +32994,7 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       const _component_a_textarea = Textarea;
-      return openBlock(), createElementBlock("div", _hoisted_1$l, [
+      return openBlock(), createElementBlock("div", _hoisted_1$k, [
         createVNode(_component_a_textarea, mergeProps(_ctx.$attrs, {
           value: curValue.value,
           "onUpdate:value": _cache[0] || (_cache[0] = ($event) => curValue.value = $event),
@@ -32653,9 +33007,9 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
   }
 });
 const InputTextarea_vue_vue_type_style_index_0_scoped_939f274f_lang = "";
-const InputTextarea = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__scopeId", "data-v-939f274f"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/inhe/input/InputTextarea.vue"]]);
-const _hoisted_1$k = ["spinning"];
-const _sfc_main$H = /* @__PURE__ */ defineComponent({
+const InputTextarea = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__scopeId", "data-v-939f274f"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/inhe/input/InputTextarea.vue"]]);
+const _hoisted_1$j = ["spinning"];
+const _sfc_main$F = /* @__PURE__ */ defineComponent({
   __name: "DeptEdit",
   emits: ["ok"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -32834,6 +33188,7 @@ const _sfc_main$H = /* @__PURE__ */ defineComponent({
                         maxLength: 50,
                         value: form.name,
                         "onUpdate:value": _cache[2] || (_cache[2] = ($event) => form.name = $event),
+                        autocomplete: "off",
                         rules: [{ required: true, message: _ctx.$t("uc_organ.deptName_msg1") }]
                       }, null, 8, ["placeholder", "value", "rules"])
                     ]),
@@ -32861,15 +33216,15 @@ const _sfc_main$H = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }, 8, ["title", "open"])
-        ], 8, _hoisted_1$k)
+        ], 8, _hoisted_1$j)
       ]);
     };
   }
 });
 const DeptEdit_vue_vue_type_style_index_0_scoped_58074060_lang = "";
-const DeptEdit = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__scopeId", "data-v-58074060"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/DeptEdit.vue"]]);
-const _hoisted_1$j = ["spinning"];
-const _sfc_main$G = /* @__PURE__ */ defineComponent({
+const DeptEdit = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__scopeId", "data-v-58074060"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/DeptEdit.vue"]]);
+const _hoisted_1$i = ["spinning"];
+const _sfc_main$E = /* @__PURE__ */ defineComponent({
   __name: "BranchEdit",
   emits: ["ok"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -33061,6 +33416,7 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
                       createVNode(_component_a_input, {
                         placeholder: _ctx.$t("uc_common.plsEnter"),
                         maxLength: 50,
+                        autocomplete: "off",
                         value: form.name,
                         "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.name = $event)
                       }, null, 8, ["placeholder", "value"])
@@ -33076,6 +33432,7 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
                         placeholder: _ctx.$t("uc_common.plsEnter"),
                         value: form.refCode,
                         "onUpdate:value": _cache[2] || (_cache[2] = ($event) => form.refCode = $event),
+                        autocomplete: "off",
                         maxLength: 4
                       }, null, 8, ["placeholder", "value"])
                     ]),
@@ -33103,15 +33460,15 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }, 8, ["title", "open"])
-        ], 8, _hoisted_1$j)
+        ], 8, _hoisted_1$i)
       ]);
     };
   }
 });
 const BranchEdit_vue_vue_type_style_index_0_scoped_db8da10b_lang = "";
-const BranchEdit = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__scopeId", "data-v-db8da10b"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/BranchEdit.vue"]]);
-const _hoisted_1$i = { class: "branch-detail-wrap" };
-const _sfc_main$F = /* @__PURE__ */ defineComponent({
+const BranchEdit = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["__scopeId", "data-v-db8da10b"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/BranchEdit.vue"]]);
+const _hoisted_1$h = { class: "branch-detail-wrap" };
+const _sfc_main$D = /* @__PURE__ */ defineComponent({
   __name: "BranDetail",
   props: {
     type: {
@@ -33149,7 +33506,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_a_descriptions_item = DescriptionsItem;
       const _component_a_descriptions = Descriptions;
-      return openBlock(), createElementBlock("div", _hoisted_1$i, [
+      return openBlock(), createElementBlock("div", _hoisted_1$h, [
         createVNode(_component_a_descriptions, {
           bordered: "",
           column: 2,
@@ -33236,10 +33593,10 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
   }
 });
 const BranDetail_vue_vue_type_style_index_0_scoped_207f1e3e_lang = "";
-const BranDetail = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__scopeId", "data-v-207f1e3e"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/BranDetail.vue"]]);
-const _hoisted_1$h = { class: "pay_info" };
+const BranDetail = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__scopeId", "data-v-207f1e3e"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/BranDetail.vue"]]);
+const _hoisted_1$g = { class: "pay_info" };
 const _hoisted_2$b = { class: "pay_span" };
-const _hoisted_3$9 = { class: "pay_span1" };
+const _hoisted_3$8 = { class: "pay_span1" };
 const _hoisted_4$7 = { class: "pay_span" };
 const _hoisted_5$4 = { class: "pay_span1" };
 const _hoisted_6$4 = { class: "pay_span" };
@@ -33247,13 +33604,14 @@ const _hoisted_7$4 = { class: "pay_span1" };
 const _hoisted_8$4 = { class: "pay_span" };
 const _hoisted_9$4 = { class: "pay_span1" };
 const _hoisted_10$3 = { class: "pay_span" };
-const _hoisted_11$3 = { class: "pay_span" };
-const _hoisted_12$3 = { class: "pay_span1" };
-const _hoisted_13$3 = { class: "pay_span" };
-const _hoisted_14$3 = { class: "pay_span1" };
-const _hoisted_15$3 = { class: "pay_span" };
-const _hoisted_16$3 = { class: "pay_span1" };
-const _hoisted_17$3 = { style: {
+const _hoisted_11$3 = { class: "pay_span1" };
+const _hoisted_12$3 = { class: "pay_span" };
+const _hoisted_13$3 = { class: "pay_span1" };
+const _hoisted_14$3 = { class: "pay_span" };
+const _hoisted_15$3 = { class: "pay_span1" };
+const _hoisted_16$3 = { class: "pay_span" };
+const _hoisted_17$3 = { class: "pay_span1" };
+const _hoisted_18$2 = { style: {
   position: "absolute",
   right: 0,
   bottom: 0,
@@ -33264,9 +33622,10 @@ const _hoisted_17$3 = { style: {
   textAlign: "center",
   zIndex: 1
 } };
-const _sfc_main$E = /* @__PURE__ */ defineComponent({
+const _sfc_main$C = /* @__PURE__ */ defineComponent({
   __name: "DeptDetail",
   setup(__props, { expose: __expose }) {
+    const { formatDate } = useSysParams();
     const visible = ref(false);
     const insertData = reactive({
       parentBranch: "",
@@ -33296,7 +33655,6 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       const _component_a_divider = Divider;
-      const _component_uc_pick_label = resolveComponent("uc-pick-label");
       const _component_a_button = Button$1;
       const _component_a_drawer = Drawer$1;
       return openBlock(), createBlock(_component_a_drawer, {
@@ -33310,9 +33668,9 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           createElementVNode("div", null, [
-            createElementVNode("div", _hoisted_1$h, [
+            createElementVNode("div", _hoisted_1$g, [
               createElementVNode("span", _hoisted_2$b, toDisplayString(_ctx.$t("uc_organ.parentBranch")), 1),
-              createElementVNode("span", _hoisted_3$9, toDisplayString(insertData.parentBranch), 1),
+              createElementVNode("span", _hoisted_3$8, toDisplayString(insertData.parentBranch), 1),
               createElementVNode("span", _hoisted_4$7, toDisplayString(_ctx.$t("uc_organ.superiorRegion")), 1),
               createElementVNode("span", _hoisted_5$4, toDisplayString(insertData.parentRegion), 1),
               createElementVNode("span", _hoisted_6$4, toDisplayString(_ctx.$t("uc_organ.deptName")), 1),
@@ -33325,27 +33683,16 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
               createElementVNode("span", _hoisted_9$4, toDisplayString(insertData.remarks ? insertData.remarks : "--"), 1),
               createVNode(_component_a_divider, { style: { "margin-top": "40px" } }),
               createElementVNode("span", _hoisted_10$3, toDisplayString(_ctx.$t("uc_organ.cdate")), 1),
-              createVNode(_component_uc_pick_label, {
-                class: "pay_span1",
-                defaultValue: insertData.cdate
-              }, null, 8, ["defaultValue"]),
-              createElementVNode("span", _hoisted_11$3, toDisplayString(_ctx.$t("uc_organ.coperator")), 1),
-              createElementVNode("span", _hoisted_12$3, toDisplayString(insertData.coperator), 1),
-              createElementVNode("span", _hoisted_13$3, toDisplayString(_ctx.$t("uc_organ.udate")), 1),
-              withDirectives(createVNode(_component_uc_pick_label, {
-                class: "pay_span1",
-                defaultValue: insertData.udate
-              }, null, 8, ["defaultValue"]), [
-                [vShow, insertData.udate]
-              ]),
-              withDirectives(createElementVNode("span", _hoisted_14$3, toDisplayString("--"), 512), [
-                [vShow, !insertData.udate]
-              ]),
-              createElementVNode("span", _hoisted_15$3, toDisplayString(_ctx.$t("uc_organ.uoperator")), 1),
-              createElementVNode("span", _hoisted_16$3, toDisplayString(insertData.uoperator ? insertData.uoperator : "--"), 1)
+              createElementVNode("span", _hoisted_11$3, toDisplayString(unref(formatDate)(insertData.cdate) || "-"), 1),
+              createElementVNode("span", _hoisted_12$3, toDisplayString(_ctx.$t("uc_organ.coperator")), 1),
+              createElementVNode("span", _hoisted_13$3, toDisplayString(insertData.coperator), 1),
+              createElementVNode("span", _hoisted_14$3, toDisplayString(_ctx.$t("uc_organ.udate")), 1),
+              createElementVNode("span", _hoisted_15$3, toDisplayString(unref(formatDate)(insertData.udate) || "--"), 1),
+              createElementVNode("span", _hoisted_16$3, toDisplayString(_ctx.$t("uc_organ.uoperator")), 1),
+              createElementVNode("span", _hoisted_17$3, toDisplayString(insertData.uoperator ? insertData.uoperator : "--"), 1)
             ])
           ]),
-          createElementVNode("div", _hoisted_17$3, [
+          createElementVNode("div", _hoisted_18$2, [
             createVNode(_component_a_button, {
               onClick: _cache[0] || (_cache[0] = ($event) => onCancel())
             }, {
@@ -33363,7 +33710,7 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
   }
 });
 const DeptDetail_vue_vue_type_style_index_0_scoped_7ab63a77_lang = "";
-const DeptDetail = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["__scopeId", "data-v-7ab63a77"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/DeptDetail.vue"]]);
+const DeptDetail = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["__scopeId", "data-v-7ab63a77"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/DeptDetail.vue"]]);
 function useInitUserinfo() {
   onBeforeMount(async () => {
     var _a;
@@ -33378,9 +33725,9 @@ function useInitUserinfo() {
     }
   });
 }
-const _hoisted_1$g = { class: "organ-wrap" };
+const _hoisted_1$f = { class: "organ-wrap" };
 const _hoisted_2$a = { class: "topInfo" };
-const _hoisted_3$8 = { class: "form-btns" };
+const _hoisted_3$7 = { class: "form-btns" };
 const _hoisted_4$6 = { class: "table-wrap" };
 const _hoisted_5$3 = ["onClick"];
 const _hoisted_6$3 = { class: "show_more_button" };
@@ -33390,7 +33737,7 @@ const _hoisted_9$3 = {
   class: "ant-dropdown-link",
   style: { "color": "rgba(0, 0, 0, 0.25)" }
 };
-const _sfc_main$D = /* @__PURE__ */ defineComponent({
+const _sfc_main$B = /* @__PURE__ */ defineComponent({
   __name: "index",
   setup(__props, { expose: __expose }) {
     const { formatDate } = useSysParams();
@@ -33733,7 +34080,7 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
         prefixCls: unref(prefixCls)
       }, {
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$g, [
+          createElementVNode("div", _hoisted_1$f, [
             createElementVNode("div", _hoisted_2$a, [
               createVNode(_component_a_form, {
                 layout: "vertical",
@@ -33756,7 +34103,7 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   }, 8, ["label"]),
-                  createElementVNode("div", _hoisted_3$8, [
+                  createElementVNode("div", _hoisted_3$7, [
                     createVNode(_component_uc_btn_search, {
                       onClick: queryById,
                       showInput: false
@@ -34164,9 +34511,9 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
   }
 });
 const index_vue_vue_type_style_index_0_scoped_32a76766_lang = "";
-const index$7 = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__scopeId", "data-v-32a76766"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/index.vue"]]);
+const index$7 = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["__scopeId", "data-v-32a76766"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/organ/index.vue"]]);
 const index_vue_vue_type_style_index_0_scoped_6ed6a16f_lang = "";
-const _sfc_main$C = Object.assign({
+const _sfc_main$A = Object.assign({
   inheritAttrs: false
 }, {
   __name: "index",
@@ -34268,7 +34615,7 @@ const _sfc_main$C = Object.assign({
     };
   }
 });
-const STable = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["__scopeId", "data-v-6ed6a16f"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/table/index.vue"]]);
+const STable = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__scopeId", "data-v-6ed6a16f"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/table/index.vue"]]);
 function getSearchList$1(params) {
   return handleRespPost({
     url: "/api/sys/role/search-list",
@@ -34339,54 +34686,56 @@ function createSaveRole(data) {
     data
   });
 }
-const _hoisted_1$f = {
+const _hoisted_1$e = {
   key: 0,
   class: "role-wrap"
 };
 const _hoisted_2$9 = { class: "form-btns" };
-const _hoisted_3$7 = { style: { "height": "32px", "margin-bottom": "10px" } };
-const _hoisted_4$5 = { key: 4 };
-const _hoisted_5$2 = {
+const _hoisted_3$6 = { style: { "height": "32px", "margin-bottom": "10px" } };
+const _hoisted_4$5 = ["onClick"];
+const _hoisted_5$2 = { key: 4 };
+const _hoisted_6$2 = {
   key: 1,
   class: "role-auth"
 };
-const _hoisted_6$2 = { class: "header-auth" };
-const _hoisted_7$2 = {
+const _hoisted_7$2 = { class: "header-auth" };
+const _hoisted_8$2 = {
   class: "title",
   style: { "padding-left": "16px" }
 };
-const _hoisted_8$2 = {
+const _hoisted_9$2 = {
   key: 0,
   class: "operate",
   style: { "padding-right": "16px" }
 };
-const _hoisted_9$2 = { class: "auth-content" };
-const _hoisted_10$2 = { key: 0 };
-const _hoisted_11$2 = { key: 0 };
-const _hoisted_12$2 = { class: "sys-auth" };
-const _hoisted_13$2 = {
+const _hoisted_10$2 = { class: "auth-content" };
+const _hoisted_11$2 = { class: "detail-text" };
+const _hoisted_12$2 = { class: "detail-text" };
+const _hoisted_13$2 = { class: "sys-auth" };
+const _hoisted_14$2 = {
   key: 0,
   class: "sys-tab"
 };
-const _hoisted_14$2 = ["onClick"];
-const _hoisted_15$2 = {
+const _hoisted_15$2 = ["onClick"];
+const _hoisted_16$2 = {
   key: 1,
   class: "permission_config"
 };
-const _hoisted_16$2 = { class: "sys-menu-list" };
-const _hoisted_17$2 = ["onClick"];
-const _hoisted_18$1 = { class: "global-permission" };
-const _hoisted_19$1 = ["id"];
-const _hoisted_20$1 = { class: "module-title" };
-const _hoisted_21$1 = { class: "menu-title" };
-const _hoisted_22$1 = { class: "actions-section" };
-const _hoisted_23$1 = {
+const _hoisted_17$2 = { class: "sys-menu-list" };
+const _hoisted_18$1 = ["onClick"];
+const _hoisted_19$1 = { class: "global-permission" };
+const _hoisted_20$1 = ["id"];
+const _hoisted_21$1 = { class: "module-title" };
+const _hoisted_22$1 = { class: "menu-title" };
+const _hoisted_23$1 = { class: "actions-section" };
+const _hoisted_24$1 = {
   key: 3,
   class: "no-auth-permission"
 };
-const _sfc_main$B = /* @__PURE__ */ defineComponent({
+const _sfc_main$z = /* @__PURE__ */ defineComponent({
   __name: "index",
   setup(__props) {
+    const { hasPermissionId } = usePermissionId();
     const systemId = storage.get("systemId") || "usercenter";
     const appStore = useAppStore();
     const userStore = useUserStore();
@@ -34924,9 +35273,11 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
       const _component_a_button = Button$1;
       const _component_a_form = Form;
       const _component_uc_btn_add = resolveComponent("uc-btn-add");
-      const _component_uc_btn_detail = resolveComponent("uc-btn-detail");
       const _component_uc_btn_switch = resolveComponent("uc-btn-switch");
       const _component_uc_btn_edit = resolveComponent("uc-btn-edit");
+      const _component_a_tooltip = Tooltip;
+      const _component_a_col = Col;
+      const _component_a_row = Row;
       const _component_a_checkbox = Checkbox;
       const _component_a_config_provider = ConfigProvider$1;
       return openBlock(), createBlock(_component_a_config_provider, {
@@ -34937,7 +35288,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
         prefixCls: unref(prefixCls)
       }, {
         default: withCtx(() => [
-          showTable.value ? (openBlock(), createElementBlock("div", _hoisted_1$f, [
+          showTable.value ? (openBlock(), createElementBlock("div", _hoisted_1$e, [
             createVNode(_component_a_form, {
               layout: "vertical",
               class: "query-form"
@@ -34950,8 +35301,9 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                     createVNode(_component_a_input, {
                       value: queryParam.value.roleId,
                       "onUpdate:value": _cache[0] || (_cache[0] = ($event) => queryParam.value.roleId = $event),
-                      placeholder: _ctx.$t("uc_common.plsSearch"),
-                      allowClear: ""
+                      placeholder: _ctx.$t("uc_common.plsEnter"),
+                      allowClear: "",
+                      autocomplete: "off"
                     }, null, 8, ["value", "placeholder"])
                   ]),
                   _: 1
@@ -34963,8 +35315,9 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                     createVNode(_component_a_input, {
                       value: queryParam.value.roleName,
                       "onUpdate:value": _cache[1] || (_cache[1] = ($event) => queryParam.value.roleName = $event),
-                      placeholder: _ctx.$t("uc_common.plsSearch"),
-                      allowClear: ""
+                      placeholder: _ctx.$t("uc_common.plsEnter"),
+                      allowClear: "",
+                      autocomplete: "off"
                     }, null, 8, ["value", "placeholder"])
                   ]),
                   _: 1
@@ -34987,7 +35340,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }),
-            createElementVNode("div", _hoisted_3$7, [
+            createElementVNode("div", _hoisted_3$6, [
               createVNode(_component_uc_btn_add, {
                 onClick: _cache[2] || (_cache[2] = ($event) => handleAddRole()),
                 text: _ctx.$t("uc_role.create_role"),
@@ -35005,12 +35358,15 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
               class: "table-bordered"
             }, {
               bodyCell: withCtx(({ record, column }) => [
-                column.key === "roleName" ? (openBlock(), createBlock(_component_uc_btn_detail, {
-                  key: 0,
-                  onClick: ($event) => handleDetail(record),
-                  type: "link",
-                  text: record.roleName
-                }, null, 8, ["onClick", "text"])) : createCommentVNode("v-if", true),
+                column.key === "roleName" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                  createCommentVNode(' <uc-btn-detail\r\n              @click="handleDetail(record)"\r\n              type="link"\r\n              :text="record.roleName"\r\n            ></uc-btn-detail> '),
+                  unref(hasPermissionId)("005") ? (openBlock(), createElementBlock("div", {
+                    key: 0,
+                    class: "detail-text",
+                    style: { "color": "#165dff", "cursor": "pointer" },
+                    onClick: ($event) => handleDetail(record)
+                  }, toDisplayString(record.roleName), 9, _hoisted_4$5)) : createCommentVNode("v-if", true)
+                ], 64)) : createCommentVNode("v-if", true),
                 column.key === "roleStatus" ? (openBlock(), createBlock(_component_uc_btn_switch, {
                   key: 1,
                   checked: record.checked,
@@ -35022,7 +35378,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                 column.key === "cdate" ? (openBlock(), createElementBlock(Fragment, { key: 3 }, [
                   createTextVNode(toDisplayString(unref(formatDate)(record.cdate) || "-"), 1)
                 ], 64)) : createCommentVNode("v-if", true),
-                column.key === "action" ? (openBlock(), createElementBlock("span", _hoisted_4$5, [
+                column.key === "action" ? (openBlock(), createElementBlock("span", _hoisted_5$2, [
                   createVNode(_component_uc_btn_edit, {
                     onClick: ($event) => handleEdit(record),
                     type: "link"
@@ -35040,16 +35396,16 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }, 8, ["columns"])
-          ])) : (openBlock(), createElementBlock("div", _hoisted_5$2, [
-            createElementVNode("div", _hoisted_6$2, [
-              createElementVNode("div", _hoisted_7$2, [
+          ])) : (openBlock(), createElementBlock("div", _hoisted_6$2, [
+            createElementVNode("div", _hoisted_7$2, [
+              createElementVNode("div", _hoisted_8$2, [
                 createVNode(unref(LeftOutlined), {
                   style: { "font-size": "12px", "margin-right": "4px", "cursor": "pointer" },
                   onClick: handleCancel
                 }),
                 createTextVNode(" " + toDisplayString(isDetail.value ? _ctx.$t("uc_role.detail_role") : isCreate.value ? _ctx.$t("uc_role.create_role") : _ctx.$t("uc_role.edit_role")), 1)
               ]),
-              !isDetail.value ? (openBlock(), createElementBlock("div", _hoisted_8$2, [
+              !isDetail.value ? (openBlock(), createElementBlock("div", _hoisted_9$2, [
                 createVNode(_component_a_button, { onClick: handleCancel }, {
                   default: withCtx(() => [
                     createTextVNode(toDisplayString(_ctx.$t("uc_common.btnCancel")), 1)
@@ -35068,73 +35424,107 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                 })
               ])) : createCommentVNode("v-if", true)
             ]),
-            createElementVNode("div", _hoisted_9$2, [
+            createElementVNode("div", _hoisted_10$2, [
               createVNode(_component_a_form, {
                 layout: "vertical",
-                class: "query-form",
                 model: formState.value,
                 ref_key: "formRef",
-                ref: formRef
+                ref: formRef,
+                style: { "margin-top": "4px" }
               }, {
                 default: withCtx(() => [
-                  createVNode(_component_a_form_item, {
-                    label: _ctx.$t("uc_role.role_name"),
-                    required: "",
-                    name: "roleName"
-                  }, {
+                  createVNode(_component_a_row, { gutter: 24 }, {
                     default: withCtx(() => [
-                      isDetail.value ? (openBlock(), createElementBlock("span", _hoisted_10$2, toDisplayString(formState.value.roleName), 1)) : (openBlock(), createBlock(_component_a_input, {
-                        key: 1,
-                        value: formState.value.roleName,
-                        "onUpdate:value": _cache[3] || (_cache[3] = ($event) => formState.value.roleName = $event),
-                        placeholder: _ctx.$t("uc_common.plsEnter"),
-                        maxlength: 120
-                      }, null, 8, ["value", "placeholder"]))
-                    ]),
-                    _: 1
-                  }, 8, ["label"]),
-                  createVNode(_component_a_form_item, {
-                    label: _ctx.$t("uc_role.remark"),
-                    width: "100%",
-                    name: "remark"
-                  }, {
-                    default: withCtx(() => [
-                      isDetail.value ? (openBlock(), createElementBlock("span", _hoisted_11$2, toDisplayString(formState.value.remark), 1)) : (openBlock(), createBlock(_component_a_input, {
-                        key: 1,
-                        value: formState.value.remark,
-                        "onUpdate:value": _cache[4] || (_cache[4] = ($event) => formState.value.remark = $event),
-                        placeholder: _ctx.$t("uc_common.plsEnter")
-                      }, null, 8, ["value", "placeholder"]))
+                      createVNode(_component_a_col, { span: 6 }, {
+                        default: withCtx(() => [
+                          createVNode(_component_a_form_item, {
+                            label: _ctx.$t("uc_role.role_name"),
+                            required: "",
+                            name: "roleName"
+                          }, {
+                            default: withCtx(() => [
+                              isDetail.value ? (openBlock(), createBlock(_component_a_tooltip, { key: 0 }, {
+                                title: withCtx(() => [
+                                  createTextVNode(toDisplayString(formState.value.roleName), 1)
+                                ]),
+                                default: withCtx(() => [
+                                  createElementVNode("span", _hoisted_11$2, toDisplayString(formState.value.roleName), 1)
+                                ]),
+                                _: 1
+                              })) : (openBlock(), createBlock(_component_a_input, {
+                                key: 1,
+                                value: formState.value.roleName,
+                                "onUpdate:value": _cache[3] || (_cache[3] = ($event) => formState.value.roleName = $event),
+                                placeholder: _ctx.$t("uc_common.plsEnter"),
+                                maxlength: 100,
+                                autocomplete: "off"
+                              }, null, 8, ["value", "placeholder"]))
+                            ]),
+                            _: 1
+                          }, 8, ["label"])
+                        ]),
+                        _: 1
+                      }),
+                      createVNode(_component_a_col, { span: 18 }, {
+                        default: withCtx(() => [
+                          createVNode(_component_a_form_item, {
+                            label: _ctx.$t("uc_role.remark"),
+                            width: "100%",
+                            name: "remark"
+                          }, {
+                            default: withCtx(() => [
+                              isDetail.value ? (openBlock(), createBlock(_component_a_tooltip, { key: 0 }, {
+                                title: withCtx(() => [
+                                  createTextVNode(toDisplayString(formState.value.remark), 1)
+                                ]),
+                                default: withCtx(() => [
+                                  createElementVNode("span", _hoisted_12$2, toDisplayString(formState.value.remark), 1)
+                                ]),
+                                _: 1
+                              })) : (openBlock(), createBlock(_component_a_input, {
+                                key: 1,
+                                value: formState.value.remark,
+                                "onUpdate:value": _cache[4] || (_cache[4] = ($event) => formState.value.remark = $event),
+                                placeholder: _ctx.$t("uc_common.plsEnter"),
+                                maxlength: 255,
+                                autocomplete: "off"
+                              }, null, 8, ["value", "placeholder"]))
+                            ]),
+                            _: 1
+                          }, 8, ["label"])
+                        ]),
+                        _: 1
+                      })
                     ]),
                     _: 1
-                  }, 8, ["label"])
+                  })
                 ]),
                 _: 1
               }, 8, ["model"]),
-              createElementVNode("div", _hoisted_12$2, [
-                unref(systemId) === "usercenter" && tabList.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_13$2, [
+              createElementVNode("div", _hoisted_13$2, [
+                unref(systemId) === "usercenter" && tabList.value.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_14$2, [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(tabList.value, (item) => {
                     return openBlock(), createElementBlock("div", {
                       class: normalizeClass(["tab-item", { "tab-active": item.systemId === activeAuthId.value }]),
                       key: item.systemId,
                       onClick: ($event) => handleTabClick(item)
-                    }, toDisplayString(item.systemName || "-"), 11, _hoisted_14$2);
+                    }, toDisplayString(item.systemName || "-"), 11, _hoisted_15$2);
                   }), 128))
                 ])) : createCommentVNode("v-if", true),
-                unref(systemId) !== "usercenter" ? (openBlock(), createElementBlock("div", _hoisted_15$2, toDisplayString(_ctx.$t("uc_role.permission_config")), 1)) : createCommentVNode("v-if", true),
+                unref(systemId) !== "usercenter" ? (openBlock(), createElementBlock("div", _hoisted_16$2, toDisplayString(_ctx.$t("uc_role.permission_config")), 1)) : createCommentVNode("v-if", true),
                 menuModules.value.length ? (openBlock(), createElementBlock("div", {
                   key: 2,
                   class: normalizeClass([
                     unref(systemId) === "usercenter" ? "sys-content" : "sys-content-other"
                   ])
                 }, [
-                  createElementVNode("div", _hoisted_16$2, [
+                  createElementVNode("div", _hoisted_17$2, [
                     (openBlock(true), createElementBlock(Fragment, null, renderList(parentMenuList.value, (item) => {
                       return openBlock(), createElementBlock("div", {
                         class: normalizeClass(["sys-menu-item", { active: item.funId === activeMenuId.value }]),
                         onClick: ($event) => handleMenuItemClick(item),
                         key: item.funId
-                      }, toDisplayString(item.funName), 11, _hoisted_17$2);
+                      }, toDisplayString(item.funName), 11, _hoisted_18$1);
                     }), 128))
                   ]),
                   createElementVNode("div", {
@@ -35142,7 +35532,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                     ref_key: "menuAuthRef",
                     ref: menuAuthRef
                   }, [
-                    createElementVNode("div", _hoisted_18$1, [
+                    createElementVNode("div", _hoisted_19$1, [
                       createVNode(_component_a_checkbox, {
                         checked: allPermissionsSelected.value,
                         "onUpdate:checked": _cache[5] || (_cache[5] = ($event) => allPermissionsSelected.value = $event),
@@ -35162,7 +35552,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                         class: "permission-section",
                         id: `module-${module.funId}`
                       }, [
-                        createElementVNode("div", _hoisted_20$1, [
+                        createElementVNode("div", _hoisted_21$1, [
                           createVNode(_component_a_checkbox, {
                             checked: module.selected,
                             "onUpdate:checked": ($event) => module.selected = $event,
@@ -35181,7 +35571,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                             key: menu.funId,
                             class: "menu-section"
                           }, [
-                            createElementVNode("div", _hoisted_21$1, [
+                            createElementVNode("div", _hoisted_22$1, [
                               createVNode(_component_a_checkbox, {
                                 checked: menu.selected,
                                 "onUpdate:checked": ($event) => menu.selected = $event,
@@ -35195,7 +35585,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                                 _: 2
                               }, 1032, ["checked", "onUpdate:checked", "indeterminate", "disabled", "onChange"])
                             ]),
-                            createElementVNode("div", _hoisted_22$1, [
+                            createElementVNode("div", _hoisted_23$1, [
                               (openBlock(true), createElementBlock(Fragment, null, renderList(menu.actionList, (action) => {
                                 return openBlock(), createElementBlock("div", {
                                   key: action.btnId,
@@ -35217,10 +35607,10 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
                             ])
                           ]);
                         }), 128))
-                      ], 8, _hoisted_19$1);
+                      ], 8, _hoisted_20$1);
                     }), 128))
                   ], 512)
-                ], 2)) : (openBlock(), createElementBlock("div", _hoisted_23$1, toDisplayString(_ctx.$t("uc_role.no_auth_permission")), 1))
+                ], 2)) : (openBlock(), createElementBlock("div", _hoisted_24$1, toDisplayString(_ctx.$t("uc_role.no_auth_permission")), 1))
               ])
             ])
           ]))
@@ -35231,7 +35621,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
   }
 });
 const index_vue_vue_type_style_index_0_scoped_79d9b716_lang = "";
-const index$6 = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["__scopeId", "data-v-79d9b716"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/role/index.vue"]]);
+const index$6 = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__scopeId", "data-v-79d9b716"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/role/index.vue"]]);
 function getSearchList(params) {
   return handleRespPost({
     url: "/api/sys/user/search-list",
@@ -35295,7 +35685,7 @@ function setUserResetPwd(params) {
     params
   });
 }
-const _sfc_main$A = /* @__PURE__ */ defineComponent({
+const _sfc_main$y = /* @__PURE__ */ defineComponent({
   __name: "RoleSelect",
   props: {
     mode: {
@@ -35397,8 +35787,8 @@ const _sfc_main$A = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const __unplugin_components_2 = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/RoleSelect.vue"]]);
-const _sfc_main$z = /* @__PURE__ */ defineComponent({
+const __unplugin_components_2 = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/RoleSelect.vue"]]);
+const _sfc_main$x = /* @__PURE__ */ defineComponent({
   __name: "BranchSelect",
   setup(__props) {
     const options = ref([]);
@@ -35423,12 +35813,12 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BranchSelect = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/BranchSelect.vue"]]);
-const _hoisted_1$e = { class: "add-menu" };
+const BranchSelect = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/BranchSelect.vue"]]);
+const _hoisted_1$d = { class: "add-menu" };
 const _hoisted_2$8 = { style: { "font-size": "12px", "color": "#86909c", "margin-left": "8px" } };
-const _hoisted_3$6 = { style: { "font-size": "12px", "color": "#86909c", "margin-left": "8px" } };
+const _hoisted_3$5 = { style: { "font-size": "12px", "color": "#86909c", "margin-left": "8px" } };
 const _hoisted_4$4 = ["onClick"];
-const _sfc_main$y = /* @__PURE__ */ defineComponent({
+const _sfc_main$w = /* @__PURE__ */ defineComponent({
   __name: "UserEdit",
   props: {
     params: {
@@ -35587,7 +35977,7 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
       return roles.value || [];
     });
     const filterOption = (input, option) => {
-      return option.children()[0].children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
     };
     const isAllSelected = computed(() => {
       return rolesList.value.length === form.value.roleIdOthers.length;
@@ -35606,7 +35996,8 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
         form.value.roleIdOthers = rolesList.value.map((item) => item.value);
       }
     };
-    const dropdownRender = ({ menuNode }) => {
+    const dropdownRender = (list) => {
+      const { menuNode } = list;
       return h("div", [
         h(
           "div",
@@ -35630,14 +36021,19 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
         menuNode
       ]);
     };
-    onMounted(async () => {
+    const getSystemRolesList = async () => {
       const { result } = await getRolePublicTimezone({});
-      roles.value = Object.keys(result).map((key) => {
-        return {
-          label: result[key],
-          value: key
-        };
-      });
+      if (result) {
+        roles.value = Object.keys(result).map((key) => {
+          return {
+            label: result[key],
+            value: key
+          };
+        });
+      }
+    };
+    onMounted(() => {
+      getSystemRolesList();
       roleId.value = props.params.roleId;
       initModel(props.params);
     });
@@ -35654,7 +36050,7 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock(Fragment, null, [
         createCommentVNode(` <a-drawer v-model:open="visible" @close="onCancel" :width="432" :title="$t('uc_user.title' + params.opType)"\r
     :destroyOnClose="true"> `),
-        createElementVNode("div", _hoisted_1$e, [
+        createElementVNode("div", _hoisted_1$d, [
           createVNode(_component_a_form, {
             model: form.value,
             ref_key: "formRef",
@@ -35678,7 +36074,8 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
                             placeholder: _ctx.$t("uc_common.plsEnter"),
                             disabled: true,
                             value: form.value.userCode,
-                            "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.value.userCode = $event)
+                            "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.value.userCode = $event),
+                            autocomplete: "off"
                           }, null, 8, ["placeholder", "value"])
                         ]),
                         _: 1
@@ -35705,14 +36102,15 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
                       }, {
                         label: withCtx(() => [
                           createTextVNode(toDisplayString(_ctx.$t("uc_user.userCode")) + " ", 1),
-                          createElementVNode("span", _hoisted_3$6, toDisplayString(_ctx.$t("uc_user.pwdCodeSameNote")), 1)
+                          createElementVNode("span", _hoisted_3$5, toDisplayString(_ctx.$t("uc_user.pwdCodeSameNote")), 1)
                         ]),
                         default: withCtx(() => [
                           createVNode(_component_a_input, {
                             placeholder: _ctx.$t("uc_common.plsEnter"),
                             value: form.value.userCode,
                             "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.value.userCode = $event),
-                            maxlength: 64
+                            maxlength: 64,
+                            autocomplete: "off"
                           }, null, 8, ["placeholder", "value"])
                         ]),
                         _: 1
@@ -35736,7 +36134,8 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
                             placeholder: _ctx.$t("uc_common.plsEnter"),
                             value: form.value.userName,
                             "onUpdate:value": _cache[2] || (_cache[2] = ($event) => form.value.userName = $event),
-                            maxlength: 64
+                            maxlength: 64,
+                            autocomplete: "off"
                           }, null, 8, ["placeholder", "value"])
                         ]),
                         _: 1
@@ -35855,7 +36254,8 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
                           createVNode(_component_a_input, {
                             placeholder: _ctx.$t("uc_common.plsEnter"),
                             value: form.value.mobile,
-                            "onUpdate:value": _cache[7] || (_cache[7] = ($event) => form.value.mobile = $event)
+                            "onUpdate:value": _cache[7] || (_cache[7] = ($event) => form.value.mobile = $event),
+                            autocomplete: "off"
                           }, null, 8, ["placeholder", "value"])
                         ]),
                         _: 1
@@ -35878,7 +36278,8 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
                           createVNode(_component_a_input, {
                             placeholder: _ctx.$t("uc_common.plsEnter"),
                             value: form.value.email,
-                            "onUpdate:value": _cache[8] || (_cache[8] = ($event) => form.value.email = $event)
+                            "onUpdate:value": _cache[8] || (_cache[8] = ($event) => form.value.email = $event),
+                            autocomplete: "off"
                           }, null, 8, ["placeholder", "value"])
                         ]),
                         _: 1
@@ -35901,7 +36302,8 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
                           createVNode(_component_a_input, {
                             placeholder: _ctx.$t("uc_common.plsEnter"),
                             value: form.value.userDesc,
-                            "onUpdate:value": _cache[9] || (_cache[9] = ($event) => form.value.userDesc = $event)
+                            "onUpdate:value": _cache[9] || (_cache[9] = ($event) => form.value.userDesc = $event),
+                            autocomplete: "off"
                           }, null, 8, ["placeholder", "value"])
                         ]),
                         _: 1
@@ -35942,7 +36344,7 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
   }
 });
 const UserEdit_vue_vue_type_style_index_0_scoped_e4aafb0b_lang = "";
-const UserEdit = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__scopeId", "data-v-e4aafb0b"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/user/UserEdit.vue"]]);
+const UserEdit = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__scopeId", "data-v-e4aafb0b"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/user/UserEdit.vue"]]);
 var hash = {};
 var utils$9 = {};
 var minimalisticAssert = assert$5;
@@ -37529,7 +37931,7 @@ Hmac.prototype.digest = function digest8(enc) {
   hash2.sha512 = hash2.sha.sha512;
   hash2.ripemd160 = hash2.ripemd.ripemd160;
 })(hash);
-const _sfc_main$x = /* @__PURE__ */ defineComponent({
+const _sfc_main$v = /* @__PURE__ */ defineComponent({
   __name: "ResetPwdModal",
   emits: ["ok"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -37610,7 +38012,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
       const _component_a_modal = Modal$1;
       return openBlock(), createBlock(_component_a_modal, {
         class: "custom-user-modal",
-        width: 352,
+        width: 420,
         open: visible.value,
         "onUpdate:open": _cache[2] || (_cache[2] = ($event) => visible.value = $event),
         style: { "top": "280px" },
@@ -37659,7 +38061,8 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
                     style: { "width": "100%" },
                     placeholder: _ctx.$t("uc_common.plsEnter"),
                     value: form.userPwd,
-                    "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.userPwd = $event)
+                    "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.userPwd = $event),
+                    autocomplete: "off"
                   }, null, 8, ["placeholder", "value"])
                 ]),
                 _: 1
@@ -37673,6 +38076,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
                     type: "password",
                     style: { "width": "100%" },
                     placeholder: _ctx.$t("uc_common.plsEnter"),
+                    autocomplete: "off",
                     value: form.userPwd1,
                     "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.userPwd1 = $event)
                   }, null, 8, ["placeholder", "value"])
@@ -37689,7 +38093,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
   }
 });
 const ResetPwdModal_vue_vue_type_style_index_0_lang$1 = "";
-const ResetPwdModal$1 = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/user/ResetPwdModal.vue"]]);
+const ResetPwdModal$1 = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/user/ResetPwdModal.vue"]]);
 const dictCache = {};
 function useDict(type, opts = { immediate: true }) {
   const i18nRes = useI18n();
@@ -37764,7 +38168,7 @@ function useDict(type, opts = { immediate: true }) {
   }
   return [resultMap, { fetchDict, toList, getDictLabel }];
 }
-const _sfc_main$w = /* @__PURE__ */ defineComponent({
+const _sfc_main$u = /* @__PURE__ */ defineComponent({
   ...{
     inheritAttrs: false
   },
@@ -37839,9 +38243,9 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
   }
 });
 const DictSelect_vue_vue_type_style_index_0_scoped_18891c06_lang = "";
-const DictSelect = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__scopeId", "data-v-18891c06"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/DictSelect.vue"]]);
-const _hoisted_1$d = { class: "user-detail" };
-const _sfc_main$v = /* @__PURE__ */ defineComponent({
+const DictSelect = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-18891c06"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/DictSelect.vue"]]);
+const _hoisted_1$c = { class: "user-detail" };
+const _sfc_main$t = /* @__PURE__ */ defineComponent({
   __name: "UserDetail",
   props: {
     data: {
@@ -37880,7 +38284,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
       const _component_a_descriptions = Descriptions;
       const _component_a_button = Button$1;
       const _component_a_space = Space;
-      return openBlock(), createElementBlock("div", _hoisted_1$d, [
+      return openBlock(), createElementBlock("div", _hoisted_1$c, [
         createVNode(_component_a_descriptions, {
           bordered: "",
           class: "descriptions-detail"
@@ -37977,12 +38381,12 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
   }
 });
 const UserDetail_vue_vue_type_style_index_0_scoped_167248a6_lang = "";
-const UserDetail = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__scopeId", "data-v-167248a6"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/user/UserDetail.vue"]]);
-const _hoisted_1$c = { class: "user-info" };
+const UserDetail = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-167248a6"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/user/UserDetail.vue"]]);
+const _hoisted_1$b = { class: "user-info" };
 const _hoisted_2$7 = { class: "form-btns" };
-const _hoisted_3$5 = { key: 1 };
+const _hoisted_3$4 = { key: 1 };
 const _hoisted_4$3 = { key: 4 };
-const _sfc_main$u = /* @__PURE__ */ defineComponent({
+const _sfc_main$s = /* @__PURE__ */ defineComponent({
   __name: "index",
   setup(__props) {
     const appStore = useAppStore();
@@ -38213,7 +38617,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
         prefixCls: unref(prefixCls)
       }, {
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$c, [
+          createElementVNode("div", _hoisted_1$b, [
             createVNode(_component_a_form, {
               layout: "vertical",
               class: "query-form"
@@ -38227,7 +38631,8 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
                     createVNode(_component_a_input, {
                       value: queryParam.userName,
                       "onUpdate:value": _cache[0] || (_cache[0] = ($event) => queryParam.userName = $event),
-                      placeholder: _ctx.$t("uc_common.plsEnter")
+                      placeholder: _ctx.$t("uc_common.plsEnter"),
+                      autocomplete: "off"
                     }, null, 8, ["value", "placeholder"])
                   ]),
                   _: 1
@@ -38240,7 +38645,8 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
                     createVNode(_component_a_input, {
                       value: queryParam.userCode,
                       "onUpdate:value": _cache[1] || (_cache[1] = ($event) => queryParam.userCode = $event),
-                      placeholder: _ctx.$t("uc_common.plsSelect")
+                      placeholder: _ctx.$t("uc_common.plsSelect"),
+                      autocomplete: "off"
                     }, null, 8, ["value", "placeholder"])
                   ]),
                   _: 1
@@ -38314,7 +38720,8 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
               columns: columns.value,
               rowKey: "userId",
               style: { "margin-top": "8px" },
-              scroll: { x: 1e3, y: 550 }
+              scroll: { x: 1e3, y: 550 },
+              class: "table-bordered"
             }, {
               bodyCell: withCtx(({ record, column }) => [
                 column.key === "branchId" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
@@ -38335,7 +38742,7 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
                     key: 0,
                     checked: record.userStatus == 0,
                     onClick: (checked) => onSwitch(checked, record)
-                  }, null, 8, ["checked", "onClick"])) : Number(record.userStatus) == 2 ? (openBlock(), createElementBlock("span", _hoisted_3$5, toDisplayString(_ctx.$t("dct.USER_STATUS2")), 1)) : createCommentVNode("v-if", true)
+                  }, null, 8, ["checked", "onClick"])) : Number(record.userStatus) == 2 ? (openBlock(), createElementBlock("span", _hoisted_3$4, toDisplayString(_ctx.$t("dct.USER_STATUS2")), 1)) : createCommentVNode("v-if", true)
                 ], 64)) : createCommentVNode("v-if", true),
                 column.key === "cdate" ? (openBlock(), createElementBlock(Fragment, { key: 3 }, [
                   createTextVNode(toDisplayString(unref(formatDate)(record.cdate) || "-"), 1)
@@ -38380,16 +38787,26 @@ const _sfc_main$u = /* @__PURE__ */ defineComponent({
 });
 const index_vue_vue_type_style_index_0_scoped_451ba823_lang = "";
 const index_vue_vue_type_style_index_1_scoped_451ba823_lang = "";
-const index$5 = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-451ba823"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/user/index.vue"]]);
+const index$5 = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-451ba823"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/user/index.vue"]]);
 function isValidEmail(email) {
   const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
   return emailRegex.test(email);
 }
-const _hoisted_1$b = ["spinning"];
-const _sfc_main$t = /* @__PURE__ */ defineComponent({
+function useRequiredMessage() {
+  const { t: t2 } = useI18n();
+  const userStore = useUserStore();
+  const requiredMessage = (labelKey) => {
+    const suffix = t2("uc_common.isRequired");
+    return userStore.userLanguage === "zh_CN" ? labelKey + suffix : labelKey + " " + suffix;
+  };
+  return { requiredMessage };
+}
+const _hoisted_1$a = ["spinning"];
+const _sfc_main$r = /* @__PURE__ */ defineComponent({
   __name: "ModalEdit",
   emits: ["ok", "cancel"],
   setup(__props, { expose: __expose, emit: __emit }) {
+    const { requiredMessage } = useRequiredMessage();
     const { t: t2 } = useI18n();
     const emit = __emit;
     const visible = ref(false);
@@ -38413,7 +38830,8 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
       opType: "",
       id: "",
       type: "",
-      title: ""
+      title: "",
+      isBand: false
     });
     const showModal = (data2) => {
       Object.assign(form, {
@@ -38427,6 +38845,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
         captcha: "",
         userCode: ""
       });
+      form.userName = (data2 == null ? void 0 : data2.userName) || "";
       Object.assign(params, data2);
       visible.value = true;
       change.value = true;
@@ -38440,9 +38859,12 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
     const onSubmit = () => {
       formRef.value.validate().then(async () => {
         loading.value = true;
-        let res = null;
         if (params.opType == "1") {
-          res = await setUpdateUserName({ userName: form.userName });
+          if (form.userName.trim() == "") {
+            message.error(requiredMessage(t2("uc_profile.userName")));
+            return;
+          }
+          const res = await setUpdateUserName({ userName: form.userName });
           if ((res == null ? void 0 : res.code) == 0) {
             emit("ok");
             message.success(t2("uc_profile.editUserNameSucc"));
@@ -38451,12 +38873,12 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
         } else {
           if (params.opType == "2") {
             data.value = {
-              mobile: form.mobile
+              mobile: form.mobile.trim()
             };
           }
           if (params.opType == "3") {
             data.value = {
-              email: form.email,
+              email: form.email.trim(),
               captcha: form.captcha
             };
           }
@@ -38465,9 +38887,9 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
             url: params.opType == "2" ? "/api/sys/userinfo/update-mobile" : "/api/sys/userinfo/update-email",
             method: "post",
             params: data.value
-          }).then((res2) => {
+          }).then((res) => {
             loading.value = false;
-            if (res2.code == 0) {
+            if (res.code == 0) {
               emit("ok");
               visible.value = false;
               Object.assign(form, {
@@ -38481,11 +38903,18 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                 captcha: "",
                 userCode: ""
               });
-              pwdStrength.value = 0;
               if (params.opType == "2") {
-                message.success(t2("uc_profile.editMobileSucc"));
+                if (params.isBand) {
+                  message.success(t2("uc_profile.bandMobileSucc"));
+                } else {
+                  message.success(t2("uc_profile.editMobileSucc"));
+                }
               } else {
-                message.success(t2("uc_profile.editEmailSucc"));
+                if (params.isBand) {
+                  message.success(t2("uc_profile.bandEmailSucc"));
+                } else {
+                  message.success(t2("uc_profile.editEmailSucc"));
+                }
               }
             }
           });
@@ -38496,7 +38925,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
     __expose({
       showModal
     });
-    const pwdStrength = ref(0);
+    ref(0);
     const mobileRules = reactive({
       pwd: [
         {
@@ -38521,7 +38950,6 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
       email: [
         {
           required: true,
-          trigger: ["blur"],
           validator: function(rule, value) {
             if (!value) {
               return Promise.reject(t2("uc_personal_center.email_placeholder"));
@@ -38540,6 +38968,8 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
           validator: function(rule, value) {
             if (!value) {
               return Promise.reject(t2("uc_personal_center.verify_code_placeholder"));
+            } else {
+              return Promise.resolve();
             }
           }
         }
@@ -38593,7 +39023,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
         createElementVNode("div", { spinning: loading.value }, [
           createVNode(_component_a_modal, {
             class: "modal custom-userinfo-modal",
-            width: 352,
+            width: params.opType == "3" ? 500 : 360,
             title: params.title,
             open: visible.value,
             "onUpdate:open": _cache[7] || (_cache[7] = ($event) => visible.value = $event),
@@ -38636,9 +39066,10 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                     default: withCtx(() => [
                       createVNode(_component_a_input, {
                         placeholder: _ctx.$t("uc_common.plsEnter"),
-                        maxLength: 20,
+                        maxLength: 64,
                         value: form.userName,
-                        "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.userName = $event)
+                        "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.userName = $event),
+                        autocomplete: "off"
                       }, null, 8, ["placeholder", "value"])
                     ]),
                     _: 1
@@ -38665,6 +39096,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                       createVNode(_component_a_input_password, {
                         placeholder: _ctx.$t("uc_common.plsEnter"),
                         maxLength: 20,
+                        autocomplete: "off",
                         value: form.pwd,
                         "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.pwd = $event)
                       }, null, 8, ["placeholder", "value"])
@@ -38679,6 +39111,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                       createVNode(_component_a_input, {
                         placeholder: _ctx.$t("uc_common.plsEnter"),
                         maxLength: 50,
+                        autocomplete: "off",
                         value: form.mobile,
                         "onUpdate:value": _cache[2] || (_cache[2] = ($event) => form.mobile = $event)
                       }, null, 8, ["placeholder", "value"])
@@ -38708,7 +39141,8 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                       createVNode(_component_a_input_password, {
                         value: form.pwd,
                         "onUpdate:value": _cache[3] || (_cache[3] = ($event) => form.pwd = $event),
-                        placeholder: _ctx.$t("uc_common.plsEnter")
+                        placeholder: _ctx.$t("uc_common.plsEnter"),
+                        autocomplete: "off"
                       }, null, 8, ["value", "placeholder"])
                     ]),
                     _: 1
@@ -38722,7 +39156,8 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                       createVNode(_component_a_input, {
                         value: form.email,
                         "onUpdate:value": _cache[4] || (_cache[4] = ($event) => form.email = $event),
-                        placeholder: _ctx.$t("uc_common.plsEnter")
+                        placeholder: _ctx.$t("uc_common.plsEnter"),
+                        autocomplete: "off"
                       }, null, 8, ["value", "placeholder"])
                     ]),
                     _: 1
@@ -38735,17 +39170,18 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                     default: withCtx(() => [
                       createVNode(_component_a_row, { gutter: 8 }, {
                         default: withCtx(() => [
-                          createVNode(_component_a_col, { span: 16 }, {
+                          createVNode(_component_a_col, { span: 12 }, {
                             default: withCtx(() => [
                               createVNode(_component_a_input, {
                                 value: form.captcha,
                                 "onUpdate:value": _cache[5] || (_cache[5] = ($event) => form.captcha = $event),
-                                placeholder: _ctx.$t("uc_common.plsEnter")
+                                placeholder: _ctx.$t("uc_common.plsEnter"),
+                                autocomplete: "off"
                               }, null, 8, ["value", "placeholder"])
                             ]),
                             _: 1
                           }),
-                          createVNode(_component_a_col, { span: 8 }, {
+                          createVNode(_component_a_col, { span: 12 }, {
                             default: withCtx(() => [
                               createVNode(_component_a_button, {
                                 type: "primary",
@@ -38772,15 +39208,15 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
               }, 8, ["model", "rules"])) : createCommentVNode("v-if", true)
             ]),
             _: 1
-          }, 8, ["title", "open"])
-        ], 8, _hoisted_1$b)
+          }, 8, ["width", "title", "open"])
+        ], 8, _hoisted_1$a)
       ]);
     };
   }
 });
 const ModalEdit_vue_vue_type_style_index_0_scoped_8dbc9ba3_lang = "";
 const ModalEdit_vue_vue_type_style_index_1_lang = "";
-const ModalEdit = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-8dbc9ba3"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/userinfo/ModalEdit.vue"]]);
+const ModalEdit = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-8dbc9ba3"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/userinfo/ModalEdit.vue"]]);
 function getUserInfoSearchBase(params) {
   return handleRespPost({
     url: "/api/sys/userinfo/search-base",
@@ -39815,9 +40251,9 @@ function U(t2, e, i, s2, r2, o) {
   ], 544);
 }
 const M = /* @__PURE__ */ $(z, [["render", U], ["__scopeId", "data-v-a742df44"]]);
-const _hoisted_1$a = { class: "avatar-upload-preview" };
+const _hoisted_1$9 = { class: "avatar-upload-preview" };
 const _hoisted_2$6 = ["src"];
-const _sfc_main$s = /* @__PURE__ */ defineComponent({
+const _sfc_main$q = /* @__PURE__ */ defineComponent({
   __name: "AvatarModal",
   emits: ["ok"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -39939,7 +40375,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
                 style: { height: "350px" }
               }, {
                 default: withCtx(() => [
-                  createElementVNode("div", _hoisted_1$a, [
+                  createElementVNode("div", _hoisted_1$9, [
                     createElementVNode("img", {
                       src: previews.value.url,
                       style: normalizeStyle(previews.value.img)
@@ -39955,7 +40391,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
           createVNode(_component_a_row, null, {
             default: withCtx(() => [
               createVNode(_component_a_col, {
-                lg: 2,
+                lg: 3,
                 md: 4
               }, {
                 default: withCtx(() => [
@@ -40030,10 +40466,10 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
   }
 });
 const AvatarModal_vue_vue_type_style_index_0_scoped_8812fb97_lang = "";
-const AvatarModal = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-8812fb97"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/userinfo/AvatarModal.vue"]]);
-const _hoisted_1$9 = { class: "parent-container" };
+const AvatarModal = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__scopeId", "data-v-8812fb97"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/userinfo/AvatarModal.vue"]]);
+const _hoisted_1$8 = { class: "parent-container" };
 const _hoisted_2$5 = { class: "child-box" };
-const _hoisted_3$4 = { class: "box userInfoMenu" };
+const _hoisted_3$3 = { class: "box userInfoMenu" };
 const _hoisted_4$2 = { class: "avatar" };
 const _hoisted_5$1 = ["src"];
 const _hoisted_6$1 = { class: "text-content" };
@@ -40073,10 +40509,10 @@ const _hoisted_30 = ["title"];
 const _hoisted_31 = { class: "info-item" };
 const _hoisted_32 = { class: "info-label" };
 const _hoisted_33 = ["title"];
-const _hoisted_34 = { class: "tenant-info-container" };
+const _hoisted_34 = { style: { "width": "568px" } };
 const _hoisted_35 = { class: "info-item" };
 const _hoisted_36 = { class: "info-label" };
-const _hoisted_37 = ["title"];
+const _hoisted_37 = { class: "text-ellipsis" };
 const _hoisted_38 = { class: "content2" };
 const _hoisted_39 = {
   class: "wrapper",
@@ -40099,7 +40535,7 @@ const _hoisted_48 = {
   style: { "height": "372px" }
 };
 const _hoisted_49 = { class: "content-title" };
-const _sfc_main$r = /* @__PURE__ */ defineComponent({
+const _sfc_main$p = /* @__PURE__ */ defineComponent({
   ...{
     name: "Function102"
   },
@@ -40107,8 +40543,8 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const { t: t2 } = useI18n();
     const prefixCls = "uc";
-    useInitUserinfo();
     const appStore = useAppStore();
+    const roleRef = ref();
     const specialStyles = {
       color: "#FF7D00",
       backgroundColor: "#FFF7E8"
@@ -40122,7 +40558,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
       userCode: "",
       userName: "",
       deptId: "",
-      role: [],
+      role: "",
       mobile: "",
       email: ""
     });
@@ -40135,22 +40571,6 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
     const pwdStrength = ref(0);
     const loading = ref(false);
     const currentActive = ref(0);
-    const handlePasswordLevel = (rule, value) => {
-      if (!value) {
-        return Promise.reject(t2("uc_personal_center.user_pwd1_msg1"));
-      }
-      pwdStrength.value = 0;
-      if (/[0-9]/.test(value)) {
-        pwdStrength.value++;
-      }
-      if (/[a-zA-Z]/.test(value)) {
-        pwdStrength.value++;
-      }
-      if (/[^0-9a-zA-Z_]/.test(value)) {
-        pwdStrength.value++;
-      }
-      return Promise.resolve();
-    };
     const form = reactive({
       userId: "",
       userCode: "",
@@ -40177,8 +40597,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
       newPwd: [
         {
           required: true,
-          message: t2("uc_personal_center.user_pwd1_msg1"),
-          validator: handlePasswordLevel
+          message: t2("uc_personal_center.user_pwd1_msg1")
         }
       ],
       userPwd1: [
@@ -40198,6 +40617,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
       ]
     });
     const initData = async () => {
+      var _a;
       const { result } = await getUserInfoSearchBase({});
       const res = await getUserInfoAll();
       Object.assign(form, result, {
@@ -40212,6 +40632,9 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
       userInfo.value.userName = res.result.userName;
       userInfo.value.deptId = res.result.userBranchName;
       userInfo.value.role = res.result.userRoleName;
+      if ((_a = res.result) == null ? void 0 : _a.userOtherRoleName) {
+        userInfo.value.role += ", " + res.result.userOtherRoleName;
+      }
       userInfo.value.mobile = res.result.userMobile;
       userInfo.value.email = res.result.userEmail;
     };
@@ -40221,36 +40644,33 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
     const onSubmit = () => {
       initData();
     };
-    const handleEditUserName = () => {
+    const handleEditUserName = (userName) => {
       modalEditRef.value.showModal({
         opType: "1",
-        title: t2("uc_profile.editUserName")
+        title: t2("uc_profile.editUserName"),
+        userName
       });
     };
     const handleEditPhone = () => {
       modalEditRef.value.showModal({
         opType: "2",
-        title: userInfo.value.mobile ? t2("uc_profile.editMobile") : t2("uc_profile.bandMobile")
+        title: userInfo.value.mobile ? t2("uc_profile.editMobile") : t2("uc_profile.bandMobile"),
+        isBand: !userInfo.value.mobile ? true : false
       });
     };
     const handleEditEmail = () => {
       modalEditRef.value.showModal({
         opType: "3",
-        title: userInfo.value.mobile ? t2("uc_profile.editEmail") : t2("uc_profile.bandEmail")
+        title: userInfo.value.email ? t2("uc_profile.editEmail") : t2("uc_profile.bandEmail"),
+        isBand: !userInfo.value.email ? true : false
       });
     };
     const handleUploadPreview = (option2) => {
       modalRef.value && modalRef.value.edit(option2);
     };
-    const handleFinish = (values2) => {
-    };
-    const handleFinishFailed = (errors) => {
-    };
     const resetForm = () => {
       formRef.value.resetFields();
     };
-    const handleValidate = (...args) => {
-    };
     const submitPwd = () => {
       formRef.value && formRef.value.validate().then(() => {
         loading.value = true;
@@ -40317,9 +40737,9 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
         prefixCls: unref(prefixCls)
       }, {
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$9, [
+          createElementVNode("div", _hoisted_1$8, [
             createElementVNode("div", _hoisted_2$5, [
-              createElementVNode("div", _hoisted_3$4, [
+              createElementVNode("div", _hoisted_3$3, [
                 createElementVNode("div", _hoisted_4$2, [
                   createVNode(_component_a_tooltip, {
                     placement: "top",
@@ -40400,7 +40820,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                         createTextVNode(toDisplayString(userInfo.value.userName) + " ", 1),
                         createVNode(unref(EditOutlined), {
                           style: { "width": "16px", "height": "16px", "color": "#165dff" },
-                          onClick: handleEditUserName
+                          onClick: _cache[1] || (_cache[1] = ($event) => handleEditUserName(userInfo.value.userName))
                         })
                       ], 8, _hoisted_30)
                     ]),
@@ -40418,9 +40838,22 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                     createElementVNode("div", _hoisted_35, [
                       createElementVNode("div", _hoisted_36, toDisplayString(_ctx.$t("uc_profile.role")), 1),
                       createElementVNode("div", {
-                        class: "info-value",
-                        title: userInfo.value.role
-                      }, toDisplayString(userInfo.value.role), 9, _hoisted_37)
+                        class: "info-value-other",
+                        ref_key: "roleRef",
+                        ref: roleRef
+                      }, [
+                        createVNode(_component_a_tooltip, {
+                          getPopupContainer: () => roleRef.value
+                        }, {
+                          title: withCtx(() => [
+                            createTextVNode(toDisplayString(userInfo.value.role), 1)
+                          ]),
+                          default: withCtx(() => [
+                            createElementVNode("div", _hoisted_37, toDisplayString(userInfo.value.role), 1)
+                          ]),
+                          _: 1
+                        }, 8, ["getPopupContainer"])
+                      ], 512)
                     ])
                   ])
                 ]),
@@ -40470,10 +40903,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                   name: "custom-validation",
                   model: formState,
                   rules: pwdRules,
-                  layout: "vertical",
-                  onFinish: handleFinish,
-                  onValidate: handleValidate,
-                  onFinishFailed: handleFinishFailed
+                  layout: "vertical"
                 }, {
                   default: withCtx(() => [
                     createVNode(_component_a_form_item, {
@@ -40483,7 +40913,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_a_input_password, {
                           value: formState.oldPwd,
-                          "onUpdate:value": _cache[1] || (_cache[1] = ($event) => formState.oldPwd = $event),
+                          "onUpdate:value": _cache[2] || (_cache[2] = ($event) => formState.oldPwd = $event),
                           type: "password",
                           autocomplete: "off",
                           style: { "width": "320px" },
@@ -40499,7 +40929,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_a_input_password, {
                           value: formState.newPwd,
-                          "onUpdate:value": _cache[2] || (_cache[2] = ($event) => formState.newPwd = $event),
+                          "onUpdate:value": _cache[3] || (_cache[3] = ($event) => formState.newPwd = $event),
                           type: "password",
                           autocomplete: "off",
                           style: { "width": "320px" },
@@ -40515,7 +40945,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_a_input_password, {
                           value: formState.userPwd1,
-                          "onUpdate:value": _cache[3] || (_cache[3] = ($event) => formState.userPwd1 = $event),
+                          "onUpdate:value": _cache[4] || (_cache[4] = ($event) => formState.userPwd1 = $event),
                           type: "password",
                           autocomplete: "off",
                           style: { "width": "320px" },
@@ -40536,7 +40966,6 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                           ]),
                           _: 1
                         }),
-                        createCommentVNode(` <uc-btn-reset-pwd type="link" @click="submitPwd">{{ $t('uc_common.btnSubmit') }}</uc-btn-reset-pwd> `),
                         createVNode(_component_a_button, {
                           style: { "margin-left": "10px" },
                           onClick: resetForm
@@ -40572,7 +41001,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
   }
 });
 const index_vue_vue_type_style_index_0_scoped_1275f3db_lang = "";
-const index$3 = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-1275f3db"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/userinfo/index.vue"]]);
+const index$3 = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-1275f3db"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/userinfo/index.vue"]]);
 function getLangSearchLangList(params) {
   return handleRespPost({
     url: "/api/sys/lang/search-lang-list",
@@ -40615,7 +41044,7 @@ function setLangExport() {
     responseType: "blob"
   });
 }
-const _sfc_main$q = /* @__PURE__ */ defineComponent({
+const _sfc_main$o = /* @__PURE__ */ defineComponent({
   ...{
     name: "LangAdd"
   },
@@ -40761,8 +41190,8 @@ const _sfc_main$q = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const LangAdd = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/lang/LangAdd.vue"]]);
-const _sfc_main$p = /* @__PURE__ */ defineComponent({
+const LangAdd = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/lang/LangAdd.vue"]]);
+const _sfc_main$n = /* @__PURE__ */ defineComponent({
   __name: "FormItemBtnGroup",
   props: {
     top: {
@@ -40793,14 +41222,14 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
   }
 });
 const FormItemBtnGroup_vue_vue_type_style_index_0_scoped_ffd7f8e3_lang = "";
-const FIBtnGroup = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-ffd7f8e3"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/FormItemBtnGroup/FormItemBtnGroup.vue"]]);
-const _hoisted_1$8 = {
+const FIBtnGroup = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-ffd7f8e3"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/FormItemBtnGroup/FormItemBtnGroup.vue"]]);
+const _hoisted_1$7 = {
   bordered: false,
   class: "lang-warp"
 };
 const _hoisted_2$4 = { style: { "margin": "10px 0 6px 10px" } };
-const _hoisted_3$3 = { class: "table-page-search-wrapper" };
-const _sfc_main$o = /* @__PURE__ */ defineComponent({
+const _hoisted_3$2 = { class: "table-page-search-wrapper" };
+const _sfc_main$m = /* @__PURE__ */ defineComponent({
   __name: "index",
   setup(__props) {
     const appStore = useAppStore();
@@ -40974,7 +41403,7 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
             size: "large"
           }, {
             default: withCtx(() => [
-              createElementVNode("div", _hoisted_1$8, [
+              createElementVNode("div", _hoisted_1$7, [
                 createElementVNode("div", _hoisted_2$4, [
                   createElementVNode("div", null, [
                     createVNode(_component_a_form, {
@@ -41045,7 +41474,7 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
                     })
                   ])
                 ]),
-                createElementVNode("div", _hoisted_3$3, [
+                createElementVNode("div", _hoisted_3$2, [
                   createVNode(_component_a_row, null, {
                     default: withCtx(() => [
                       createVNode(_component_a_col, {
@@ -41074,6 +41503,7 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
                     style: { "margin-top": "10px" },
                     ref_key: "tableRef",
                     ref: tableRef,
+                    class: "table-bordered",
                     columns: columns.value,
                     data: loadData,
                     rowKey: getKey,
@@ -41189,46 +41619,217 @@ const _sfc_main$o = /* @__PURE__ */ defineComponent({
   }
 });
 const index_vue_vue_type_style_index_0_scoped_9e1f799b_lang = "";
-const index$2 = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__scopeId", "data-v-9e1f799b"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/lang/index.vue"]]);
-const _hoisted_1$7 = { class: "uc-pro-footer-toolbar" };
-const _hoisted_2$3 = { style: { "float": "left" } };
-const _hoisted_3$2 = { style: { "text-align": "center" } };
-const _sfc_main$n = /* @__PURE__ */ defineComponent({
-  ...{
-    name: "FooterToolBar"
-  },
-  __name: "FooterToolBar",
+const index$2 = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-9e1f799b"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/lang/index.vue"]]);
+function resetPassword(params) {
+  return handleRespPost({
+    url: "/api/sys/org/resetpwd",
+    method: "post",
+    params
+  });
+}
+function deleteOrg(params) {
+  return handleRespPost({
+    url: "/api/sys/org/delete",
+    method: "post",
+    params
+  });
+}
+function orgInsert(params) {
+  return handleRespPost({
+    url: "/api/sys/org/insert",
+    method: "post",
+    params
+  });
+}
+function orgUpdate(params) {
+  return handleRespPost({
+    url: "/api/sys/org/update",
+    method: "post",
+    params
+  });
+}
+function orgUpdateLoad(params) {
+  return handleRespPost({
+    url: "/api/sys/org/update-load",
+    method: "get",
+    params
+  });
+}
+function orgConditionalSeach(params) {
+  return handleRespPost({
+    url: "/api/sys/org/search-list",
+    method: "get",
+    params
+  });
+}
+function orgSwitchStatus(params) {
+  return handleRespPost({
+    url: "/api/sys/org/switch",
+    method: "post",
+    data: params
+  });
+}
+const _hoisted_1$6 = { class: "rwd" };
+const _sfc_main$l = /* @__PURE__ */ defineComponent({
+  __name: "ResetPwdModal",
   props: {
-    prefixCls: {
-      type: String,
-      default: "uc-pro-footer-toolbar"
-    },
-    extra: {
-      type: [String, Object],
-      default: ""
+    params: {
+      type: Object,
+      default: () => ({})
     }
   },
-  setup(__props) {
+  emits: ["close"],
+  setup(__props, { emit: __emit }) {
+    const { requiredMessage } = useRequiredMessage();
+    const { t: t2 } = useI18n();
+    const emit = __emit;
     const props = __props;
+    const formRef = ref();
+    const visible = ref(true);
+    const destroyOnClose = ref(true);
+    const formItemLayout = reactive({});
+    const form = reactive({
+      userPwd: "",
+      userPwd1: ""
+    });
+    const onSubmit = () => {
+      formRef.value && formRef.value.validate().then(() => {
+        const { orgId } = props.params;
+        if (orgId) {
+          resetPassword({
+            orgId,
+            userPwd: hash.sha256().update(form.userPwd).digest("hex")
+          }).then(() => {
+            message.success(t2("uc_org.resetPwdSucc"));
+            emit("close");
+          });
+        }
+      });
+    };
+    const onCancel = () => {
+      emit("close");
+    };
+    const rules = {
+      userPwd: [
+        {
+          required: true,
+          message: t2("uc_org.user_pwd1_msg1")
+        }
+      ],
+      userPwd1: [
+        {
+          required: true,
+          validator: (rule, value) => {
+            if (!value) {
+              return Promise.reject(requiredMessage(t2("uc_org.newPwd1")));
+            }
+            if (value == form.userPwd) {
+              return Promise.resolve();
+            } else {
+              return Promise.reject(t2("uc_org.user_pwd2_msg1"));
+            }
+          }
+        }
+      ]
+    };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$7, [
-        createElementVNode("div", _hoisted_2$3, [
-          renderSlot(_ctx.$slots, "extra", {}, () => [
-            createTextVNode(toDisplayString(props.extra), 1)
-          ], true)
-        ]),
-        createElementVNode("div", _hoisted_3$2, [
-          renderSlot(_ctx.$slots, "default", {}, void 0, true)
-        ])
+      const _component_a_input = Input;
+      const _component_a_form_item = FormItem;
+      const _component_a_form = Form;
+      const _component_a_button = Button$1;
+      const _component_a_modal = Modal$1;
+      return openBlock(), createElementBlock("div", _hoisted_1$6, [
+        createVNode(_component_a_modal, {
+          class: "custom-org-modal",
+          width: 352,
+          open: visible.value,
+          "onUpdate:open": _cache[2] || (_cache[2] = ($event) => visible.value = $event),
+          style: { "top": "280px" },
+          title: _ctx.$t("uc_org.resetPwd"),
+          destroyOnClose: destroyOnClose.value,
+          onCancel
+        }, {
+          footer: withCtx(() => [
+            createVNode(_component_a_button, {
+              key: "back",
+              onClick: onCancel
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(_ctx.$t("uc_common.btnCancel")), 1)
+              ]),
+              _: 1
+            }),
+            createVNode(_component_a_button, {
+              key: "submit",
+              type: "primary",
+              onClick: onSubmit
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(_ctx.$t("uc_common.btnSubmit")), 1)
+              ]),
+              _: 1
+            })
+          ]),
+          default: withCtx(() => [
+            createVNode(_component_a_form, {
+              model: form,
+              ref_key: "formRef",
+              ref: formRef,
+              rules,
+              class: "clear-formctrl-lh rwd-content",
+              layout: "vertical"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_a_form_item, mergeProps(formItemLayout, {
+                  style: { "margin-bottom": "0", "width": "320px" },
+                  name: "userPwd"
+                }), {
+                  label: withCtx(() => [
+                    createTextVNode(toDisplayString(_ctx.$t("uc_org.orgNewPwd")), 1)
+                  ]),
+                  default: withCtx(() => [
+                    createVNode(_component_a_input, {
+                      type: "password",
+                      placeholder: _ctx.$t("uc_common.plsEnter"),
+                      value: form.userPwd,
+                      "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.userPwd = $event),
+                      autoComplete: "off"
+                    }, null, 8, ["placeholder", "value"])
+                  ]),
+                  _: 1
+                }, 16),
+                createVNode(_component_a_form_item, mergeProps({
+                  label: _ctx.$t("uc_org.newPwd1")
+                }, formItemLayout, {
+                  name: "userPwd1",
+                  style: { "width": "320px" }
+                }), {
+                  default: withCtx(() => [
+                    createVNode(_component_a_input, {
+                      type: "password",
+                      placeholder: _ctx.$t("uc_common.plsEnter"),
+                      value: form.userPwd1,
+                      "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.userPwd1 = $event),
+                      autoComplete: "off"
+                    }, null, 8, ["placeholder", "value"])
+                  ]),
+                  _: 1
+                }, 16, ["label"])
+              ]),
+              _: 1
+            }, 8, ["model"])
+          ]),
+          _: 1
+        }, 8, ["open", "title", "destroyOnClose"])
       ]);
     };
   }
 });
-const FooterToolBar_vue_vue_type_style_index_0_scoped_040ae207_lang = "";
-const FooterToolBar = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-040ae207"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/FooterToolbar/FooterToolBar.vue"]]);
-const _hoisted_1$6 = { key: 1 };
-const _hoisted_2$2 = { key: 2 };
-const _sfc_main$m = /* @__PURE__ */ defineComponent({
+const ResetPwdModal_vue_vue_type_style_index_0_lang = "";
+const ResetPwdModal = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/org/ResetPwdModal.vue"]]);
+const _hoisted_1$5 = { key: 1 };
+const _hoisted_2$3 = { key: 2 };
+const _sfc_main$k = /* @__PURE__ */ defineComponent({
   __name: "DictEx",
   props: {
     server: {
@@ -41430,14 +42031,14 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
           ]),
           _: 1
         }, 8, ["value", "getPopupContainer", "placeholder", "mode", "disabled", "size", "allowClear", "open"])) : createCommentVNode("v-if", true),
-        __props.kind == "text" && __props.mode === "multiple" ? (openBlock(), createElementBlock("span", _hoisted_1$6, toDisplayString(getMultipleLabel()), 1)) : createCommentVNode("v-if", true),
-        __props.kind == "text" && __props.mode !== "multiple" ? (openBlock(), createElementBlock("span", _hoisted_2$2, toDisplayString(getLabel(__props.value, "html")), 1)) : createCommentVNode("v-if", true)
+        __props.kind == "text" && __props.mode === "multiple" ? (openBlock(), createElementBlock("span", _hoisted_1$5, toDisplayString(getMultipleLabel()), 1)) : createCommentVNode("v-if", true),
+        __props.kind == "text" && __props.mode !== "multiple" ? (openBlock(), createElementBlock("span", _hoisted_2$3, toDisplayString(getLabel(__props.value, "html")), 1)) : createCommentVNode("v-if", true)
       ]);
     };
   }
 });
-const DictEx = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/DictEx.vue"]]);
-const _sfc_main$l = /* @__PURE__ */ defineComponent({
+const DictEx = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/DictEx.vue"]]);
+const _sfc_main$j = /* @__PURE__ */ defineComponent({
   __name: "TimeZone",
   props: {
     mode: {
@@ -41517,8 +42118,8 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const TimeZone = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/TimeZone.vue"]]);
-const _sfc_main$k = /* @__PURE__ */ defineComponent({
+const TimeZone = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/TimeZone.vue"]]);
+const _sfc_main$i = /* @__PURE__ */ defineComponent({
   __name: "LangCombo",
   props: {
     mode: {
@@ -41598,8 +42199,8 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const LangCombo = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/LangCombo.vue"]]);
-const _sfc_main$j = /* @__PURE__ */ defineComponent({
+const LangCombo = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/LangCombo.vue"]]);
+const _sfc_main$h = /* @__PURE__ */ defineComponent({
   __name: "RegionSelect",
   props: {
     modelValue: {
@@ -41687,8 +42288,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const RegionSelect = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/RegionSelect.vue"]]);
-const _sfc_main$i = /* @__PURE__ */ defineComponent({
+const RegionSelect = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/public/RegionSelect.vue"]]);
+const _sfc_main$g = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
     className: {
@@ -41750,863 +42351,9 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
   }
 });
 const index_vue_vue_type_style_index_0_scoped_ce85d961_lang = "";
-const PhTip = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-ce85d961"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/PlaceholderTip/index.vue"]]);
-function resetPassword(params) {
-  return handleRespPost({
-    url: "/api/sys/org/resetpwd",
-    method: "post",
-    params
-  });
-}
-function deleteOrg(params) {
-  return handleRespPost({
-    url: "/api/sys/org/delete",
-    method: "post",
-    params
-  });
-}
-function orgInsert(params) {
-  return handleRespPost({
-    url: "/api/sys/org/insert",
-    method: "post",
-    params
-  });
-}
-function orgUpdate(params) {
-  return handleRespPost({
-    url: "/api/sys/org/update",
-    method: "post",
-    params
-  });
-}
-function orgUpdateLoad(params) {
-  return handleRespPost({
-    url: "/api/sys/org/update-load",
-    method: "get",
-    params
-  });
-}
-function orgConditionalSeach(params) {
-  return handleRespPost({
-    url: "/api/sys/org/search-list",
-    method: "get",
-    params
-  });
-}
-function orgSwitchStatus(params) {
-  return handleRespPost({
-    url: "/api/sys/org/switch",
-    method: "post",
-    data: params
-  });
-}
-const _sfc_main$h = /* @__PURE__ */ defineComponent({
-  __name: "OrgEdit",
-  props: {
-    params: {
-      type: Object,
-      default: null
-    }
-  },
-  emits: ["ok", "cancel"],
-  setup(__props, { emit: __emit }) {
-    const { t: t2 } = useI18n();
-    const emit = __emit;
-    const props = __props;
-    const formRef = ref(null);
-    const regionSelRef = ref(null);
-    const loading = ref(false);
-    const form = reactive({
-      userName: "",
-      orgName: "",
-      industryCode: [],
-      orgType: [],
-      zoneCode: "",
-      timezone: [],
-      dateFormat: [],
-      langId: [],
-      monetaryyUnit: "",
-      monetaryyDeci: "",
-      mobile: "",
-      email: "",
-      equiNum: "",
-      userNum: ""
-    });
-    const defaultForm = reactive({});
-    const initData = async () => {
-      loading.value = true;
-      const { result } = await orgUpdateLoad({
-        orgId: props.params.orgId
-      });
-      loading.value = false;
-      Object.assign(defaultForm, result, {
-        mobile: result.sysUser.mobile,
-        email: result.sysUser.email,
-        zoneCode: result.zoneCode,
-        orgType: [result.orgType],
-        timezone: [result.timezone],
-        dateFormat: [result.dateFormat],
-        langId: [result.langId + ""],
-        industryCode: [result.industryCode],
-        userName: result.sysUser.userId,
-        monetaryyDeci: result.monetaryyDeci ? result.monetaryyDeci : 2
-      });
-      Object.assign(form, defaultForm);
-    };
-    const initModel = (params) => {
-      if (!params || !params.opType) {
-        return;
-      }
-      defaultForm.orgId = params.orgId;
-      if (params.opType == "2") {
-        initData();
-      }
-    };
-    const changeRegion = (values2) => {
-      form.zoneCode = values2;
-      regionSelRef.value && regionSelRef.value.getObject(values2).then((result) => {
-        form.timezone = [result.result.v1];
-        form.dateFormat = [result.result.v2];
-        form.monetaryyUnit = result.result.v3;
-      });
-      formRef.value && formRef.value.clearValidate(["timezone", "dateFormat", "monetaryyUnit"]);
-    };
-    const onCancel = () => {
-      emit("cancel");
-    };
-    const onSubmit = () => {
-      formRef.value && formRef.value.validate().then(async () => {
-        const paramsData = {
-          sysUser: {
-            mobile: form.mobile,
-            email: form.email
-          },
-          sysOrg: {
-            orgId: props.params.opType == "1" ? "" : props.params.orgId,
-            industryCode: form.industryCode[0],
-            orgName: form.orgName,
-            orgType: form.orgType[0],
-            zoneCode: form.zoneCode,
-            timezone: form.timezone[0],
-            monetaryyUnit: form.monetaryyUnit,
-            monetaryyDeci: form.monetaryyDeci,
-            dateFormat: form.dateFormat[0],
-            langId: form.langId[0],
-            equiNum: form.equiNum,
-            userNum: form.userNum,
-            remark: ""
-          }
-        };
-        loading.value = true;
-        if (props.params.opType == "1") {
-          const { result } = await orgInsert({
-            jsonStr: JSON.stringify(paramsData)
-          });
-          loading.value = false;
-          emit("ok", result);
-        } else if (props.params.opType == "2") {
-          const { result } = await orgUpdate({
-            jsonStr: JSON.stringify(paramsData)
-          });
-          loading.value = false;
-          emit("ok", result);
-        }
-      });
-    };
-    const rules = {
-      orgName: [
-        {
-          required: true,
-          message: t2("uc_org.org_name_msg1"),
-          trigger: "change",
-          validator: (rule, value) => {
-            if (value == "") {
-              return Promise.reject(t2("uc_org.org_name_msg1"));
-            } else {
-              return Promise.resolve();
-            }
-          }
-        }
-      ],
-      orgType: [
-        {
-          required: true,
-          message: t2("uc_org.org_type_msg1"),
-          trigger: "change",
-          validator: (rule, value) => {
-            if (Array.isArray(value) && value.length !== 0) {
-              return Promise.resolve();
-            } else {
-              return Promise.reject(t2("uc_org.org_type_msg1"));
-            }
-          }
-        }
-      ],
-      industryCode: [
-        {
-          required: true,
-          message: t2("uc_org.industry_msg1"),
-          trigger: "change",
-          validator: (rule, value) => {
-            if (Array.isArray(value) && value.length !== 0) {
-              return Promise.resolve();
-            } else {
-              return Promise.reject(t2("uc_org.industry_msg1"));
-            }
-          }
-        }
-      ],
-      zoneCode: [
-        {
-          required: true,
-          message: t2("uc_org.zone_code_msg1"),
-          trigger: ["change", "blur"],
-          validator: (rule, value) => {
-            if (value == "") {
-              return Promise.reject(t2("uc_org.zone_code_msg1"));
-            } else {
-              return Promise.resolve();
-            }
-          }
-        }
-      ],
-      timezone: [
-        {
-          required: true,
-          message: t2("uc_org.timezone_type_msg1"),
-          trigger: ["change", "blur"],
-          validator: (rule, value) => {
-            if (Array.isArray(value) && value.length !== 0) {
-              return Promise.resolve();
-            } else {
-              return Promise.reject(t2("uc_org.timezone_type_msg1"));
-            }
-          }
-        }
-      ],
-      dateFormat: [
-        {
-          required: true,
-          trigger: ["change", "blur"],
-          message: t2("uc_org.dateformat_msg1")
-        }
-      ],
-      monetaryyUnit: [
-        {
-          required: true,
-          trigger: ["change", "blur"],
-          message: t2("uc_org.monery_unit_msg1")
-        }
-      ],
-      langId: [
-        {
-          required: true,
-          message: t2("uc_org.lang_msg1"),
-          trigger: "change",
-          validator: (rule, value) => {
-            if (Array.isArray(value) && value.length !== 0) {
-              return Promise.resolve();
-            } else {
-              return Promise.reject(t2("uc_org.lang_msg1"));
-            }
-          }
-        }
-      ],
-      equiNum: [
-        {
-          required: true,
-          message: t2("uc_org.equi_num_msg1"),
-          trigger: "change"
-        }
-      ],
-      userNum: [
-        {
-          required: true,
-          message: t2("uc_org.user_num_msg1"),
-          trigger: "change"
-        }
-      ]
-    };
-    onMounted(() => {
-      initModel(props.params);
-    });
-    return (_ctx, _cache) => {
-      const _component_a_input = Input;
-      const _component_a_form_item = FormItem;
-      const _component_a_col = Col;
-      const _component_a_row = Row;
-      const _component_a_input_number = InputNumber;
-      const _component_a_form = Form;
-      const _component_a_spin = Spin;
-      const _component_a_button = Button$1;
-      const _component_a_card = Card;
-      return openBlock(), createBlock(_component_a_card, {
-        bordered: false,
-        title: __props.params.opType == "1" ? _ctx.$t("uc_org.title") : _ctx.$t("uc_org.title4")
-      }, {
-        default: withCtx(() => [
-          createVNode(_component_a_spin, { spinning: loading.value }, {
-            default: withCtx(() => [
-              createVNode(_component_a_form, {
-                model: form,
-                ref_key: "formRef",
-                ref: formRef,
-                layout: "vertical",
-                rules
-              }, {
-                default: withCtx(() => [
-                  createVNode(_component_a_row, { gutter: 48 }, {
-                    default: withCtx(() => [
-                      createVNode(_component_a_col, {
-                        lg: 7,
-                        md: 7,
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.user_name"),
-                            name: "userName"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(_component_a_input, {
-                                type: "userName",
-                                disabled: "",
-                                placeholder: _ctx.$t("uc_org.user_name"),
-                                value: form.userName,
-                                "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.userName = $event)
-                              }, null, 8, ["placeholder", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      }),
-                      createVNode(_component_a_col, {
-                        xl: { span: 7 },
-                        lg: { span: 7 },
-                        md: { span: 12 },
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.mobile"),
-                            name: "mobile"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(_component_a_input, {
-                                placeholder: _ctx.$t("uc_org.mobile"),
-                                disabled: __props.params.opType == "2",
-                                value: form.mobile,
-                                "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.mobile = $event)
-                              }, null, 8, ["placeholder", "disabled", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      }),
-                      createVNode(_component_a_col, {
-                        xl: { span: 7 },
-                        lg: { span: 7 },
-                        md: { span: 12 },
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_user.email"),
-                            name: "email"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(_component_a_input, {
-                                placeholder: _ctx.$t("uc_user.email"),
-                                disabled: __props.params.opType == "2",
-                                value: form.email,
-                                "onUpdate:value": _cache[2] || (_cache[2] = ($event) => form.email = $event)
-                              }, null, 8, ["placeholder", "disabled", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      })
-                    ]),
-                    _: 1
-                  }),
-                  createVNode(_component_a_row, { gutter: 48 }, {
-                    default: withCtx(() => [
-                      createVNode(_component_a_col, {
-                        lg: 7,
-                        md: 7,
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.org_name"),
-                            name: "orgName"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(PhTip, { className: "tip-wrapper" }, {
-                                title: withCtx(() => [
-                                  createTextVNode(toDisplayString(_ctx.$t("uc_org.org_name_placeholder")), 1)
-                                ]),
-                                default: withCtx(() => [
-                                  createVNode(_component_a_input, {
-                                    placeholder: _ctx.$t("uc_org.org_name_placeholder"),
-                                    value: form.orgName,
-                                    "onUpdate:value": _cache[3] || (_cache[3] = ($event) => form.orgName = $event)
-                                  }, null, 8, ["placeholder", "value"])
-                                ]),
-                                _: 1
-                              })
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      }),
-                      createVNode(_component_a_col, {
-                        xl: { span: 7 },
-                        lg: { span: 7 },
-                        md: { span: 12 },
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.org_type"),
-                            name: "orgType"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(DictEx, {
-                                type: "ORG_TYPE",
-                                placeholder: _ctx.$t("uc_org.org_type_placeholder"),
-                                value: form.orgType,
-                                "onUpdate:value": _cache[4] || (_cache[4] = ($event) => form.orgType = $event)
-                              }, null, 8, ["placeholder", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      }),
-                      createVNode(_component_a_col, {
-                        xl: { span: 7 },
-                        lg: { span: 7 },
-                        md: { span: 12 },
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.industry"),
-                            name: "industryCode"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(DictEx, {
-                                type: "INDUSTRY_CODE",
-                                placeholder: _ctx.$t("uc_org.industry_placeholder"),
-                                value: form.industryCode,
-                                "onUpdate:value": _cache[5] || (_cache[5] = ($event) => form.industryCode = $event)
-                              }, null, 8, ["placeholder", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      })
-                    ]),
-                    _: 1
-                  }),
-                  createVNode(_component_a_row, { gutter: 48 }, {
-                    default: withCtx(() => [
-                      createVNode(_component_a_col, {
-                        xl: { span: 7 },
-                        lg: { span: 7 },
-                        md: { span: 12 },
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.zone_code"),
-                            name: "zoneCode"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(RegionSelect, {
-                                placeholder: _ctx.$t("uc_org.zone_code_placeholder"),
-                                ref_key: "regionSelRef",
-                                ref: regionSelRef,
-                                onChange: changeRegion,
-                                defaultVal: defaultForm.zoneCode
-                              }, null, 8, ["placeholder", "defaultVal"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      }),
-                      createVNode(_component_a_col, {
-                        lg: 7,
-                        md: 7,
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.timezone"),
-                            name: "timezone"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(TimeZone, {
-                                placeholder: _ctx.$t("uc_org.timezone_placeholder"),
-                                disabled: true,
-                                value: form.timezone,
-                                "onUpdate:value": _cache[6] || (_cache[6] = ($event) => form.timezone = $event)
-                              }, null, 8, ["placeholder", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      }),
-                      createVNode(_component_a_col, {
-                        xl: { span: 7 },
-                        lg: { span: 7 },
-                        md: { span: 12 },
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.dateformat"),
-                            name: "dateFormat"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(DictEx, {
-                                type: "DATE_FORMAT",
-                                disabled: true,
-                                value: form.dateFormat,
-                                "onUpdate:value": _cache[7] || (_cache[7] = ($event) => form.dateFormat = $event)
-                              }, null, 8, ["value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      })
-                    ]),
-                    _: 1
-                  }),
-                  createVNode(_component_a_row, { gutter: 48 }, {
-                    default: withCtx(() => [
-                      createVNode(_component_a_col, {
-                        xl: { span: 7 },
-                        lg: { span: 7 },
-                        md: { span: 12 },
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.monery_unit"),
-                            name: "monetaryyUnit"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(PhTip, { className: "tip-wrapper" }, {
-                                title: withCtx(() => [
-                                  createTextVNode(toDisplayString(_ctx.$t("uc_org.monery_unit_placeholder")), 1)
-                                ]),
-                                default: withCtx(() => [
-                                  createVNode(_component_a_input, {
-                                    placeholder: _ctx.$t("uc_org.monery_unit_placeholder"),
-                                    disabled: true,
-                                    style: { "width": "100%" },
-                                    value: form.monetaryyUnit,
-                                    "onUpdate:value": _cache[8] || (_cache[8] = ($event) => form.monetaryyUnit = $event)
-                                  }, null, 8, ["placeholder", "value"])
-                                ]),
-                                _: 1
-                              })
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      }),
-                      createCommentVNode(` <a-col\r
-            :xl="{ span: 7 }"\r
-            :lg="{ span: 7 }"\r
-            :md="{ span: 12 }"\r
-            :sm="24"\r
-          >\r
-            <a-form-item :label="$t('uc_org.monery_deci')" name="monetaryyDeci">\r
-              <a-input\r
-                :placeholder="$t('uc_org.monery_deci_placeholder')"\r
-                v-model:value="form.monetaryyDeci"\r
-              />\r
-            </a-form-item>\r
-          </a-col> `),
-                      createVNode(_component_a_col, {
-                        lg: 7,
-                        md: 7,
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.lang"),
-                            name: "langId"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(LangCombo, {
-                                placeholder: _ctx.$t("uc_org.lang_placeholder"),
-                                value: form.langId,
-                                "onUpdate:value": _cache[9] || (_cache[9] = ($event) => form.langId = $event)
-                              }, null, 8, ["placeholder", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      }),
-                      createVNode(_component_a_col, {
-                        lg: 7,
-                        md: 7,
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.equi_num"),
-                            name: "equiNum"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(_component_a_input_number, {
-                                style: { "width": "100%" },
-                                placeholder: _ctx.$t("uc_org.equi_num_placeholder"),
-                                min: 1,
-                                value: form.equiNum,
-                                "onUpdate:value": _cache[10] || (_cache[10] = ($event) => form.equiNum = $event)
-                              }, null, 8, ["placeholder", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      })
-                    ]),
-                    _: 1
-                  }),
-                  createVNode(_component_a_row, { gutter: 48 }, {
-                    default: withCtx(() => [
-                      createVNode(_component_a_col, {
-                        xl: { span: 7 },
-                        lg: { span: 7 },
-                        md: { span: 12 },
-                        sm: 24
-                      }, {
-                        default: withCtx(() => [
-                          createVNode(_component_a_form_item, {
-                            label: _ctx.$t("uc_org.user_num"),
-                            name: "userNum"
-                          }, {
-                            default: withCtx(() => [
-                              createVNode(_component_a_input_number, {
-                                style: { "width": "100%" },
-                                placeholder: _ctx.$t("uc_org.user_num_placeholder"),
-                                min: 1,
-                                value: form.userNum,
-                                "onUpdate:value": _cache[11] || (_cache[11] = ($event) => form.userNum = $event)
-                              }, null, 8, ["placeholder", "value"])
-                            ]),
-                            _: 1
-                          }, 8, ["label"])
-                        ]),
-                        _: 1
-                      })
-                    ]),
-                    _: 1
-                  })
-                ]),
-                _: 1
-              }, 8, ["model"])
-            ]),
-            _: 1
-          }, 8, ["spinning"]),
-          createVNode(FooterToolBar, { style: { width: "100%" } }, {
-            default: withCtx(() => [
-              createVNode(_component_a_button, { onClick: onCancel }, {
-                default: withCtx(() => [
-                  createTextVNode(toDisplayString(_ctx.$t("common.btn_cancel")), 1)
-                ]),
-                _: 1
-              }),
-              _cache[12] || (_cache[12] = createTextVNode("\xA0\xA0 ", -1)),
-              createVNode(_component_a_button, {
-                onClick: onSubmit,
-                type: "primary"
-              }, {
-                default: withCtx(() => [
-                  createTextVNode(toDisplayString(_ctx.$t("common.btn_ok")), 1)
-                ]),
-                _: 1
-              })
-            ]),
-            _: 1
-          })
-        ]),
-        _: 1
-      }, 8, ["title"]);
-    };
-  }
-});
-const OrgEdit_vue_vue_type_style_index_0_scoped_bc1e3beb_lang = "";
-const OrgEdit = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-bc1e3beb"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/org/OrgEdit.vue"]]);
-const _hoisted_1$5 = { class: "rwd" };
-const _sfc_main$g = /* @__PURE__ */ defineComponent({
-  __name: "ResetPwdModal",
-  props: {
-    params: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  emits: ["close"],
-  setup(__props, { emit: __emit }) {
-    const { t: t2 } = useI18n();
-    const emit = __emit;
-    const props = __props;
-    const formRef = ref();
-    const visible = ref(true);
-    const destroyOnClose = ref(true);
-    const formItemLayout = reactive({});
-    const form = reactive({
-      userPwd: "",
-      userPwd1: ""
-    });
-    const onSubmit = () => {
-      formRef.value && formRef.value.validate().then(() => {
-        const { orgId } = props.params;
-        if (orgId) {
-          resetPassword({
-            orgId,
-            userPwd: hash.sha256().update(form.userPwd).digest("hex")
-          }).then(() => {
-            message.success(t2("resetPwdSucc"));
-            emit("close");
-          });
-        }
-      });
-    };
-    const onCancel = () => {
-      emit("close");
-    };
-    const rules = {
-      userPwd: [
-        {
-          required: true,
-          message: t2("uc_org.user_pwd1_msg1")
-        }
-      ],
-      userPwd1: [
-        {
-          required: true,
-          message: t2("uc_org.user_pwd2_msg1"),
-          validator: (rule, value) => {
-            if (value == form.userPwd) {
-              return Promise.resolve();
-            } else {
-              return Promise.reject(t2("uc_org.user_pwd2_msg1"));
-            }
-          }
-        }
-      ]
-    };
-    return (_ctx, _cache) => {
-      const _component_a_input = Input;
-      const _component_a_form_item = FormItem;
-      const _component_a_form = Form;
-      const _component_a_button = Button$1;
-      const _component_a_modal = Modal$1;
-      return openBlock(), createElementBlock("div", _hoisted_1$5, [
-        createVNode(_component_a_modal, {
-          class: "custom-org-modal",
-          width: 352,
-          open: visible.value,
-          "onUpdate:open": _cache[2] || (_cache[2] = ($event) => visible.value = $event),
-          style: { "top": "280px" },
-          title: _ctx.$t("uc_org.resetPwd"),
-          destroyOnClose: destroyOnClose.value
-        }, {
-          footer: withCtx(() => [
-            createVNode(_component_a_button, {
-              key: "back",
-              onClick: onCancel
-            }, {
-              default: withCtx(() => [
-                createTextVNode(toDisplayString(_ctx.$t("uc_common.btnCancel")), 1)
-              ]),
-              _: 1
-            }),
-            createVNode(_component_a_button, {
-              key: "submit",
-              type: "primary",
-              onClick: onSubmit
-            }, {
-              default: withCtx(() => [
-                createTextVNode(toDisplayString(_ctx.$t("uc_common.btnSubmit")), 1)
-              ]),
-              _: 1
-            })
-          ]),
-          default: withCtx(() => [
-            createVNode(_component_a_form, {
-              model: form,
-              ref_key: "formRef",
-              ref: formRef,
-              rules,
-              class: "clear-formctrl-lh rwd-content",
-              layout: "vertical"
-            }, {
-              default: withCtx(() => [
-                createVNode(_component_a_form_item, mergeProps(formItemLayout, {
-                  style: { "margin-bottom": "0", "width": "320px" },
-                  name: "userPwd"
-                }), {
-                  label: withCtx(() => [
-                    createTextVNode(toDisplayString(_ctx.$t("uc_org.orgNewPwd")), 1)
-                  ]),
-                  default: withCtx(() => [
-                    createVNode(_component_a_input, {
-                      type: "password",
-                      placeholder: _ctx.$t("uc_common.plsEnter"),
-                      value: form.userPwd,
-                      "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.userPwd = $event)
-                    }, null, 8, ["placeholder", "value"])
-                  ]),
-                  _: 1
-                }, 16),
-                createVNode(_component_a_form_item, mergeProps({
-                  label: _ctx.$t("uc_org.newPwd1")
-                }, formItemLayout, {
-                  name: "userPwd1",
-                  style: { "width": "320px" }
-                }), {
-                  default: withCtx(() => [
-                    createVNode(_component_a_input, {
-                      type: "password",
-                      placeholder: _ctx.$t("uc_common.plsEnter"),
-                      value: form.userPwd1,
-                      "onUpdate:value": _cache[1] || (_cache[1] = ($event) => form.userPwd1 = $event)
-                    }, null, 8, ["placeholder", "value"])
-                  ]),
-                  _: 1
-                }, 16, ["label"])
-              ]),
-              _: 1
-            }, 8, ["model"])
-          ]),
-          _: 1
-        }, 8, ["open", "title", "destroyOnClose"])
-      ]);
-    };
-  }
-});
-const ResetPwdModal_vue_vue_type_style_index_0_lang = "";
-const ResetPwdModal = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/org/ResetPwdModal.vue"]]);
-const _hoisted_1$4 = { class: "add-menu" };
+const PhTip = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-ce85d961"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/PlaceholderTip/index.vue"]]);
+const _hoisted_1$4 = { class: "add-org" };
+const _hoisted_2$2 = { style: { "font-size": "12px", "color": "#86909c", "padding-left": "4px" } };
 const _sfc_main$f = /* @__PURE__ */ defineComponent({
   __name: "AddOrg",
   props: {
@@ -42617,6 +42364,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
   },
   emits: ["ok", "cancel"],
   setup(__props, { emit: __emit }) {
+    const { requiredMessage } = useRequiredMessage();
     const { t: t2 } = useI18n();
     const emit = __emit;
     const props = __props;
@@ -42642,18 +42390,6 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
     });
     const defaultForm = reactive({});
     const isEdit = computed(() => props.params.opType == "2");
-    const validateMaxUser = (_, value) => {
-      if ((value < 1 || value > 99999999) && value) {
-        return Promise.reject(t2("uc_org.userMaxNum"));
-      }
-      return Promise.resolve();
-    };
-    const validateMaxOperator = (_, value) => {
-      if ((value < 1 || value > 99999999) && value) {
-        return Promise.reject(t2("uc_org.userMaxNum"));
-      }
-      return Promise.resolve();
-    };
     const initData = async () => {
       loading.value = true;
       const { result } = await orgUpdateLoad({
@@ -42743,21 +42479,12 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       orgName: [
         {
           required: true,
-          message: t2("uc_org.org_name_msg1"),
-          trigger: "change",
-          validator: (rule, value) => {
-            if (value == "") {
-              return Promise.reject(t2("uc_org.org_name_msg1"));
-            } else {
-              return Promise.resolve();
-            }
-          }
+          message: t2("uc_org.org_name_msg1")
         }
       ],
       orgType: [
         {
           required: true,
-          message: t2("uc_org.org_type_msg1"),
           trigger: "change",
           validator: (rule, value) => {
             if (Array.isArray(value) && value.length !== 0) {
@@ -42771,7 +42498,6 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       industryCode: [
         {
           required: true,
-          message: t2("uc_org.industry_msg1"),
           trigger: "change",
           validator: (rule, value) => {
             if (Array.isArray(value) && value.length !== 0) {
@@ -42785,7 +42511,6 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       zoneCode: [
         {
           required: true,
-          message: t2("uc_org.zone_code_msg1"),
           trigger: ["change", "blur"],
           validator: (rule, value) => {
             if (value == "") {
@@ -42799,7 +42524,6 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       langId: [
         {
           required: true,
-          message: t2("uc_org.lang_msg1"),
           trigger: "change",
           validator: (rule, value) => {
             if (Array.isArray(value) && value.length !== 0) {
@@ -42813,24 +42537,14 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       userNum: [
         {
           required: true,
-          message: t2("uc_org.userMaxNum"),
-          trigger: ["blur", "change"]
-        },
-        {
-          validator: validateMaxUser,
-          message: t2("uc_org.userMaxNum"),
+          message: requiredMessage(t2("uc_org.user_num")),
           trigger: ["blur", "change"]
         }
       ],
       equiNum: [
         {
           required: true,
-          message: t2("uc_org.userMaxNum"),
-          trigger: ["blur", "change"]
-        },
-        {
-          validator: validateMaxOperator,
-          message: t2("uc_org.userMaxNum"),
+          message: requiredMessage(t2("uc_org.org_maxOperator")),
           trigger: ["blur", "change"]
         }
       ]
@@ -42847,7 +42561,6 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
       const _component_a_form = Form;
       const _component_a_button = Button$1;
       const _component_a_space = Space;
-      const _directive_col = resolveDirective("col");
       const _directive_row = resolveDirective("row");
       return openBlock(), createElementBlock("div", _hoisted_1$4, [
         withDirectives((openBlock(), createBlock(_component_a_form, {
@@ -42866,9 +42579,9 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_a_input, {
                   placeholder: _ctx.$t("uc_common.plsEnter"),
+                  autocomplete: "off",
                   value: form.orgName,
-                  "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.orgName = $event),
-                  required: ""
+                  "onUpdate:value": _cache[0] || (_cache[0] = ($event) => form.orgName = $event)
                 }, null, 8, ["placeholder", "value"])
               ]),
               _: 1
@@ -42907,8 +42620,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                         createVNode(_component_a_input, {
                           placeholder: _ctx.$t("uc_common.plsSelect"),
                           value: form.orgName,
-                          "onUpdate:value": _cache[2] || (_cache[2] = ($event) => form.orgName = $event),
-                          required: ""
+                          "onUpdate:value": _cache[2] || (_cache[2] = ($event) => form.orgName = $event)
                         }, null, 8, ["placeholder", "value"])
                       ]),
                       _: 1
@@ -42987,7 +42699,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(LangCombo, {
-                          placeholder: _ctx.$t("uc_common.plsEnter"),
+                          placeholder: _ctx.$t("uc_common.plsSelect"),
                           value: form.langId,
                           "onUpdate:value": _cache[5] || (_cache[5] = ($event) => form.langId = $event)
                         }, null, 8, ["placeholder", "value"])
@@ -43010,6 +42722,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                               placeholder: _ctx.$t("uc_org.org_autoZone"),
                               disabled: true,
                               style: { "width": "100%" },
+                              autocomplete: "off",
                               value: form.monetaryyUnit,
                               "onUpdate:value": _cache[6] || (_cache[6] = ($event) => form.monetaryyUnit = $event)
                             }, null, 8, ["placeholder", "value"])
@@ -43081,6 +42794,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                         createVNode(_component_a_input_number, {
                           style: { "width": "100%" },
                           placeholder: _ctx.$t("uc_common.plsEnter"),
+                          precision: 0,
                           min: 1,
                           max: 99999999,
                           value: form.userNum,
@@ -43094,24 +42808,23 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                 }),
                 createVNode(_component_a_col, { span: 12 }, {
                   default: withCtx(() => [
-                    withDirectives((openBlock(), createBlock(_component_a_form_item, {
+                    createVNode(_component_a_form_item, {
                       label: _ctx.$t("uc_org.org_maxOperator"),
                       name: "equiNum"
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_a_input_number, {
+                          style: { "width": "100%" },
                           placeholder: _ctx.$t("uc_common.plsEnter"),
+                          precision: 0,
                           min: 1,
                           max: 99999999,
                           value: form.equiNum,
-                          "onUpdate:value": _cache[10] || (_cache[10] = ($event) => form.equiNum = $event),
-                          required: ""
+                          "onUpdate:value": _cache[10] || (_cache[10] = ($event) => form.equiNum = $event)
                         }, null, 8, ["placeholder", "value"])
                       ]),
                       _: 1
-                    }, 8, ["label"])), [
-                      [_directive_col, 12]
-                    ])
+                    }, 8, ["label"])
                   ]),
                   _: 1
                 })
@@ -43129,6 +42842,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_a_input, {
                           disabled: isEdit.value,
+                          autocomplete: "off",
                           placeholder: _ctx.$t("uc_common.plsEnter"),
                           value: form.mobile,
                           "onUpdate:value": _cache[11] || (_cache[11] = ($event) => form.mobile = $event)
@@ -43148,6 +42862,7 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_a_input, {
                           disabled: isEdit.value,
+                          autocomplete: "off",
                           placeholder: _ctx.$t("uc_common.plsEnter"),
                           value: form.email,
                           "onUpdate:value": _cache[12] || (_cache[12] = ($event) => form.email = $event)
@@ -43166,22 +42881,24 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
               gutter: 16
             }, {
               default: withCtx(() => [
-                createVNode(_component_a_col, { span: 12 }, {
+                createVNode(_component_a_col, { span: 24 }, {
                   default: withCtx(() => [
-                    createVNode(_component_a_form_item, {
-                      label: _ctx.$t("uc_org.org_userCode"),
-                      name: "userCode"
-                    }, {
+                    createVNode(_component_a_form_item, { name: "userCode" }, {
+                      label: withCtx(() => [
+                        createTextVNode(toDisplayString(_ctx.$t("uc_org.org_userCode")) + " ", 1),
+                        createElementVNode("span", _hoisted_2$2, toDisplayString(_ctx.$t("uc_org.userCodeTip")), 1)
+                      ]),
                       default: withCtx(() => [
                         createVNode(_component_a_input, {
                           placeholder: _ctx.$t("uc_common.plsEnter"),
                           disabled: isEdit.value,
+                          autocomplete: "off",
                           value: form.userCode,
                           "onUpdate:value": _cache[13] || (_cache[13] = ($event) => form.userCode = $event)
                         }, null, 8, ["placeholder", "disabled", "value"])
                       ]),
                       _: 1
-                    }, 8, ["label"])
+                    })
                   ]),
                   _: 1
                 })
@@ -43310,7 +43027,7 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
       operatorNum: props.data.userNum || "-",
       operatorTel: props.data.sysUser.mobile || "-",
       operatorEmail: props.data.sysUser.email || "-",
-      operatorCode: props.data.sysUser.userId || "-"
+      operatorCode: props.data.sysUser.userCode || "-"
     });
     const onCancel = () => {
       emit("cancel");
@@ -43490,30 +43207,25 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
 const OrgDetail_vue_vue_type_style_index_0_scoped_b1c0cf37_lang = "";
 const OrgDetail = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-b1c0cf37"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/views/sys/org/OrgDetail.vue"]]);
 const _hoisted_1$2 = { class: "org-box" };
-const _hoisted_2$1 = { bordered: false };
-const _hoisted_3$1 = { class: "form-btns" };
-const _hoisted_4$1 = {
+const _hoisted_2$1 = { class: "form-btns" };
+const _hoisted_3$1 = {
   class: "table-page-search-wrapper",
   style: { "margin-bottom": "16px" }
 };
+const _hoisted_4$1 = { key: 0 };
 const _sfc_main$c = /* @__PURE__ */ defineComponent({
   __name: "index",
   setup(__props) {
     const appStore = useAppStore();
     const userStore = useUserStore();
-    useInitUserinfo();
     const modalStore = useModalStore();
+    const { formatDate } = useSysParams();
     const prefixCls = "uc";
     const { t: t2 } = useI18n();
     const tableRef = ref();
     const showResetPwdModal = ref(false);
-    const isEdit = ref(false);
     const resetPwdParams = ref({});
     const queryParam = reactive({});
-    const editParams = ref({
-      opType: "",
-      orgId: ""
-    });
     const loadData = async (parameter) => {
       const params = Object.assign(parameter, queryParam);
       const { result } = await orgConditionalSeach(params);
@@ -43553,7 +43265,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
       queryParam.orgStatus = null;
       handleRefreshTable();
     };
-    const onAdd = (row = null, opType = "1") => {
+    const onAdd = (row = {}, opType = "1") => {
       modalStore.drawerComp({
         title: opType == "1" ? t2("uc_org.createOrg") : t2("uc_org.editOrg"),
         comp: AddOrg,
@@ -43562,8 +43274,9 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
           onOk: () => {
             try {
               if (opType == "1") {
+                message.success(t2("uc_org.createOrgSucc"));
               } else if (opType == "2") {
-                message.success("uc_org.updateOrgSucc");
+                message.success(t2("uc_org.updateOrgSucc"));
               }
             } catch (error) {
             } finally {
@@ -43619,14 +43332,6 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
         }
       });
     };
-    const onSubmit = () => {
-      isEdit.value = false;
-      handleRefreshTable();
-    };
-    const onCancel = () => {
-      isEdit.value = false;
-      modalStore.modalDestroy();
-    };
     const columns = computed(() => [
       {
         title: t2("uc_org.id"),
@@ -43696,8 +43401,8 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
       const _component_a_button = Button$1;
       const _component_a_form = Form;
       const _component_uc_btn_add = resolveComponent("uc-btn-add");
+      const _component_a_tooltip = Tooltip;
       const _component_uc_btn_detail = resolveComponent("uc-btn-detail");
-      const _component_uc_pick_label = resolveComponent("uc-pick-label");
       const _component_a_switch = Switch;
       const _component_uc_btn_edit = resolveComponent("uc-btn-edit");
       const _component_a_divider = Divider;
@@ -43713,7 +43418,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           createElementVNode("div", _hoisted_1$2, [
-            withDirectives(createElementVNode("div", _hoisted_2$1, [
+            createElementVNode("div", null, [
               createVNode(_component_a_form, {
                 model: queryParam,
                 layout: "vertical",
@@ -43726,10 +43431,11 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                   }, {
                     default: withCtx(() => [
                       createVNode(_component_a_input, {
-                        placeholder: _ctx.$t("uc_common.plsSearch"),
+                        placeholder: _ctx.$t("uc_common.plsEnter"),
                         value: queryParam.orgName,
                         "onUpdate:value": _cache[0] || (_cache[0] = ($event) => queryParam.orgName = $event),
-                        allowClear: ""
+                        allowClear: "",
+                        autocomplete: "off"
                       }, null, 8, ["placeholder", "value"])
                     ]),
                     _: 1
@@ -43747,7 +43453,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   }, 8, ["label"]),
-                  createElementVNode("div", _hoisted_3$1, [
+                  createElementVNode("div", _hoisted_2$1, [
                     createVNode(_component_uc_btn_search, {
                       onClick: handleRefreshTable,
                       isWidth: true,
@@ -43766,7 +43472,7 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }, 8, ["model"]),
-              createElementVNode("div", _hoisted_4$1, [
+              createElementVNode("div", _hoisted_3$1, [
                 createVNode(_component_uc_btn_add, {
                   onClick: onAdd,
                   text: _ctx.$t("uc_org.createOrg"),
@@ -43780,8 +43486,23 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                 data: loadData,
                 rowKey: "cdate",
                 columns: columns.value,
-                scroll: { x: 1e3, y: 550 }
+                scroll: { x: 1e3, y: 550 },
+                class: "table-bordered"
               }, {
+                headerCell: withCtx(({ column }) => [
+                  column.key === "userId" ? (openBlock(), createElementBlock("span", _hoisted_4$1, [
+                    createTextVNode(toDisplayString(_ctx.$t("uc_org.user_name")) + " ", 1),
+                    createVNode(_component_a_tooltip, null, {
+                      title: withCtx(() => [
+                        createTextVNode(toDisplayString(_ctx.$t("uc_org.userNameTip")), 1)
+                      ]),
+                      default: withCtx(() => [
+                        createVNode(unref(InfoCircleOutlined), { style: { "font-size": "14px", "padding-left": "4px" } })
+                      ]),
+                      _: 1
+                    })
+                  ])) : createCommentVNode("v-if", true)
+                ]),
                 bodyCell: withCtx(({ record, column }) => [
                   column.key === "orgId" ? (openBlock(), createBlock(_component_uc_btn_detail, {
                     key: 0,
@@ -43793,10 +43514,9 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 2
                   }, 1032, ["onClick"])) : createCommentVNode("v-if", true),
-                  column.key === "cdate" ? (openBlock(), createBlock(_component_uc_pick_label, {
-                    key: 1,
-                    defaultValue: record.cdate
-                  }, null, 8, ["defaultValue"])) : createCommentVNode("v-if", true),
+                  column.key === "cdate" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+                    createTextVNode(toDisplayString(unref(formatDate)(record.cdate) || "-"), 1)
+                  ], 64)) : createCommentVNode("v-if", true),
                   column.key === "userId" ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
                     createTextVNode(toDisplayString(record.sysUser.userCode || "-"), 1)
                   ], 64)) : createCommentVNode("v-if", true),
@@ -43828,19 +43548,11 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }, 8, ["columns"])
-            ], 512), [
-              [vShow, !isEdit.value]
             ]),
             showResetPwdModal.value ? (openBlock(), createBlock(ResetPwdModal, {
               key: 0,
               params: resetPwdParams.value,
               onClose: handleCloseResetPwdModal
-            }, null, 8, ["params"])) : createCommentVNode("v-if", true),
-            isEdit.value ? (openBlock(), createBlock(OrgEdit, {
-              key: 1,
-              onOk: onSubmit,
-              onCancel,
-              params: editParams.value
             }, null, 8, ["params"])) : createCommentVNode("v-if", true)
           ])
         ]),
@@ -44088,6 +43800,7 @@ const _sfc_main$b = {
                             value: securityForm.passwordExpiry,
                             "onUpdate:value": _cache[1] || (_cache[1] = ($event) => securityForm.passwordExpiry = $event),
                             min: 1,
+                            precision: 0,
                             max: 99999,
                             style: { "width": "100px" }
                           }, null, 8, ["value"])) : (openBlock(), createElementBlock("span", _hoisted_12, toDisplayString(securityForm.passwordExpiry), 1)),
@@ -44158,6 +43871,7 @@ const _sfc_main$b = {
                             value: securityForm.maxLoginTime,
                             "onUpdate:value": _cache[3] || (_cache[3] = ($event) => securityForm.maxLoginTime = $event),
                             min: 1,
+                            precision: 0,
                             max: 43200,
                             style: { "width": "100px" }
                           }, null, 8, ["value"])) : (openBlock(), createElementBlock("span", _hoisted_16, toDisplayString(securityForm.maxLoginTime), 1)),
@@ -44812,57 +44526,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
 });
 const BtnResetPwd_vue_vue_type_style_index_0_scoped_8ba0bbf3_lang = "";
 const BtnResetPwd = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-8ba0bbf3"], ["__file", "D:/inhe-code/usercenter-web-test/witlink-platform-usercenter-web/witlink-usercenter/src/components/inhe/buttons/BtnResetPwd.vue"]]);
-function toFormatDate(date, format) {
-  const o = {
-    "M+": date.getMonth() + 1,
-    "d+": date.getDate(),
-    "H+": date.getHours(),
-    "m+": date.getMinutes(),
-    "s+": date.getSeconds(),
-    "q+": Math.floor((date.getMonth() + 3) / 3),
-    S: date.getMilliseconds()
-  };
-  let result = format;
-  if (/(y+)/.test(result)) {
-    result = result.replace(
-      RegExp.$1,
-      (date.getFullYear() + "").substr(4 - RegExp.$1.length)
-    );
-  }
-  for (const k2 in o) {
-    if (new RegExp("(" + k2 + ")").test(result)) {
-      result = result.replace(
-        RegExp.$1,
-        RegExp.$1.length == 1 ? o[k2] : ("00" + o[k2]).substr(("" + o[k2]).length)
-      );
-    }
-  }
-  return result;
-}
-function toUTC(date) {
-  const UTCyear = date.getUTCFullYear();
-  let UTCmonth = date.getUTCMonth() + 1;
-  let UTCday = date.getUTCDate();
-  let UTChours = date.getUTCHours();
-  let UTCmin = date.getUTCMinutes();
-  let UTCseconds = date.getUTCSeconds();
-  UTCmonth = UTCmonth < 10 ? "0" + UTCmonth : UTCmonth;
-  UTCday = UTCday < 10 ? "0" + UTCday : UTCday;
-  UTChours = UTChours < 10 ? "0" + UTChours : UTChours;
-  UTCmin = UTCmin < 10 ? "0" + UTCmin : UTCmin;
-  UTCseconds = UTCseconds < 10 ? "0" + UTCseconds : UTCseconds;
-  return UTCyear + "-" + UTCmonth + "-" + UTCday + "T" + UTChours + ":" + UTCmin + ":" + UTCseconds + ".000+0000";
-}
-function getOffset(timezone) {
-  let offset = timezone.substr(7);
-  if (!offset) {
-    offset = 0;
-  } else {
-    offset = offset * 1;
-  }
-  offset = offset * 60 + new Date().getTimezoneOffset();
-  return offset;
-}
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "PickDate",
   props: {
@@ -44954,7 +44617,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!dateTime) {
         return "";
       }
-      dateFormat.value = userStore.dateFormat;
+      dateFormat.value = userStore.dateFormat || "yyyy-MM-dd HH:mm:ss";
       if (!props.showTime) {
         dateFormat.value = dateFormat.value.replace(/[H,m,s,:,\s]/g, "");
       }