@indfnd/common 1.0.35 → 1.0.36

package/dist/ind-common.es.js

@@ -1,8 +1,8 @@
 import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Drawer$1, Dropdown as Dropdown$1, Modal as Modal$1, Form, FormItem, Select as Select$1, Option, Row, Col, Menu, MenuItem, Badge, DropdownMenu, DropdownItem, Submenu, Tag, Header, Layout, Content, Spin, Poptip as Poptip$1, CheckboxGroup, Checkbox, RadioGroup, Radio, Card, Message, LoadingBar } from "view-design";
-import { isNil, formatDate as formatDate$1, useConfig, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, getLocalStorage, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
+import { isNil, formatDate as formatDate$1, useConfig, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, getLocalStorage, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, listComTreeApi, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "1.0.34";
+const version = "1.0.35";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -48589,6 +48589,7 @@ var FormImpl = {
     searchLoading: Boolean,
     queryBtn: { type: Boolean, default: true },
     resetBtn: { type: Boolean, default: true },
+    scopedSlots: Object,
     formCacheList: Array,
     curCacheId: String,
     formEnumData: Object
@@ -49176,7 +49177,12 @@ var FormImpl = {
                     prop: d.formKey
                   }
                 },
-                [itemInner]
+                [
+                  this.scopedSlots[d.formKey] ? this.scopedSlots[d.formKey]({
+                    form: this.form,
+                    item: d
+                  }) : itemInner
+                ]
               )
             ]
           )
@@ -49919,7 +49925,7 @@ var render$15 = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", { staticClass: "ind-form-wrap" }, [_c("FormImpl", _vm._g(_vm._b({ ref: "form", attrs: { "funId": (_vm.funId || "") + "-" + _vm.$route.meta.permissionId, "formCacheList": _vm.formCacheList, "curCacheId": _vm.curCacheId, "formEnumData": _vm.formEnumData, "value": _vm.value, "fieldList": _vm.fieldList }, on: { "update:formEnumData": function($event) {
+  return _c("div", { staticClass: "ind-form-wrap" }, [_c("FormImpl", _vm._g(_vm._b({ ref: "form", attrs: { "funId": (_vm.funId || "") + "-" + _vm.$route.meta.permissionId, "formCacheList": _vm.formCacheList, "curCacheId": _vm.curCacheId, "formEnumData": _vm.formEnumData, "value": _vm.value, "fieldList": _vm.fieldList, "scopedSlots": _vm.$scopedSlots }, on: { "update:formEnumData": function($event) {
     _vm.formEnumData = $event;
   }, "update:form-enum-data": function($event) {
     _vm.formEnumData = $event;
@@ -52245,7 +52251,7 @@ var render$$ = function() {
     _vm.checkAllGroup = $$v;
   }, expression: "checkAllGroup" } }, [_vm._l(_vm.columns, function(item2) {
     return [item2.title ? _c("Checkbox", { key: item2.field, attrs: { "label": item2.title } }, [_vm._v(_vm._s(item2.title))]) : _vm._e()];
-  }), _c("br"), _c("br"), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnSave } }, [_vm._v("\u4FDD \u5B58")]), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnClear } }, [_vm._v("\u6E05 \u9664")])], 2), _c("Button", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel != "1", expression: "btnSel != '1'" }], staticStyle: { "position": "absolute", "top": "10px", "right": "10px" }, attrs: { "type": "primary", "icon": "md-close", "size": "small", "title": "\u5173\u95ED" }, on: { "click": _vm.closeTableSettingDropdown } })], 1)], 1)], 1)])], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": !_vm.showTableOption, "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight, "rowHeight": _vm.getRowHeight(), "getRowHeight": _vm.getRowHeight, "rowData": _vm.rowDataFiltered, "suppressRowClickSelection": (_vm.isPc || _vm.isEditTable) && _vm.rowSelection == "multiple" || _vm.suppressRowClickSelection, "rowSelection": _vm.rowSelection, "rowMultiSelectWithClick": !_vm.isPc && !_vm.isEditTable && (_vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick), "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClassCommon, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded, "getContextMenuItems": _vm.getContextMenuItems }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "rowSelected": _vm.rowSelected, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
+  }), _c("br"), _c("br"), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnSave } }, [_vm._v("\u4FDD \u5B58")]), _vm._v(" \xA0 "), _c("Button", { staticClass: "table-column-select-btn", attrs: { "type": "default" }, on: { "click": _vm.columnClear } }, [_vm._v("\u6E05 \u9664")])], 2), _c("Button", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel != "1", expression: "btnSel != '1'" }], staticStyle: { "position": "absolute", "top": "10px", "right": "10px" }, attrs: { "type": "primary", "icon": "md-close", "size": "small", "title": "\u5173\u95ED" }, on: { "click": _vm.closeTableSettingDropdown } })], 1)], 1)], 1)])], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": !_vm.showTableOption, "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight, "rowHeight": _vm.getRowHeightProp ? _vm.getRowHeightProp() : _vm.getRowHeight(), "getRowHeight": _vm.getRowHeightProp || _vm.getRowHeight, "rowData": _vm.rowDataFiltered, "suppressRowClickSelection": (_vm.isPc || _vm.isEditTable) && _vm.rowSelection == "multiple" || _vm.suppressRowClickSelection, "rowSelection": _vm.rowSelection, "rowMultiSelectWithClick": !_vm.isPc && !_vm.isEditTable && (_vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick), "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClassCommon, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded, "getContextMenuItems": _vm.getContextMenuItems }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "rowSelected": _vm.rowSelected, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
 };
 var staticRenderFns$$ = [];
 function suppressNavigation$1(params) {
@@ -52337,6 +52343,9 @@ const __vue2_script$10 = {
     AgImage
   },
   props: {
+    rowHeight: Number,
+    headerHeight: Number,
+    getRowHeightProp: Function,
     rowSpanDefs: Array,
     headerHeight: {
       type: Number,
@@ -53618,57 +53627,70 @@ const __vue2_script$10 = {
     },
     renderSumRow: _.debounce(async function() {
       var _a;
-      let hasSumRow = this.flatColumns.some((item2) => item2.isSum);
+      let hasSumRow = _.some(this.flatColumns, (item2) => item2.isSum);
       if (hasSumRow) {
         console.time("calcSum");
+        let sumCols = _.filter(this.flatColumns, (item2) => item2.isSum);
+        let sumCalcCols = _.remove(sumCols, (item2) => isString(item2.isSum));
+        let sumFuncCols = _.remove(sumCols, (item2) => item2.isSum instanceof Function);
+        const sumCalcRuleMap = {};
+        _.forEach(sumCalcCols, (col) => {
+          addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
+        });
         let sumData = {};
-        for (let col of this.flatColumns) {
-          if (!["checkbox", "radios", "index"].includes(col.type)) {
-            sumData[col.field || col.key] = "\u5408\u8BA1";
+        for (let i = 0; i < this.flatColumns.length; i++) {
+          if (!["checkbox", "radios", "index"].includes((_a = this.flatColumns[i]) == null ? void 0 : _a.type)) {
+            let colTmp = this.flatColumns[i];
+            sumData[colTmp.field || colTmp.key] = "\u5408\u8BA1";
             break;
           }
         }
-        let sumCols = this.flatColumns.filter((item2) => item2.isSum);
-        let sumCalcCols = [], sumFuncCols = [];
-        sumCols.forEach((col) => {
-          if (typeof col.isSum === "string")
-            sumCalcCols.push(col);
-          else if (col.isSum instanceof Function)
-            sumFuncCols.push(col);
-        });
-        const sumCalcRuleMap = {};
-        sumCalcCols.forEach((col) => {
-          addCalcRuleMap(sumCalcRuleMap, col.isSum, col.field || col.key);
-        });
-        sumCols.forEach((col) => {
-          if (!(col.field || col.key) in sumData)
-            sumData[col.field || col.key] = 0;
-        });
-        this.rowDataFiltered.forEach((d) => {
-          sumCols.forEach((dd) => {
-            if (typeof dd.isSum === "string")
-              return;
-            let field = dd.field || dd.key;
-            let value = d[field];
-            if (typeof value === "number" && !isNaN(value)) {
-              sumData[field] = (sumData[field] || 0) + value;
-            }
-          });
-        });
-        sumFuncCols.forEach((col) => {
-          sumData[col.field || col.key] = col.isSum(this.rowDataFiltered, col);
+        sumCols.forEach((d) => sumData[d.field || d.key] = 0);
+        sumData = _.reduce(
+          this.rowDataFiltered,
+          (s, d, idx) => {
+            sumCols.forEach((dd) => {
+              if (isString(dd.isSum))
+                return;
+              let field = dd.field || dd.key;
+              let rowMergeInfo = this.tableRowSpanMergeIndexMap[field];
+              let mergedRows = [];
+              _.forEach(rowMergeInfo, (v, k) => {
+                let rows2 = _.range(k, parseInt(k) + v);
+                mergedRows.push(...rows2.slice(1));
+              });
+              if (!mergedRows.includes(idx)) {
+                sumData[field] = _.round(
+                  sumData[field] + (!d[field] || isNaN(d[field]) ? 0 : parseFloat(d[field])),
+                  6
+                );
+              }
+            });
+            return s;
+          },
+          sumData
+        );
+        _.forEach(sumFuncCols, (d) => {
+          sumData[d.field || d.key] = d.isSum(this.rowDataFiltered, d);
         });
         let sumRows = [sumData];
+        let calcRules = {};
+        _.forEach(sumCalcRuleMap, (v, k) => {
+          _.merge(calcRules, v);
+        });
         let rules = [];
-        for (let key in sumCalcRuleMap) {
-          let column = sumCalcCols.find((col) => col.field === key || col.key === key);
+        _.forEach(calcRules, (v, k) => {
+          var _a2;
+          let column = _.find(sumCalcCols, (d) => {
+            return d.field == k || d.key == k;
+          });
           rules.push({
-            rltKey: key,
-            ast: sumCalcRuleMap[key],
-            precision: ((_a = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a.scale) || 2,
+            rltKey: k,
+            ast: v,
+            precision: ((_a2 = column == null ? void 0 : column.cellRendererParams) == null ? void 0 : _a2.scale) || 2,
             errRtn: 0
           });
-        }
+        });
         let options = { calcRules: rules };
         calcDatas(sumRows, options);
         this.topRows = this.pinnedTopRowDataWithUnit ? _.concat(this.pinnedTopRowDataWithUnit, sumRows) : sumRows;
@@ -65952,9 +65974,6 @@ var uploadImg = /* @__PURE__ */ function() {
   return __component__$2.exports;
 }();
 const CONTEXT$1 = `${config.imgServerContext}/system/auths`;
-function getAuthDetaileTypeApi$1(params) {
-  return axios.get(`${CONTEXT$1}/getAuthDetaileType`, { params });
-}
 function getRoleListApi(params) {
   return axios.get(`${CONTEXT$1}/getRoleList`, { params });
 }
@@ -65982,11 +66001,9 @@ var render$1 = function() {
   var _c = _vm._self._c || _h;
   return _c("IndPageView", [_c("Row", { staticClass: "row-contain", attrs: { "gutter": 16 } }, [_c("Col", { attrs: { "span": "8" } }, [_c("IndTable", { ref: "table", attrs: { "disablePage": "", "columns": _vm.tableColumns, "dataApi": _vm.dataApi, "search-params": _vm.searchParams, "rowKey": "roleId", "auto-refresh": "" }, on: { "on-data-load": _vm.tableDataLoad, "on-select-change": _vm.tableSelectChange }, scopedSlots: _vm._u([{ key: "buttons", fn: function() {
     return [_c("IndButton", { attrs: { "bizType": "table" }, on: { "click": _vm.addRole } }, [_vm._v("\u65B0\u589E")])];
-  }, proxy: true }]) })], 1), _c("Col", { attrs: { "span": "16" } }, [_c("IndLoadingPanel", { staticClass: "ind-flex-column", attrs: { "loading": _vm.userAuthLoading } }, [_c("div", { staticClass: "ind-flex-no-shrink important-tip" }, [_c("Icon", { attrs: { "type": "md-information-circle" } }), _c("span", { attrs: { "name": "importanttip" } }, [_vm._v("\u5F53\u524D\u9009\u4E2D\u89D2\u8272\uFF1A"), _c("span", { staticClass: "ind-blue" }, [_vm._v(_vm._s(_vm.selectedRole ? _vm.selectedRole.roleName : ""))])])], 1), _c("div", { staticClass: "ind-flex-grow content" }, [_c("Row", { attrs: { "gutter": 16 } }, [_c("Col", { attrs: { "span": "12" } }, [!_vm.userAuthLoading ? _c("IndTree", { ref: "userTree", attrs: { "data": _vm.userTreeData, "default-value": _vm.defaultUserId, "multiple": "", "show-checkbox": "", "defaultExpandLevel": 1, "isShowHeader": true, "treeName": "\u7CFB\u7EDF\u7528\u6237\uFF1A[\u90E8\u95E8(\u5DF2\u8BBE\u4EBA\u6570/\u603B\u4EBA\u6570)] \u3001[\u7528\u6237(\u89D2\u82721,\u89D2\u82722...)]" } }) : _vm._e()], 1), _c("Col", { attrs: { "span": "12" } }, [_c("IndLoadingPanel", { staticClass: "ind-flex-column", attrs: { "loading": _vm.authTreeLoading } }, [_c("div", { staticClass: "auth-type-select-container" }, [_c("Row", [_c("Col", [_c("span", { staticClass: "auth-type-label" }, [_vm._v("\u6743\u9650\u7C7B\u578B\uFF1A")])]), _c("Col", [_c("div", { staticClass: "auth-type-value" }, [_c("IndSelect", { attrs: { "filterable": "" }, model: { value: _vm.authDetaileTypeParam, callback: function($$v) {
-    _vm.authDetaileTypeParam = $$v;
-  }, expression: "authDetaileTypeParam" } }, _vm._l(_vm.authDetaileTypes, function(type) {
-    return _c("IndOption", { key: type.value, attrs: { "value": type.value } }, [_vm._v(" " + _vm._s(type.label) + " ")]);
-  }), 1)], 1)])], 1)], 1), !_vm.userAuthLoading ? _c("IndTree", { ref: "authTree", attrs: { "data": _vm.authTreeData, "default-value": _vm.defaultAuthId, "multiple": "", "show-checkbox": "", "expandAll": "", "isShowHeader": false } }) : _vm._e()], 1)], 1)], 1)], 1), _c("div", { staticClass: "ind-flex-no-shrink function-wrapper" }, [_c("IndButtonGroup", { attrs: { "center": "" } }, [_c("IndButton", { attrs: { "bizType": "save", "loading": _vm.saveLoading }, on: { "click": _vm.saveUsersAuths } })], 1)], 1)])], 1)], 1), _c("IndModal", { attrs: { "lazyRender": false, "title": "\u89D2\u8272\u7F16\u8F91", "saving": _vm.saveRoleLoading }, on: { "on-ok": _vm.saveRole }, model: { value: _vm.showEditRole, callback: function($$v) {
+  }, proxy: true }]) })], 1), _c("Col", { attrs: { "span": "16" } }, [_c("IndLoadingPanel", { staticClass: "ind-flex-column", attrs: { "loading": _vm.userAuthLoading } }, [_c("div", { staticClass: "ind-flex-no-shrink important-tip" }, [_c("Icon", { attrs: { "type": "md-information-circle" } }), _c("span", { attrs: { "name": "importanttip" } }, [_vm._v("\u5F53\u524D\u9009\u4E2D\u89D2\u8272\uFF1A"), _c("span", { staticClass: "ind-blue" }, [_vm._v(_vm._s(_vm.selectedRole ? _vm.selectedRole.roleName : ""))])])], 1), _c("div", { staticClass: "ind-flex-grow content" }, [_c("Row", { attrs: { "gutter": 16 } }, [_c("Col", { attrs: { "span": "12" } }, [!_vm.userAuthLoading ? _c("IndTree", { ref: "userTree", attrs: { "data": _vm.userTreeData, "default-value": _vm.defaultUserId, "multiple": "", "show-checkbox": "", "defaultExpandLevel": 1, "isShowHeader": true, "treeName": "\u7CFB\u7EDF\u7528\u6237\uFF1A[\u90E8\u95E8(\u5DF2\u8BBE\u4EBA\u6570/\u603B\u4EBA\u6570)] \u3001[\u7528\u6237(\u89D2\u82721,\u89D2\u82722...)]" } }) : _vm._e()], 1), _c("Col", { attrs: { "span": "12" } }, [_c("IndLoadingPanel", { staticClass: "ind-flex-column", attrs: { "loading": _vm.authTreeLoading } }, [_c("div", { staticClass: "auth-type-select-container" }, [_c("Row", [_c("Col", [_c("IndFormWrap", { ref: "authDetaileTypeForm", attrs: { "fieldList": _vm.authDetaileTypeField, "gridColumns": 1 }, model: { value: _vm.authDetaileTypeForm, callback: function($$v) {
+    _vm.authDetaileTypeForm = $$v;
+  }, expression: "authDetaileTypeForm" } })], 1)], 1)], 1), !_vm.userAuthLoading ? _c("IndTree", { ref: "authTree", attrs: { "data": _vm.authTreeData, "default-value": _vm.defaultAuthId, "multiple": "", "show-checkbox": "", "expandAll": "", "isShowHeader": false } }) : _vm._e()], 1)], 1)], 1)], 1), _c("div", { staticClass: "ind-flex-no-shrink function-wrapper" }, [_c("IndButtonGroup", { attrs: { "center": "" } }, [_c("IndButton", { attrs: { "bizType": "save", "loading": _vm.saveLoading }, on: { "click": _vm.saveUsersAuths } })], 1)], 1)])], 1)], 1), _c("IndModal", { attrs: { "lazyRender": false, "title": "\u89D2\u8272\u7F16\u8F91", "saving": _vm.saveRoleLoading }, on: { "on-ok": _vm.saveRole }, model: { value: _vm.showEditRole, callback: function($$v) {
     _vm.showEditRole = $$v;
   }, expression: "showEditRole" } }, [_c("div", { staticClass: "ivu-biz-form-row" }, [_c("IndFormWrap", { ref: "basicForm", attrs: { "fieldList": _vm.formFields, "gridColumns": 1 }, model: { value: _vm.formData, callback: function($$v) {
     _vm.formData = $$v;
@@ -66006,7 +66023,6 @@ const __vue2_script$1 = {
   props: {
     authModule: { type: String, required: true },
     authType: { type: String, required: true },
-    authDetaileType: { type: String, required: true },
     authTreeApiParams: { type: Object, required: true },
     authTreeApi: { type: Function, required: true }
   },
@@ -66134,44 +66150,49 @@ const __vue2_script$1 = {
       saveRoleLoading: false,
       tableDataSize: 1,
       saveLoading: false,
-      authDetaileTypes: [],
-      authDetaileTypeParam: this.authDetaileType,
-      authTreeLoading: false
+      authDetaileTypeForm: {
+        authDetaileTypeParam: []
+      },
+      authTreeLoading: false,
+      authDetaileTypeField: [
+        {
+          formKey: "authDetaileTypeParam",
+          title: "\u6743\u9650\u7C7B\u578B\uFF1A",
+          type: "treeselect",
+          props: {
+            dataApi: listComTreeApi,
+            urlParams: {
+              bizType: "40",
+              dataPermitType: JSON.stringify({
+                authModule: this.authModule,
+                authType: this.authType
+              })
+            }
+          }
+        }
+      ]
     };
   },
   watch: {
-    authDetaileTypeParam() {
-      if (this.selectedRole) {
-        this.reloadAuthTree();
-      }
+    "authDetaileTypeForm.authDetaileTypeParam": {
+      handler: _.debounce(function(newVal) {
+        if (this.selectedRole && newVal.length > 0) {
+          this.reloadAuthTree();
+        }
+      }, 300),
+      deep: true,
+      immediate: true
     }
   },
-  created() {
-    this.initTypeData();
-  },
   methods: {
-    async initTypeData() {
-      try {
-        const params = {
-          authModule: this.authModule,
-          authType: this.authType
-        };
-        const response = await getAuthDetaileTypeApi$1(params);
-        const datas = response.data;
-        this.authDetaileTypes = datas.map((item2) => ({
-          label: item2.authDetaileTypeName,
-          value: item2.authDetaileType
-        }));
-      } catch (error) {
-        console.log("\u83B7\u53D6\u7EC6\u5206\u7C7B\u578Berror: " + error);
-      }
-    },
     query() {
       this.tableLoading = true;
+      const authDetaileTypeParam = this.authDetaileTypeForm.authDetaileTypeParam;
+      const authDetaileType = authDetaileTypeParam && authDetaileTypeParam.length > 0 && authDetaileTypeParam[0].id ? authDetaileTypeParam[0].id : "";
       this.searchParams = {
         authModule: this.authModule,
         authType: this.authType,
-        authDetaileType: this.authDetaileTypeParam
+        authDetaileType
       };
     },
     async tableDataLoad(data) {
@@ -66180,9 +66201,9 @@ const __vue2_script$1 = {
       await this.$nextTick();
     },
     tableSelectChange: _.debounce(function(selectedRows) {
-      this.authDetaileTypeParam = "1";
       if (selectedRows.length) {
         this.selectedRole = selectedRows[0];
+        this.authDetaileTypeForm.authDetaileTypeParam = [];
         this.getUserAuthTreeData(true);
       } else {
         this.selectedRole = null;
@@ -66239,10 +66260,12 @@ const __vue2_script$1 = {
     },
     async listUserRolesApi() {
       try {
+        const authDetaileTypeParam = this.authDetaileTypeForm.authDetaileTypeParam;
+        const authDetaileType = authDetaileTypeParam && authDetaileTypeParam.length > 0 && authDetaileTypeParam[0].id ? authDetaileTypeParam[0].id : "";
         const params = {
           authModule: this.authModule,
           authType: this.authType,
-          authDetaileType: this.authDetaileTypeParam
+          authDetaileType
         };
         const { data } = await listUserRolesApi(params);
         return data;
@@ -66292,11 +66315,13 @@ const __vue2_script$1 = {
     },
     async getRoleUsersAuths(roleId) {
       try {
+        const authDetaileTypeParam = this.authDetaileTypeForm.authDetaileTypeParam;
+        const authDetaileType = authDetaileTypeParam && authDetaileTypeParam.length > 0 && authDetaileTypeParam[0].id ? authDetaileTypeParam[0].id : "";
         const params = {
           roleId,
           authModule: this.authModule,
           authType: this.authType,
-          authDetaileType: this.authDetaileTypeParam
+          authDetaileType
         };
         const { data } = await detailAuthsUsersApi(params);
         return data;
@@ -66347,6 +66372,10 @@ const __vue2_script$1 = {
       }
     },
     async saveUsersAuths() {
+      if (this.authDetaileTypeForm.authDetaileTypeParam.length == 0) {
+        this.$Message.warning("\u8BF7\u9009\u62E9\u6743\u9650\u7C7B\u578B");
+        return;
+      }
       const userTreeNodes = this.$refs.userTree.getCheckedNodes(true) || [];
       const authTreeNodes = this.$refs.authTree.getCheckedNodes(true) || [];
       const roleUsers = userTreeNodes.filter((item2) => {
@@ -66378,9 +66407,11 @@ const __vue2_script$1 = {
       }
       try {
         this.saveLoading = true;
+        const authDetaileTypeParam = this.authDetaileTypeForm.authDetaileTypeParam;
+        const authDetaileType = authDetaileTypeParam && authDetaileTypeParam.length > 0 && authDetaileTypeParam[0].id ? authDetaileTypeParam[0].id : "";
         await saveAuthsUsersApi({
           ...this.selectedRole,
-          authDetaileType: this.authDetaileTypeParam,
+          authDetaileType,
           roleUsers: roleUsers.length ? roleUsers.map((item2) => {
             return {
               authModule: this.authModule,
@@ -66393,7 +66424,7 @@ const __vue2_script$1 = {
             return {
               authModule: this.authModule,
               authType: this.authType,
-              authDetaileType: this.authDetaileTypeParam,
+              authDetaileType,
               roleId: this.selectedRole.roleId,
               authId: item2.id
             };
@@ -66440,9 +66471,6 @@ var roleAuth = /* @__PURE__ */ function() {
   return __component__$1.exports;
 }();
 const CONTEXT = `${config.imgServerContext}/system/auths`;
-function getAuthDetaileTypeApi(params) {
-  return axios.get(`${CONTEXT}/getAuthDetaileType`, { params });
-}
 function getUserAuthsApi(params) {
   return axios.get(`${CONTEXT}/getUserAuths`, { params });
 }
@@ -66453,11 +66481,9 @@ var render = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("IndPageView", [_c("Row", { staticClass: "row-contain", attrs: { "gutter": 16 } }, [_c("Col", { attrs: { "span": "12" } }, [_c("IndTree", { ref: "userTree", attrs: { "dataApi": _vm.userTreeApi, "url-params": _vm.userTreeParams, "default-value": _vm.defaultUserId, "isShowHeader": true, "selectLeafOnly": true, "defaultExpandLevel": 1, "treeName": "\u7CFB\u7EDF\u7528\u6237" }, on: { "on-select-change": _vm.onSelectUserChange } })], 1), _c("Col", { attrs: { "span": "12" } }, [_c("IndLoadingPanel", { staticClass: "ind-flex-column", attrs: { "loading": _vm.userAuthLoading } }, [_c("div", { staticClass: "auth-type-select-container" }, [_c("Row", [_c("Col", [_c("span", { staticClass: "auth-type-label" }, [_vm._v("\u6743\u9650\u7C7B\u578B\uFF1A")])]), _c("Col", [_c("div", { staticClass: "auth-type-value" }, [_c("IndSelect", { attrs: { "filterable": "" }, model: { value: _vm.authDetaileTypeParam, callback: function($$v) {
-    _vm.authDetaileTypeParam = $$v;
-  }, expression: "authDetaileTypeParam" } }, _vm._l(_vm.authDetaileTypes, function(type) {
-    return _c("IndOption", { key: type.value, attrs: { "value": type.value } }, [_vm._v(_vm._s(type.label) + " ")]);
-  }), 1)], 1)])], 1)], 1), _c("div", { staticClass: "ind-flex-grow" }, [_c("IndTree", { ref: "authTree", attrs: { "data": _vm.authTreeData, "default-value": _vm.defaultAuthId, "multiple": "", "show-checkbox": "", "expandAll": "", "isShowHeader": false } })], 1), _c("div", { staticClass: "ind-flex-no-shrink function-wrapper" }, [_c("IndButtonGroup", { attrs: { "center": "" } }, [_c("IndButton", { attrs: { "bizType": "save", "disabled": _vm.btnDisAbled, "loading": _vm.saveLoading }, on: { "click": _vm.saveUserAuths } })], 1)], 1)])], 1)], 1)], 1);
+  return _c("IndPageView", [_c("Row", { staticClass: "row-contain", attrs: { "gutter": 16 } }, [_c("Col", { attrs: { "span": "12" } }, [_c("IndTree", { ref: "userTree", attrs: { "dataApi": _vm.userTreeApi, "url-params": _vm.userTreeParams, "default-value": _vm.defaultUserId, "isShowHeader": true, "selectLeafOnly": true, "defaultExpandLevel": 1, "treeName": "\u7CFB\u7EDF\u7528\u6237" }, on: { "on-select-change": _vm.onSelectUserChange } })], 1), _c("Col", { attrs: { "span": "12" } }, [_c("IndLoadingPanel", { staticClass: "ind-flex-column", attrs: { "loading": _vm.userAuthLoading } }, [_c("div", { staticClass: "auth-type-select-container" }, [_c("Row", [_c("Col", [_c("IndFormWrap", { ref: "authDetaileTypeForm", attrs: { "fieldList": _vm.authDetaileTypeField, "gridColumns": 1 }, model: { value: _vm.authDetaileTypeForm, callback: function($$v) {
+    _vm.authDetaileTypeForm = $$v;
+  }, expression: "authDetaileTypeForm" } })], 1)], 1)], 1), _c("div", { staticClass: "ind-flex-grow" }, [_c("IndTree", { ref: "authTree", attrs: { "data": _vm.authTreeData, "default-value": _vm.defaultAuthId, "multiple": "", "show-checkbox": "", "expandAll": "", "isShowHeader": false } })], 1), _c("div", { staticClass: "ind-flex-no-shrink function-wrapper" }, [_c("IndButtonGroup", { attrs: { "center": "" } }, [_c("IndButton", { attrs: { "bizType": "save", "disabled": _vm.btnDisAbled, "loading": _vm.saveLoading }, on: { "click": _vm.saveUserAuths } })], 1)], 1)])], 1)], 1)], 1);
 };
 var staticRenderFns = [];
 const __vue2_script = {
@@ -66465,7 +66491,6 @@ const __vue2_script = {
   props: {
     authModule: { type: String, required: true },
     authType: { type: String, required: true },
-    authDetaileType: { type: String, required: true },
     authTreeApiParams: { type: Object, required: true },
     authTreeApi: { type: Function, required: true }
   },
@@ -66479,8 +66504,26 @@ const __vue2_script = {
       authTreeData: [],
       defaultAuthId: [],
       saveLoading: false,
-      authDetaileTypes: [],
-      authDetaileTypeParam: this.authDetaileType
+      authDetaileTypeForm: {
+        authDetaileTypeParam: []
+      },
+      authDetaileTypeField: [
+        {
+          formKey: "authDetaileTypeParam",
+          title: "\u6743\u9650\u7C7B\u578B\uFF1A",
+          type: "treeselect",
+          props: {
+            dataApi: listComTreeApi,
+            urlParams: {
+              bizType: "40",
+              dataPermitType: JSON.stringify({
+                authModule: this.authModule,
+                authType: this.authType
+              })
+            }
+          }
+        }
+      ]
     };
   },
   activated() {
@@ -66494,10 +66537,14 @@ const __vue2_script = {
     this.defaultAuthId = [];
   },
   watch: {
-    authDetaileTypeParam() {
-      if (this.selectUser) {
-        this.reloadAuthTree();
-      }
+    "authDetaileTypeForm.authDetaileTypeParam": {
+      handler: _.debounce(function(newVal) {
+        if (this.selectUser && newVal.length > 0) {
+          this.reloadAuthTree();
+        }
+      }, 300),
+      deep: true,
+      immediate: true
     }
   },
   computed: {
@@ -66505,30 +66552,12 @@ const __vue2_script = {
       return !this.selectUser;
     }
   },
-  created() {
-    this.initTypeData();
-  },
   methods: {
-    async initTypeData() {
-      try {
-        const params = {
-          authModule: this.authModule,
-          authType: this.authType
-        };
-        const response = await getAuthDetaileTypeApi(params);
-        const datas = response.data;
-        this.authDetaileTypes = datas.map((item2) => ({
-          label: item2.authDetaileTypeName,
-          value: item2.authDetaileType
-        }));
-      } catch (error) {
-        console.log("\u83B7\u53D6\u7EC6\u5206\u7C7B\u578Berror: " + error);
-      }
-    },
     async onSelectUserChange(selectNode) {
       this.userAuthLoading = true;
       if (selectNode.length) {
         this.selectUser = selectNode[0];
+        this.authDetaileTypeForm.authDetaileTypeParam = [];
         this.authTreeData = await this.makeAuthTreeData(selectNode[0]);
       } else {
         this.selectUser = null;
@@ -66560,11 +66589,13 @@ const __vue2_script = {
     },
     async getUserAuthsApi(selectUser) {
       try {
+        const authDetaileTypeParam = this.authDetaileTypeForm.authDetaileTypeParam;
+        const authDetaileType = authDetaileTypeParam && authDetaileTypeParam.length > 0 && authDetaileTypeParam[0].id ? authDetaileTypeParam[0].id : "";
         const params = {
           userId: selectUser.id,
           authModule: this.authModule,
           authType: this.authType,
-          authDetaileType: this.authDetaileTypeParam
+          authDetaileType
         };
         const { data } = await getUserAuthsApi(params);
         return data;
@@ -66587,22 +66618,28 @@ const __vue2_script = {
       return authTreeData;
     },
     async saveUserAuths() {
+      if (this.authDetaileTypeForm.authDetaileTypeParam.length == 0) {
+        this.$Message.warning("\u8BF7\u9009\u62E9\u6743\u9650\u7C7B\u578B");
+        return;
+      }
       const authTreeNodes = this.$refs.authTree.getCheckedNodes(true) || [];
       const userAuths = authTreeNodes.filter((item2) => {
         return !item2.disabled;
       }) || [];
+      const authDetaileTypeParam = this.authDetaileTypeForm.authDetaileTypeParam;
+      const authDetaileType = authDetaileTypeParam && authDetaileTypeParam.length > 0 && authDetaileTypeParam[0].id ? authDetaileTypeParam[0].id : "";
       try {
         this.saveLoading = true;
         await saveUserAuthsApi({
           userId: this.selectUser.id,
           authModule: this.authModule,
           authType: this.authType,
-          authDetaileType: this.authDetaileTypeParam,
+          authDetaileType,
           userAuths: userAuths.map((item2) => {
             return {
               authModule: this.authModule,
               authType: this.authType,
-              authDetaileType: this.authDetaileTypeParam,
+              authDetaileType,
               userId: this.selectUser.id,
               authId: item2.id
             };