@zgfe/modules-settings 1.2.4-log.2 → 1.2.5

package/es/modules/companySetting/appList/index.js

@@ -85,7 +85,6 @@ var appList = function appList(props) {
   var columns = [{
     title: '应用名称',
     render: function render(data) {
-      // console.log(appName, data)
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
         className: "app-name",
         title: data.appName || '',

package/es/modules/companySetting/edit/authConfig.d.ts

@@ -1,10 +1,10 @@
 import React from 'react';
 import './styles/authConfig.less';
 import { AppListItem, Config, LeftMenusItem } from '../../../types';
-declare const Info: React.FC<{
+declare const AuthConfig: React.FC<{
     config: Config;
     appList: Array<AppListItem>;
     leftMenus: LeftMenusItem[];
     ref: any;
 }>;
-export default Info;
+export default AuthConfig;

package/es/modules/companySetting/edit/authConfig.js

@@ -9,7 +9,7 @@ import './styles/authConfig.less';
 import constants from './../../../utils/constants';
 import funPermissions from './../../../utils/functionalPermissions';
 import AuthGroup from './authGroup';
-var Info = /*#__PURE__*/forwardRef(function (props, ref) {
+var AuthConfig = /*#__PURE__*/forwardRef(function (props, ref) {
   var config = props.config,
     appList = props.appList,
     leftMenus = props.leftMenus;
@@ -55,7 +55,6 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
             }
           });
         }
-        console.log('functionalPermissions');
         if (functionalPermissions.checked) {
           funAuth.push({
             resource: funPermissions['standard'].all.key,
@@ -197,7 +196,6 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     funAuth.forEach(function (item) {
       map[item.resource] = item.opts[0];
     });
-    console.log(map);
     // 顶部菜单功能权限
     var loopFormatTopMenu = function loopFormatTopMenu(topMenu, checkAll) {
       var menuFunPerConstants = funPermissions['standard'][topMenu.name];
@@ -259,7 +257,6 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     };
     var menuFun = [];
     var isAll = !!map[funPermissions['standard'].all.key];
-    console.log('dskfhk', leftMenus);
     leftMenus.forEach(function (menu) {
       var topMenuFun = loopFormatTopMenu(menu, isAll);
       if (topMenuFun) {
@@ -270,30 +267,33 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     });
     var settingIsAll = !!map[funPermissions['standard'].setting.default.key];
+    var settingChildren = [{
+      // ...funPermissions['standard'].setting.company,
+      describe: funPermissions['standard'].setting.company.describe,
+      key: funPermissions['standard'].setting.company.key,
+      disable: false,
+      supportVirtualApp: true,
+      checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.company.key],
+      children: []
+    }, {
+      // ...funPermissions['standard'].setting.app,
+      describe: funPermissions['standard'].setting.app.describe,
+      key: funPermissions['standard'].setting.app.key,
+      disable: false,
+      supportVirtualApp: true,
+      checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.app.key],
+      children: []
+    }];
     menuFun.push({
       describe: funPermissions['standard'].setting.default.describe,
       key: funPermissions['standard'].setting.default.key,
       checked: isAll || !!map[funPermissions['standard'].setting.default.key],
-      indeterminate: false,
+      indeterminate: settingChildren.some(function (item) {
+        return item.checked;
+      }),
       disable: false,
       supportVirtualApp: true,
-      children: [{
-        // ...funPermissions['standard'].setting.company,
-        describe: funPermissions['standard'].setting.company.describe,
-        key: funPermissions['standard'].setting.company.key,
-        disable: false,
-        supportVirtualApp: true,
-        checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.company.key],
-        children: []
-      }, {
-        // ...funPermissions['standard'].setting.app,
-        describe: funPermissions['standard'].setting.app.describe,
-        key: funPermissions['standard'].setting.app.key,
-        disable: false,
-        supportVirtualApp: true,
-        checked: isAll || settingIsAll || !!map[funPermissions['standard'].setting.app.key],
-        children: []
-      }]
+      children: settingChildren
     });
     var checkedArr = menuFun.filter(function (item) {
       return item.checked;
@@ -301,7 +301,6 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     var indeterminateArr = menuFun.filter(function (item) {
       return item.indeterminate;
     });
-    console.log(menuFun);
     setFunctionalPermissions({
       describe: '功能权限',
       key: funPermissions['standard'].all.key,
@@ -327,4 +326,4 @@ var Info = /*#__PURE__*/forwardRef(function (props, ref) {
     }
   }));
 });
-export default Info;
+export default AuthConfig;

package/es/modules/companySetting/edit/authConfigCEP.js

@@ -91,7 +91,6 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
           });
         }
         var cepFunAuth = [];
-        console.log('functionalPermissions', functionalPermissions);
         functionalPermissions.children && functionalPermissions.children.forEach(function (item) {
           if (item.checked) {
             if (item.radio) {
@@ -152,14 +151,11 @@ var AuthConfigCEP = /*#__PURE__*/forwardRef(function (props, ref) {
       allFunConfigList = _CEPData[0],
       allAppList = _CEPData[1],
       checkAll = _CEPData[2];
-    console.log(CEPData);
     var _ref = checkAll || {},
       checkAppList = _ref.appList,
       checkFunConfigList = _ref.funConfig;
     var dealFunConfigList = dealDateAddChecked(allFunConfigList || [], checkFunConfigList || []);
-    console.log(JSON.stringify(dealFunConfigList));
     dealFunConfigList = dealDateAddIndeterminate(dealFunConfigList || [], checkFunConfigList || []);
-    console.log(JSON.stringify(dealFunConfigList));
     var checkedFunArr = dealFunConfigList.filter(function (item) {
       return item.checked;
     });

package/es/modules/companySetting/edit/authGroup.js

@@ -50,7 +50,6 @@ var AuthGroup = function AuthGroup(props) {
       }
     });
     var dealObj = dealData(dealGroup);
-    console.log(dealObj);
     setGroup(dealObj);
     onChange && onChange(dealObj);
   };

package/es/modules/companySetting/edit/authModule.js

@@ -83,7 +83,6 @@ var AuthModule = function AuthModule(props) {
       });
     }
     var dealArr = util.clone(functionGroups);
-    console.log('ddd');
     dealArr.forEach(function (item, index) {
       if (data.radio) {
         item.checked = checked && !index;
@@ -158,7 +157,6 @@ var AuthModule = function AuthModule(props) {
       dealData.checked = false;
       dealData.indeterminate = true;
     }
-    console.log('dealData', dealData);
     onChange && onChange(dealData);
   };
   return data ? /*#__PURE__*/React.createElement("div", {

package/es/modules/companySetting/edit/multiAuthModule.js

@@ -86,7 +86,6 @@ var multiAuthModule = function multiAuthModule(props) {
       dealData.checked = false;
       dealData.indeterminate = true;
     }
-    console.log('dealData', dealData);
     onChange && onChange(dealData);
   };
   var onGroupChange = function onGroupChange(e, index, initArr) {

package/es/modules/companySetting/edit/user.js

@@ -108,13 +108,10 @@ var Info = function Info(props) {
     onCancel && onCancel();
   };
   var onSaveCallback = function onSaveCallback() {
-    // if (currentTab === 'io'){
-    // "funAuth":[{"resource":"/user/userList","opts":["all"]},{"resource":"/user/userGroup","opts":["all"]},{"resource":"/user/userTags","opts":["all"]},{"resource":"/setting/company","opts":["all"]}]
     var authConfig = serviceType !== 2 ? refAuthConfig.current.getFormData() : {};
     var groupIdArr = groups.map(function (item) {
       return item.id;
     });
-    console.log(authConfig);
     if (serviceType === 2) {
       var dealData = refAuthCEPConfig.current.getFormData();
       authConfig.dataAuth = dealData.dataAuth;
@@ -186,7 +183,6 @@ var Info = function Info(props) {
     });
     if (currentTab === 'cep') {
       var _authConfig = refAuthCEPConfig.current.getFormData();
-      console.log(_authConfig);
       // let groupIdArr = groups.map((item) => {
       //   return item.id;
       // });

package/es/modules/companySetting/edit/userGroup.js

@@ -229,7 +229,6 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
     });
     if (currentTab === 'cep') {
       var _authConfig = refAuthCEPConfig.current.getFormData();
-      console.log(_authConfig);
       // let groupIdArr = groups.map((item) => {
       //   return item.id;
       // });

package/es/modules/companySetting/index.js

@@ -545,12 +545,9 @@ var CompanySetting = function CompanySetting(props) {
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            console.log('delVirtualAppCallback', res, formData);
-            // 对外提供的api， 在设置模块-》虚拟应用-》虚拟应用列表页面 删除成功时调用
-            // 用来处理同步主应用可能需要的刷新的逻辑， 可不传
-            _context4.next = 3;
+            _context4.next = 2;
             return updateUserAuth(formData);
-          case 3:
+          case 2:
             getSettingData();
             settingCallback && settingCallback('settingDelVirtualAppCallback', res);
             // 与主应用同步信息 下面为老代码逻辑
@@ -590,7 +587,7 @@ var CompanySetting = function CompanySetting(props) {
             // this.$store.dispatch(actions.user.getCurrentUser)
             // // 更新应用列表数据
             // this.$store.dispatch(actions.app.queryAppList)
-          case 5:
+          case 4:
           case "end":
             return _context4.stop();
         }

package/es/modules/companySetting/operationLog/index.js

@@ -53,6 +53,7 @@ var OperationLog = function OperationLog() {
     _useState14 = _slicedToArray(_useState13, 2),
     columns = _useState14[0],
     setColumns = _useState14[1];
+  // column
   var columnsList = [{
     title: '应用(应用ID)',
     key: 'appId',

package/es/modules/companySetting/user/index.js

@@ -174,7 +174,6 @@ var User = function User(props) {
     });
   };
   var showUserEditAuthEvent = function showUserEditAuthEvent(userData) {
-    console.log('userData', userData);
     setUserEditAuthState(true);
     setUserEditAuthData(userData);
   };
@@ -504,6 +503,7 @@ var User = function User(props) {
     dataSource: showMembers,
     columns: columns,
     total: showMembers.length,
+    rowKey: "id",
     pageSize: showMembers.length / 10
   }), /*#__PURE__*/React.createElement("div", null, isAdmin ? /*#__PURE__*/React.createElement("div", {
     style: {

package/es/modules/companySetting/userGroup/authConfigDetail.js

@@ -45,7 +45,6 @@ var authConfigDetail = function authConfigDetail(props) {
     cepFunConfig = _useState8[0],
     setCepFunConfig = _useState8[1];
   // #todo isAdmin 需要添加
-  // console.log('dsfdsfsdfdsfdsfdsf');
   useEffect(function () {
     reworkAppList();
     reworkFunAuth();
@@ -90,9 +89,7 @@ var authConfigDetail = function authConfigDetail(props) {
         setCepAppList(appList || []);
         // 用checked的数据和全部数据进行匹配
         var dealFunConfigList = dealDateAddChecked(CEPAllFunConfigList || [], funConfig || []);
-        // console.log(JSON.stringify(dealFunConfigList));
         dealFunConfigList = dealDateAddIndeterminate(dealFunConfigList || [], funConfig || []);
-        // console.log(JSON.stringify(dealFunConfigList));
         dealFunConfigList = dealFunConfigList.filter(function (item) {
           return item.checked || item.indeterminate;
         });

package/es/modules/companySetting/virtualApp/config.js

@@ -48,7 +48,6 @@ var Config = function Config(props) {
       app_id: app_id,
       event_id: event_id
     } : null;
-    console.log('dealData', dealData, index);
     setConfigData(dealData);
   };
   var strMiddleSplit = function strMiddleSplit(str, num) {
@@ -63,7 +62,6 @@ var Config = function Config(props) {
     return str;
   };
   var getSourceAppEventIdArr = function getSourceAppEventIdArr(sourceAppId) {
-    console.log('sourceAppIdMap', sourceAppIdMap, sourceApps);
     var sourceData = sourceAppIdMap[sourceAppId] || {};
     return sourceData.source_event_id || [];
   };
@@ -74,12 +72,10 @@ var Config = function Config(props) {
         return item;
       })))
     };
-    console.log(params);
     selfRequest(api.app.editVirtualApp, {
       method: 'post',
       data: params
     }).then(function (res) {
-      console.log('res', res);
       if (res.code === 10001) {
         notification.success({
           message: '修改成功！'

package/es/modules/companySetting/virtualApp/index.js

@@ -117,7 +117,6 @@ var VirtualApp = function VirtualApp(props) {
           message: '创建成功'
         });
         setStatus('list');
-        console.log('dsddsdssdsddsds');
         var dealAuthConfig = util.clone(authConfig);
         if (!(dealAuthConfig.dataAuth.length === 1 && dealAuthConfig.dataAuth[0].appId === 0)) {
           dealAuthConfig.dataAuth.unshift({
@@ -161,7 +160,6 @@ var VirtualApp = function VirtualApp(props) {
   var gotoConfig = function gotoConfig(data) {
     setSelectApp(data);
     setIsConfig(true);
-    console.log(data);
   };
   return isConfig && selectApp ? /*#__PURE__*/React.createElement(Config, {
     sourceApps: sourceApps,

package/es/modules/companySetting/virtualApp/panels/list.js

@@ -73,7 +73,6 @@ var VirtualApp = function VirtualApp(props) {
           message: '删除成功！'
         });
         setDeleteDialogShow(false);
-        console.log('toDelete');
         var dealAuthConfig = util.clone(authConfig);
         if (!(dealAuthConfig.dataAuth.length === 1 && dealAuthConfig.dataAuth[0].appId === 0)) {
           var index = dealAuthConfig.dataAuth.findIndex(function (item) {

package/es/modules/companySetting/virtualApp/panels/sourceItem.js

@@ -33,7 +33,6 @@ var VirtualApp = function VirtualApp(props) {
     checkedSelf = _useState8[0],
     setCheckedSelf = _useState8[1];
   useEffect(function () {
-    console.log(sourceEventsId);
     setChosenDataSource(sourceEventsId);
   }, []);
   useEffect(function () {
@@ -94,7 +93,6 @@ var VirtualApp = function VirtualApp(props) {
     return option.title.indexOf(inputValue) > -1;
   };
   var handleChange = function handleChange(targetKeys) {
-    console.log(targetKeys);
     setChosenDataSource(targetKeys);
     onChange(checkedSelf ? targetKeys : null, sourceAppId, checkedSelf);
   };

package/es/utils/util.js

@@ -581,7 +581,6 @@ var util = {
     for (var i = 0; i < binaryStr.length; i++) {
       binaryArray[i] = binaryStr.charCodeAt(i);
     }
-    console.log(binaryArray);
     var blob = new Blob([binaryArray], {
       type: res.groups.mime
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.2.4-log.2",
+  "version": "1.2.5",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -38,7 +38,7 @@
     "@types/lodash": "^4.14.182",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zgfe/business-lib": "^1.1.50",
+    "@zgfe/business-lib": "^1.1.59",
     "@zgfe/modules-demo-manage": "^1.0.1",
     "antd": "4.22.6",
     "dumi": "^1.1.0",
@@ -51,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "2f002b33243fef1dde5d165d93b07c9320d9d1a0",
+  "gitHead": "fa491db0dd72953f73eb9cfbedffe1dda95aaa20",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }