@zgfe/modules-settings 1.0.1-a.12 → 1.0.1-a.13

package/dist/esm/modules/appSettings/appInfo/index.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 declare const AppInfo: React.FC<{
     settingsCallback: (type: string) => void;
-    showAppAccount: boolean;
 }>;
 export default AppInfo;

package/dist/esm/modules/appSettings/appInfo/index.js

@@ -12,10 +12,11 @@ import apis from "../../../constants/api";
 import { useState } from 'react';
 import constants from "../../../utils/constants";
 var AppInfo = function AppInfo(_ref) {
-  var settingsCallback = _ref.settingsCallback,
-    showAppAccount = _ref.showAppAccount;
+  var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    envs = _useContext.envs;
+  var showAppAccount = envs.showAppAccount;
   var _useState = useState({
       appName: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName,
       appAccount: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appAccount

package/dist/esm/modules/appSettings/index.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 declare const PersonalSetting: React.FC<{
     settingsCallback: (type: string) => void;
-    showAppAccount: boolean;
 }>;
 export default PersonalSetting;

package/dist/esm/modules/appSettings/index.js

@@ -9,8 +9,7 @@ import { BizGlobalDataContext } from '@zgfe/business-lib';
 import SettingTabs from "../../components/settingTabs";
 import AppVirtualSource from "./virtualSource";
 var PersonalSetting = function PersonalSetting(_ref) {
-  var settingsCallback = _ref.settingsCallback,
-    showAppAccount = _ref.showAppAccount;
+  var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   var title = /*#__PURE__*/React.createElement("div", {
@@ -24,8 +23,7 @@ var PersonalSetting = function PersonalSetting(_ref) {
     key: '1',
     label: '应用信息',
     content: /*#__PURE__*/React.createElement(AppInfo, {
-      settingsCallback: settingsCallback,
-      showAppAccount: showAppAccount
+      settingsCallback: settingsCallback
     })
   }, {
     key: '2',

package/dist/esm/modules/companySetting/edit/user.js

@@ -58,38 +58,40 @@ var Info = function Info(props) {
   var refAuthConfig = useRef();
   var refAuthCEPConfig = useRef();
   useEffect(function () {
-    Promise.all([request(apis.setting.queryFunConfigList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code + '' === '200') {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), request(apis.setting.queryAppList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code + '' === '200') {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), request(apis.setting.queryFunConfigByUserId, {
-      method: 'post',
-      data: {
-        userId: data.id,
-        type: 1
-      }
-    }).then(function (res) {
-      if (res && res.code + '' === '200') {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    })]).then(function (posts) {
-      setCEPData([posts[0] || [], posts[1] || [], posts[2] || {}]);
-    }).catch(function () {
-      notification.error({
-        message: '接口返回错误'
+    if (serviceType !== 1) {
+      Promise.all([request(apis.setting.queryFunConfigList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), request(apis.setting.queryAppList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), request(apis.setting.queryFunConfigByUserId, {
+        method: 'post',
+        data: {
+          userId: data.id,
+          type: 1
+        }
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      })]).then(function (posts) {
+        setCEPData([posts[0] || [], posts[1] || [], posts[2] || {}]);
+      }).catch(function () {
+        notification.error({
+          message: '接口返回错误'
+        });
       });
-    });
+    }
   }, []);
   useEffect(function () {
     var authConfig = data.authConfig || {

package/dist/esm/modules/companySetting/edit/userGroup.js

@@ -66,38 +66,40 @@ var CompanySettingUserGroup = function CompanySettingUserGroup(props) {
   var refAuthConfig = useRef();
   var refAuthCEPConfig = useRef();
   useEffect(function () {
-    Promise.all([request(apis.setting.queryFunConfigList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code + '' === '200') {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), request(apis.setting.queryAppList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code + '' === '200') {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), data && data.id && request(apis.setting.queryFunConfigByUserId, {
-      method: 'post',
-      data: {
-        groupId: data.id,
-        type: 2
-      }
-    }).then(function (res) {
-      if (res && res.code + '' === '200') {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    })]).then(function (posts) {
-      setCEPData([posts[0] || [], posts[1] || [], posts[2] || {}]);
-    }).catch(function () {
-      notification.error({
-        message: '接口返回错误'
+    if (serviceType !== 1) {
+      Promise.all([request(apis.setting.queryFunConfigList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), request(apis.setting.queryAppList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), data && data.id && request(apis.setting.queryFunConfigByUserId, {
+        method: 'post',
+        data: {
+          groupId: data.id,
+          type: 2
+        }
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      })]).then(function (posts) {
+        setCEPData([posts[0] || [], posts[1] || [], posts[2] || {}]);
+      }).catch(function () {
+        notification.error({
+          message: '接口返回错误'
+        });
       });
-    });
+    }
   }, []);
   useEffect(function () {
     setName(data && data.groupName || '');

package/dist/esm/modules/companySetting/index.d.ts

@@ -1,14 +1,9 @@
 import React from 'react';
 import './index.less';
 declare const CompanySetting: React.FC<{
-    zgText: string;
-    isMarsUi: boolean;
-    showVirtualApp: boolean;
-    showDataDaily: boolean;
     showWeChatMenu: boolean;
     showMarketMenu: boolean;
     action: string;
-    ENVIRONMENT: string;
     settingCallback?: (type: string, obj?: {
         [key: string]: any;
     }) => void;

package/dist/esm/modules/companySetting/index.js

@@ -22,20 +22,21 @@ import VirtualApp from "./virtualApp";
 import Cost from "./cost";
 import WechatBinding from "./wechatBinding";
 var CompanySetting = function CompanySetting(props) {
-  var zgText = props.zgText,
-    isMarsUi = props.isMarsUi,
-    showVirtualApp = props.showVirtualApp,
-    showDataDaily = props.showDataDaily,
-    showWeChatMenu = props.showWeChatMenu,
+  var showWeChatMenu = props.showWeChatMenu,
     showMarketMenu = props.showMarketMenu,
-    ENVIRONMENT = props.ENVIRONMENT,
     action = props.action,
     settingCallback = props.settingCallback;
 
   // #todo 需要修改主应用传入参数和business-lib数据仓库
   var apisOkNum = 0;
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    envs = _useContext.envs;
+  var _ref = envs || {},
+    zgText = _ref.zgText,
+    isMarsUi = _ref.isMarsUi,
+    showVirtualApp = _ref.showVirtualApp,
+    showDataDaily = _ref.showDataDaily,
+    ENVIRONMENT = _ref.ENVIRONMENT;
   var _useState = useState('info'),
     _useState2 = _slicedToArray(_useState, 2),
     currentTab = _useState2[0],

package/dist/esm/modules/companySetting/user/index.js

@@ -391,7 +391,8 @@ var User = function User(props) {
             leftMenus: leftMenus,
             isMarsUi: isMarsUi,
             id: data.id,
-            type: 1
+            type: 1,
+            serviceType: serviceType
           })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
             tab: "\u6240\u5C5E\u7528\u6237\u7EC4\u6743\u9650",
             key: "2",
@@ -409,7 +410,8 @@ var User = function User(props) {
               companyAppList: companyAppList,
               name: item.groupName,
               groupId: item.id,
-              type: 2
+              type: 2,
+              serviceType: serviceType
             });
           })) : /*#__PURE__*/React.createElement(AuthConfigDetail, {
             authConfig: {
@@ -420,7 +422,8 @@ var User = function User(props) {
             isMarsUi: isMarsUi,
             companyAppList: companyAppList,
             name: '',
-            type: 2
+            type: 2,
+            serviceType: serviceType
           }))));
         },
         style: {

package/dist/esm/modules/companySetting/userGroup/authConfigDetail.d.ts

@@ -10,5 +10,6 @@ declare const authConfigDetail: React.FC<{
     id?: number;
     groupId?: number;
     type: number;
+    serviceType: number;
 }>;
 export default authConfigDetail;

package/dist/esm/modules/companySetting/userGroup/authConfigDetail.js

@@ -28,7 +28,8 @@ var authConfigDetail = function authConfigDetail(props) {
     isMarsUi = props.isMarsUi,
     id = props.id,
     groupId = props.groupId,
-    type = props.type;
+    type = props.type,
+    serviceType = props.serviceType;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     dataAuth = _useState2[0],
@@ -55,7 +56,6 @@ var authConfigDetail = function authConfigDetail(props) {
   }, []);
   useEffect(function () {
     var data;
-    console.log('dsfdsfsdfdsfdsfdsf', id, groupId);
     if (!id && !groupId) return;
     if (type == 2) {
       data = {
@@ -68,45 +68,47 @@ var authConfigDetail = function authConfigDetail(props) {
         userId: id
       };
     }
-    Promise.all([request(apis.setting.queryFunConfigList, {
-      method: 'post'
-    }).then(function (res) {
-      if (res && res.code + '' === '200') {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    }), request(apis.setting.queryFunConfigByUserId, {
-      method: 'post',
-      data: data
-    }).then(function (res) {
-      if (res && res.code + '' === '200') {
-        return res.data;
-      }
-      throw new Error('接口返回错误');
-    })]).then(function (resArr) {
-      var _resArr = _slicedToArray(resArr, 2),
-        CEPAllFunConfigList = _resArr[0],
-        CEPCheckedArr = _resArr[1];
-      var _ref = CEPCheckedArr || {},
-        appList = _ref.appList,
-        funConfig = _ref.funConfig;
-      setCepAppList(appList || []);
+    if (serviceType !== 1) {
+      Promise.all([request(apis.setting.queryFunConfigList, {
+        method: 'post'
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      }), request(apis.setting.queryFunConfigByUserId, {
+        method: 'post',
+        data: data
+      }).then(function (res) {
+        if (res && res.code + '' === '200') {
+          return res.data;
+        }
+        throw new Error('接口返回错误');
+      })]).then(function (resArr) {
+        var _resArr = _slicedToArray(resArr, 2),
+          CEPAllFunConfigList = _resArr[0],
+          CEPCheckedArr = _resArr[1];
+        var _ref = CEPCheckedArr || {},
+          appList = _ref.appList,
+          funConfig = _ref.funConfig;
+        setCepAppList(appList || []);
 
-      // 用checked的数据和全部数据进行匹配
-      var dealFunConfigList = dealDateAddChecked(CEPAllFunConfigList || [], funConfig || []);
-      // console.log(JSON.stringify(dealFunConfigList));
+        // 用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;
-      });
-      setCepFunConfig(dealFunConfigList);
-    }).catch(function () {
-      notification.error({
-        message: '接口返回错误'
+        dealFunConfigList = dealDateAddIndeterminate(dealFunConfigList || [], funConfig || []);
+        // console.log(JSON.stringify(dealFunConfigList));
+        dealFunConfigList = dealFunConfigList.filter(function (item) {
+          return item.checked || item.indeterminate;
+        });
+        setCepFunConfig(dealFunConfigList);
+      }).catch(function () {
+        notification.error({
+          message: '接口返回错误'
+        });
       });
-    });
+    }
   }, [props.groupId, props.id]);
 
   // 为数据打上checked标签
@@ -334,7 +336,7 @@ var authConfigDetail = function authConfigDetail(props) {
         }, thirdItem.show ? /*#__PURE__*/React.createElement("span", null, thirdItem.name.describe + ' ') : null);
       }), ")") : null);
     })) : null) : null;
-  })) : /*#__PURE__*/React.createElement("li", null, "\u6CA1\u6709\u5206\u914D\u529F\u80FD\u6743\u9650"))), /*#__PURE__*/React.createElement("ul", {
+  })) : /*#__PURE__*/React.createElement("li", null, "\u6CA1\u6709\u5206\u914D\u529F\u80FD\u6743\u9650"))), serviceType !== 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("ul", {
     className: "item-detail-title"
   }, /*#__PURE__*/React.createElement("li", null, "\u4E1A\u52A1\u6743\u9650"), /*#__PURE__*/React.createElement("ul", {
     className: "item-detail-list"
@@ -360,6 +362,6 @@ var authConfigDetail = function authConfigDetail(props) {
         }, thirdItem.checked || thirdItem.indeterminate ? /*#__PURE__*/React.createElement("span", null, thirdItem.describe + ' ') : null);
       }), ")") : null);
     })) : null) : null);
-  })) : /*#__PURE__*/React.createElement("li", null, "\u6CA1\u6709\u5206\u914D\u529F\u80FD\u6743\u9650"))));
+  })) : /*#__PURE__*/React.createElement("li", null, "\u6CA1\u6709\u5206\u914D\u529F\u80FD\u6743\u9650")))) : null);
 };
 export default authConfigDetail;

package/dist/esm/modules/personalSetting/index.d.ts

@@ -1,8 +1,5 @@
 import React from 'react';
 declare const PersonalSetting: React.FC<{
     settingsCallback: (type: string) => void;
-    usePwdRules: boolean;
-    passwordRule: string;
-    passwordRuleMessage: string;
 }>;
 export default PersonalSetting;

package/dist/esm/modules/personalSetting/index.js

@@ -4,10 +4,7 @@ import PersonalReset from "./reset";
 import { UserOutlined } from '@ant-design/icons';
 import SettingTabs from "../../components/settingTabs";
 var PersonalSetting = function PersonalSetting(_ref) {
-  var settingsCallback = _ref.settingsCallback,
-    usePwdRules = _ref.usePwdRules,
-    passwordRule = _ref.passwordRule,
-    passwordRuleMessage = _ref.passwordRuleMessage;
+  var settingsCallback = _ref.settingsCallback;
   var title = /*#__PURE__*/React.createElement("div", {
     className: "tab-header"
   }, /*#__PURE__*/React.createElement(UserOutlined, null), /*#__PURE__*/React.createElement("span", {
@@ -21,10 +18,7 @@ var PersonalSetting = function PersonalSetting(_ref) {
     key: '2',
     label: '修改密码',
     content: /*#__PURE__*/React.createElement(PersonalReset, {
-      settingsCallback: settingsCallback,
-      usePwdRules: usePwdRules,
-      passwordRule: passwordRule,
-      passwordRuleMessage: passwordRuleMessage
+      settingsCallback: settingsCallback
     })
   }];
   return /*#__PURE__*/React.createElement(SettingTabs, {

package/dist/esm/modules/personalSetting/reset/index.d.ts

@@ -1,8 +1,5 @@
 import React from 'react';
 declare const PersonalReset: React.FC<{
     settingsCallback: (type: string) => void;
-    usePwdRules: boolean;
-    passwordRule: string;
-    passwordRuleMessage: string;
 }>;
 export default PersonalReset;

package/dist/esm/modules/personalSetting/reset/index.js

@@ -13,12 +13,13 @@ import apis from "../../../constants/api";
 import { urlRequest } from "../../../utils/ajax";
 import base64 from "../../../utils/base64";
 var PersonalReset = function PersonalReset(_ref) {
-  var settingsCallback = _ref.settingsCallback,
-    usePwdRules = _ref.usePwdRules,
-    passwordRule = _ref.passwordRule,
-    passwordRuleMessage = _ref.passwordRuleMessage;
+  var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
-    currentUser = _useContext.currentUser;
+    currentUser = _useContext.currentUser,
+    envs = _useContext.envs;
+  var usePwdRules = envs.usePwdRules,
+    passwordRule = envs.passwordRule,
+    passwordRuleMessage = envs.passwordRuleMessage;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.0.1-a.12",
+  "version": "1.0.1-a.13",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [