@zgfe/modules-settings 1.0.1-a.1 → 1.0.1-a.3

package/dist/esm/constants/api.d.ts

@@ -17,6 +17,7 @@ declare let apis: {
         removeMember: string;
         resetpwd: string;
         updateUserAuth: string;
+        delSubscribeUser: string;
         queryFunConfigList: string;
         queryAppList: string;
         queryFunConfigByUserId: string;
@@ -25,8 +26,12 @@ declare let apis: {
         updateUserAuthCEP: string;
         updateGroupAuth: string;
         deleteGroup: string;
+        wxSubscribeUserList: string;
         updateUserInfo: string;
         resetPassword: string;
+        updateAppName: string;
+        createFilter: string;
+        queryFilter: string;
     };
 };
 export default apis;

package/dist/esm/constants/api.js

@@ -19,6 +19,7 @@ var apis = {
     removeMember: apiPrefix + '/common/proxy/company/v2deleteUser.jsp',
     resetpwd: apiPrefix + '/common/proxy/user/resetpwd.jsp',
     updateUserAuth: apiPrefix + '/common/proxy/auth/updateUserAuth.jsp',
+    delSubscribeUser: apiPrefix + '/common/proxy//wx_subscribe/deleteWxUserRelation.jsp',
     queryFunConfigList: '/cep-console/api/v1/permission/queryFunConfigList',
     queryAppList: '/cep-console/api/v1/permission/queryAppList',
     queryFunConfigByUserId: '/cep-console/api/v1/permission/queryFunConfigByUserId',
@@ -27,8 +28,14 @@ var apis = {
     updateUserAuthCEP: '/cep-console/api/v1/permission/updateUserAuth',
     updateGroupAuth: apiPrefix + '/common/proxy/auth/updateGroupAuth.jsp',
     deleteGroup: apiPrefix + '/common/proxy/auth/deleteGroup.jsp',
+    wxSubscribeUserList: apiPrefix + '/common/proxy/wx_subscribe/getWxSubscribeUserInfoList.jsp',
+    // 个人设置
     updateUserInfo: apiPrefix + '/common/proxy/user/v2ajaxUpdateUserInfo.jsp',
-    resetPassword: apiPrefix + '/common/proxy/user/v2ajaxmodifypwd.jsp'
+    resetPassword: apiPrefix + '/common/proxy/user/v2ajaxmodifypwd.jsp',
+    // 应用设置
+    updateAppName: apiPrefix + '/common/proxy/user/updateAppName.jsp',
+    createFilter: apiPrefix + '/common/proxy/user/createFilter.jsp',
+    queryFilter: apiPrefix + '/common/proxy/user/queryFilter.jsp'
   }
 };
 export default apis;

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

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

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

@@ -1,24 +1,63 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+// 缺少环境配置：SHOW_APP_ACCOUNT（备注）
+// 缺少isVirtualApp
 import React, { useContext } from 'react';
-import { Button, Form, Input } from 'antd';
+import { Button, Form, Input, notification } from 'antd';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import request from "../../../utils/ajax";
+import { urlRequest } from "../../../utils/ajax";
 import apis from "../../../constants/api";
-// 缺少备注
-var AppInfo = function AppInfo() {
+import { useState } from 'react';
+import constants from "../../../utils/constants";
+var AppInfo = function AppInfo(props) {
+  var settingsCallback = props.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var onSubmit = function onSubmit(value) {
-    request(apis.setting.updateUserInfo, _objectSpread(_objectSpread({}, value), {}, {
-      email: 'init@zg.com'
-    })).then(function (res) {}, function (err) {});
+    setLoading(true);
+    urlRequest(apis.setting.updateAppName, {
+      method: 'post',
+      data: {
+        app_name: value.appName,
+        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (res.flag === 101) {
+        notification.success({
+          message: '更改成功'
+        });
+        // 主应用更新appList
+        settingsCallback('updateAppList');
+      } else if (res.flag === -102) {
+        notification.error({
+          message: '开发者角色无权限修改'
+        });
+      } else if (res.flag === 202) {
+        notification.error({
+          message: '应用名称已存在'
+        });
+      }
+    }).catch(function (err) {
+      notification.error({
+        message: '修改失败，请重试'
+      });
+    }).finally(function () {
+      setLoading(false);
+    });
   };
-  return /*#__PURE__*/React.createElement(Form, {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form, {
+    form: form,
     layout: "vertical",
     wrapperCol: {
       span: 8
@@ -27,19 +66,32 @@ var AppInfo = function AppInfo() {
     initialValues: currentApp
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5E94\u7528\u540D\u79F0",
+    name: "appName",
     rules: [{
       required: true,
-      message: '请输入姓名'
+      message: '请输入应用名称'
+    }, {
+      pattern: constants.regExp.teamAndAppName,
+      message: '请输入1～20位字符'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u59D3\u540D"
-  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    htmlType: "submit"
-  }, "\u4FDD\u5B58")), /*#__PURE__*/React.createElement(Form.Item, {
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    shouldUpdate: true
+  }, function () {
+    return /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      htmlType: "submit",
+      loading: loading,
+      disabled: !form.isFieldTouched('appName') || !!form.getFieldsError().filter(function (_ref) {
+        var errors = _ref.errors;
+        return errors.length;
+      }).length
+    }, "\u4FDD\u5B58");
+  }), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u5E94\u7528ID"
   }, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId), /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u90AE\u7BB1"
-  }, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appKey));
+    label: "App Key"
+  }, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appKey)));
 };
 export default AppInfo;

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

@@ -1,3 +1,8 @@
 import React from 'react';
+import './index.less';
+export interface IDataAccessFilter {
+    ip: string;
+    ua: string;
+}
 declare const AppDataAccessFilter: React.FC;
 export default AppDataAccessFilter;

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

@@ -1,37 +1,126 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React from 'react';
-import { Button, Form, Input } from 'antd';
-import request from "../../../utils/ajax";
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useEffect, useState } from 'react';
+import { Button, Form, Input, notification } from 'antd';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
+import { urlRequest } from "../../../utils/ajax";
 import apis from "../../../constants/api";
+import { useContext } from 'react';
 var TextArea = Input.TextArea;
+import "./index.less";
 var AppDataAccessFilter = function AppDataAccessFilter() {
+  var initialValues = {
+    ip: '',
+    ua: ''
+  };
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    forceUpdate = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  // 保存
   var onSubmit = function onSubmit(value) {
-    request(apis.setting.updateUserInfo, _objectSpread(_objectSpread({}, value), {}, {
-      email: 'init@zg.com'
-    })).then(function (res) {}, function (err) {});
+    var ip = value.ip,
+      ua = value.ua;
+    urlRequest(apis.setting.createFilter, {
+      method: 'post',
+      data: {
+        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        ip: JSON.stringify(ip === null || ip === void 0 ? void 0 : ip.split('\n')),
+        ua: JSON.stringify(ua === null || ua === void 0 ? void 0 : ua.split('\n'))
+      }
+    }).then(function (res) {
+      if (res.code === 10001) {
+        notification.success({
+          message: '设置成功'
+        });
+      }
+    }).catch(function (err) {
+      if (err.__CANCEL__) return;
+      notification.error({
+        message: '设置失败,请重试！'
+      });
+    }).finally(function () {
+      setLoading(false);
+    });
+  };
+  useEffect(function () {
+    forceUpdate({});
+    // 获取屏蔽数据
+    urlRequest(apis.setting.queryFilter, {
+      method: 'post',
+      data: {
+        app_id: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+      }
+    }).then(function (res) {
+      if (res.code === 10001) {
+        var ip = (res.data_access_filter.ip || []).join('\n');
+        var ua = (res.data_access_filter.ua || []).join('\n');
+        form.setFields([{
+          name: 'ip',
+          value: ip,
+          touched: false
+        }, {
+          name: 'ua',
+          value: ua,
+          touched: false
+        }]);
+      }
+    }).catch(function (err) {});
+  }, []);
+  // 保存按钮禁用逻辑
+  var disableBtn = function disableBtn(form) {
+    var value = form.getFieldsValue();
+    return !form.isFieldTouched('ip') && !form.isFieldTouched('ua') || !value.ip && !value.ua;
+  };
+  var ipFormLabel = function ipFormLabel() {
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, "IP\u9ED1\u540D\u5355"), /*#__PURE__*/React.createElement("span", {
+      className: "explain"
+    }, "\u51FA\u73B0\u5728\u9ED1\u540D\u5355\u4E2D\u7684\u5BA2\u6237\u7AEFIP\uFF0C\u5176\u4E0A\u4F20\u7684\u6570\u636E\u5C06\u4E0D\u88AB\u91C7\u96C6\u5165\u5E93\u3002IP\u5730\u5740\u4E4B\u95F4\u4EE5\u6362\u884C\u7B26\u5206\u9694\u3002"));
+  };
+  var uaFormLabel = function uaFormLabel() {
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, "UserAgent\u9ED1\u540D\u5355"), /*#__PURE__*/React.createElement("span", {
+      className: "explain"
+    }, "\u4EC5JS\u7AEF\uFF0C\u5982\u679C\u6D4F\u89C8\u5668\u7684UserAgent\u5305\u542B\u9ED1\u540D\u5355\u4E2D\u7684\u6587\u672C\uFF08\u4E0D\u533A\u5206\u5927\u5C0F\u5199\uFF09\uFF0C\u5219\u5176\u4E0A\u4F20\u7684\u6570\u636E\u5C06\u4E0D\u88AB\u91C7\u96C6\u5165\u5E93\u3002\u591A\u4E2AUserAgent\u4EE5\u6362\u884C\u7B26\u5206\u9694\u3002"));
   };
   return /*#__PURE__*/React.createElement(Form, {
+    form: form,
     layout: "vertical",
     wrapperCol: {
       span: 24
     },
-    onFinish: onSubmit
+    onFinish: onSubmit,
+    initialValues: initialValues
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    label: "IP\u9ED1\u540D\u5355"
+    label: ipFormLabel(),
+    name: "ip"
   }, /*#__PURE__*/React.createElement(TextArea, {
     rows: 6
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    label: "UserAgent\u9ED1\u540D\u5355"
+    label: uaFormLabel(),
+    name: "ua"
   }, /*#__PURE__*/React.createElement(TextArea, {
     rows: 6
-  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    htmlType: "submit"
-  }, "\u4FDD\u5B58")));
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    shouldUpdate: true
+  }, function () {
+    return /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      htmlType: "submit",
+      loading: loading,
+      disabled: disableBtn(form)
+    }, "\u4FDD\u5B58");
+  }));
 };
 export default AppDataAccessFilter;

package/dist/esm/modules/appSettings/dataAccessFilter/index.less

@@ -0,0 +1,5 @@
+.explain {
+  margin-left: 12px;
+  color: #b2b2b2;
+  font-size: 12px;
+}

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

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

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

@@ -4,13 +4,16 @@ import AppInfo from "./appInfo";
 import AppMember from "./member";
 import AppSecretKey from "./secretKey";
 import AppDataAccessFilter from "./dataAccessFilter";
-var PersonalSetting = function PersonalSetting() {
+var PersonalSetting = function PersonalSetting(props) {
+  var settingsCallback = props.settingsCallback;
   return /*#__PURE__*/React.createElement(Tabs, {
     tabPosition: "left"
   }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u5E94\u7528\u4FE1\u606F",
     key: "1"
-  }, /*#__PURE__*/React.createElement(AppInfo, null)), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+  }, /*#__PURE__*/React.createElement(AppInfo, {
+    settingsCallback: settingsCallback
+  })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
     tab: "\u5E94\u7528\u6210\u5458",
     key: "2"
   }, /*#__PURE__*/React.createElement(AppMember, null)), /*#__PURE__*/React.createElement(Tabs.TabPane, {

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

@@ -1,5 +1,18 @@
-import React from 'react';
-import { Table } from 'antd';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+// 缺少成员过滤
+import React, { useEffect, useContext } from 'react';
+import { Table, Popover, Tabs } from 'antd';
+import { BizGlobalDataContext } from '@zgfe/business-lib';
+import request from "../../../utils/ajax";
+import apis from "../../../constants/api";
+import { useState } from 'react';
+import AuthConfigDetail from "../../companySetting/userGroup/authConfigDetail";
+import util from "../../../utils/util";
 var AppMember = function AppMember() {
   var columns = [{
     title: '账号',
@@ -9,21 +22,196 @@ var AppMember = function AppMember() {
     dataIndex: 'username'
   }, {
     title: '用户组',
-    dataIndex: 'authConfig'
+    dataIndex: 'authConfig',
+    ellipsis: true,
+    render: function render(authConfig) {
+      return /*#__PURE__*/React.createElement(Popover, {
+        overlayStyle: {
+          maxWidth: 255
+        },
+        content: getGroupName(authConfig)
+      }, /*#__PURE__*/React.createElement("span", null, getGroupName(authConfig)));
+    }
   }, {
     title: '权限',
-    dataIndex: 'authConfig'
-  }];
-  var data = [{
-    key: 1,
-    email: '111',
-    username: '1111',
-    authConfig: {}
+    render: function render(data) {
+      var dealArr = data.authConfig.groupIds.map(function (id) {
+        return groupInfoMap.get(id);
+      });
+      return /*#__PURE__*/React.createElement("div", {
+        className: "operating"
+      }, /*#__PURE__*/React.createElement(Popover, {
+        content: function content() {
+          return /*#__PURE__*/React.createElement(Tabs, {
+            defaultActiveKey: "1"
+          }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+            tab: "\u4E2A\u4EBA\u6743\u9650",
+            key: "1",
+            style: {
+              width: 300
+            }
+          }, /*#__PURE__*/React.createElement(AuthConfigDetail, {
+            authConfig: data.authConfig.defaultAuth,
+            companyAppList: companyAppList,
+            leftMenus: leftMenus,
+            isMarsUi: isMarsUi,
+            id: data.id,
+            type: 1
+          })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+            tab: "\u6240\u5C5E\u7528\u6237\u7EC4\u6743\u9650",
+            key: "2",
+            style: {
+              width: 300
+            }
+          }, /*#__PURE__*/React.createElement("div", {
+            className: "group-auth-list"
+          }, dealArr.length ? /*#__PURE__*/React.createElement("div", null, dealArr.map(function (item) {
+            return (
+              /*#__PURE__*/
+              // .map((item) => (
+              React.createElement(AuthConfigDetail, {
+                key: item.id,
+                authConfig: item.authConfig,
+                leftMenus: leftMenus,
+                isMarsUi: isMarsUi,
+                companyAppList: companyAppList,
+                name: item === null || item === void 0 ? void 0 : item.groupName,
+                groupId: item.id,
+                type: 2
+              })
+              // )
+            );
+          })) : /*#__PURE__*/React.createElement(AuthConfigDetail, {
+            authConfig: {
+              dataAuth: [],
+              funAuth: []
+            },
+            leftMenus: leftMenus,
+            isMarsUi: isMarsUi,
+            companyAppList: companyAppList,
+            name: '',
+            type: 2
+          }))));
+        },
+        style: {
+          width: 255
+        },
+        trigger: "click"
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "icon-eye"
+      }, "\u67E5\u770B")))
+      // <Popover overlayStyle={{ maxWidth: 255 }} content="fjkjfksj">
+      //   <span>查看</span>
+      // </Popover>
+      ;
+    }
   }];
+
+  var _useContext = useContext(BizGlobalDataContext),
+    currentApp = _useContext.currentApp;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    memberList = _useState2[0],
+    setMemberList = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    groupInfoList = _useState4[0],
+    setGroupInfoList = _useState4[1];
+  var _useState5 = useState(new Map()),
+    _useState6 = _slicedToArray(_useState5, 2),
+    groupInfoMap = _useState6[0],
+    setGroupInfoMap = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    companyAppList = _useState8[0],
+    setCompanyAppList = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    leftMenus = _useState10[0],
+    setLeftMenus = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    isMarsUi = _useState12[0],
+    setIsMarsUi = _useState12[1];
+  useEffect(function () {
+    // 请求用户数据
+    request(apis.setting.getGroupMembers, {
+      method: 'get'
+    }).then(function (res) {
+      if (res.flag === 101) {
+        var _memberList = res.company_members.map(function (item) {
+          item.key = item.id;
+          return item;
+        });
+        setMemberList(_memberList);
+      }
+    }).catch(function (err) {
+      console.log(err);
+    });
+    // 请求用户组
+    request(apis.setting.groupInfos, {
+      method: 'get'
+    }).then(function (res) {
+      if (res.flag === 101) {
+        setGroupInfoList(res.infos);
+        var _groupInfoMap = new Map();
+        res.infos.forEach(function (item) {
+          _groupInfoMap.set(item.id, item);
+        });
+        setGroupInfoMap(_groupInfoMap);
+      }
+    });
+    // 请求应用列表
+    request(apis.app.queryAppList, {
+      method: 'get'
+    }).then(function (res) {
+      console.log('res.appList', res.applist);
+      setCompanyAppList(res.applist);
+    });
+    // 请求左侧菜单
+    request(apis.app.queryLeftMenus, {
+      method: 'post',
+      data: {
+        app_id: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) || 99677
+      }
+    }).then(function (res) {
+      var menus = res.leftMenus || [];
+      var menusNameMap = {};
+      var formatMenus = function formatMenus(menus) {
+        menus.forEach(function (item) {
+          item.routeName = util.getMenuRouterByName(item.name);
+          // menusNameMap[item.name] = item;
+          if (item.childrens) {
+            formatMenus(item.childrens);
+          }
+        });
+      };
+      formatMenus(menus);
+      setLeftMenus(menus);
+      // setMenusNameMap(menusNameMap);
+    }).catch(function (err) {
+      // todo ????
+    });
+    // };
+  }, []);
+
+  // 组装用户组数据
+  var getGroupName = function getGroupName(_ref) {
+    var groupIds = _ref.groupIds;
+    return groupIds === null || groupIds === void 0 ? void 0 : groupIds.map(function (groupId) {
+      var _groupInfoMap$get;
+      return (_groupInfoMap$get = groupInfoMap.get(groupId)) === null || _groupInfoMap$get === void 0 ? void 0 : _groupInfoMap$get.groupName;
+    }).join(',');
+  };
+  var groupAuthConfig = function groupAuthConfig(ids) {
+    return groupInfoList.filter(function (item) {
+      return ids.includes(item.id);
+    });
+  };
   return /*#__PURE__*/React.createElement(Table, {
     size: "middle",
     columns: columns,
-    dataSource: data
+    dataSource: memberList
   });
 };
 export default AppMember;

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

@@ -8,9 +8,9 @@ declare const appList: React.FC<{
     isDemoAccount: boolean;
     authConfig: {};
     id: number;
-    allGroupInfos: [];
-    appList: [];
-    companyRealAppList: [];
+    allGroupInfos: any;
+    isShowCreateApp: any;
+    companyRealAppList: any;
     zgText: String;
     companyId: number;
     delAppCallback: Function;