@zgfe/modules-settings 1.1.2-alpha.0 → 1.1.2

package/es/modules/personalSetting/index.js

@@ -1,4 +1,10 @@
-import React from 'react';
+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 PersonalInfo from './info';
 import PersonalReset from './reset';
 import { UserOutlined } from '@ant-design/icons';
@@ -6,39 +12,45 @@ import SettingTabs from '../../components/settingTabs';
 import PersonalUnbinding from './unbinding';
 import { useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
+import util from '../../utils/util';
 var PersonalSetting = function PersonalSetting(_ref) {
   var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
-    currentUser = _useContext.currentUser,
-    isDemo = _useContext.isDemo;
+    currentUser = _useContext.currentUser;
+  var _useState = useState('1'),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentKey = _useState2[0],
+    setCurrentKey = _useState2[1];
   var title = /*#__PURE__*/React.createElement("div", {
     className: "tab-header"
   }, /*#__PURE__*/React.createElement(UserOutlined, null), /*#__PURE__*/React.createElement("span", {
     className: "tab-header-title"
   }, "\u4E2A\u4EBA\u8BBE\u7F6E"));
+  useEffect(function () {
+    var query = util.getHrefData(window.location.href);
+    if (query.password) setCurrentKey('2');
+  }, []);
   var items = [{
     key: '1',
     label: '个人资料',
-    content: /*#__PURE__*/React.createElement(PersonalInfo, {
-      settingsCallback: settingsCallback
-    })
+    content: /*#__PURE__*/React.createElement(PersonalInfo, null)
   }, {
     key: '2',
     label: '修改密码',
-    hidden: isDemo,
     content: /*#__PURE__*/React.createElement(PersonalReset, {
       settingsCallback: settingsCallback
     })
   }, {
     key: '3',
     label: '解绑虚拟MFA',
-    hidden: !(currentUser === null || currentUser === void 0 ? void 0 : currentUser.secret) || isDemo,
+    hidden: !(currentUser === null || currentUser === void 0 ? void 0 : currentUser.secret),
     content: /*#__PURE__*/React.createElement(PersonalUnbinding, null)
   }];
   return /*#__PURE__*/React.createElement(SettingTabs, {
     typeName: "personal",
     title: title,
-    items: items
+    items: items,
+    currentKey: currentKey
   });
 };
 export default PersonalSetting;

package/es/modules/personalSetting/info/index.d.ts

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

package/es/modules/personalSetting/info/index.js

@@ -11,11 +11,9 @@ import React, { useContext, useState } from 'react';
 import apis from '../../../constants/api';
 import { urlRequest } from '../../../utils/ajax';
 import constants from '../../../utils/constants';
-var PersonalInfo = function PersonalInfo(_ref) {
-  var settingsCallback = _ref.settingsCallback;
+var PersonalInfo = function PersonalInfo() {
   var _useContext = useContext(BizGlobalDataContext),
-    currentUser = _useContext.currentUser,
-    isDemo = _useContext.isDemo;
+    currentUser = _useContext.currentUser;
   var _useState = useState({
       username: currentUser === null || currentUser === void 0 ? void 0 : currentUser.username,
       emailNote: currentUser === null || currentUser === void 0 ? void 0 : currentUser.emailNote
@@ -55,8 +53,7 @@ var PersonalInfo = function PersonalInfo(_ref) {
           emailNote: emailNote
         });
         form.resetFields();
-        // 主应用更新currentUser,同公司设置-更新应用名称回调
-        settingsCallback('settingChangeCompanyNameCallback');
+        // 主应用更新currentUser
       } else {
         notification.error({
           message: '修改失败'
@@ -89,8 +86,7 @@ var PersonalInfo = function PersonalInfo(_ref) {
       message: '姓名最多为10个字符'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u59D3\u540D",
-    disabled: isDemo
+    placeholder: "\u59D3\u540D"
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u90AE\u7BB1",
     name: "emailNote",
@@ -102,8 +98,7 @@ var PersonalInfo = function PersonalInfo(_ref) {
       message: '邮箱格式错误'
     }]
   }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u8BF7\u8F93\u5165\u90AE\u7BB1",
-    disabled: isDemo
+    placeholder: "\u8BF7\u8F93\u5165\u90AE\u7BB1"
   })), /*#__PURE__*/React.createElement(Form.Item, {
     shouldUpdate: true
   }, function () {
@@ -111,8 +106,8 @@ var PersonalInfo = function PersonalInfo(_ref) {
       type: "primary",
       htmlType: "submit",
       loading: loading,
-      disabled: isDemo || !(form.isFieldTouched('username') || form.isFieldTouched('emailNote')) || !!form.getFieldsError().filter(function (_ref2) {
-        var errors = _ref2.errors;
+      disabled: !(form.isFieldTouched('username') || form.isFieldTouched('emailNote')) || !!form.getFieldsError().filter(function (_ref) {
+        var errors = _ref.errors;
         return errors.length;
       }).length || JSON.stringify(initialValues) === JSON.stringify(form.getFieldsValue())
     }, "\u4FDD\u5B58");

package/es/modules/personalSetting/reset/index.js

@@ -7,11 +7,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import { Button, Form, notification } from 'antd';
 import Input from 'antd/lib/input/Input';
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { useState } from 'react';
 import apis from '../../../constants/api';
 import { urlRequest } from '../../../utils/ajax';
 import base64 from '../../../utils/base64';
+import util from '../../../utils/util';
 var PersonalReset = function PersonalReset(_ref) {
   var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
@@ -27,6 +28,16 @@ var PersonalReset = function PersonalReset(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
+  useEffect(function () {
+    var query = util.getHrefData(window.location.href);
+    // 密码过期提示
+    if (query.password) {
+      var passwordReset = JSON.parse(decodeURIComponent(query.password));
+      notification.error({
+        message: "\u60A8\u7684\u5BC6\u7801\u5DF2\u7ECF".concat(passwordReset.period, "\u5929\u672A\u4FEE\u6539\uFF0C\u8BF7\u4FEE\u6539\u60A8\u7684\u5BC6\u7801\u4EE5\u786E\u4FDD\u8D26\u6237\u5B89\u5168")
+      });
+    }
+  }, []);
   var onSubmit = function onSubmit(value) {
     setLoading(true);
     var pwd = value.pwd,

package/es/modules/personalSetting/unbinding/index.js

@@ -30,8 +30,8 @@ var PersonalUnbinding = function PersonalUnbinding() {
       }
     }).then(function (res) {
       setLoading(false);
-      if ((res === null || res === void 0 ? void 0 : res.success) === 101) {
-        location.href = '/app/login';
+      if ((res === null || res === void 0 ? void 0 : res.success) == 101) {
+        location.href = '/webapp/app/login';
       } else {
         form.setFields([{
           name: 'code',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "1.1.2-alpha.0",
+  "version": "1.1.2",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
   "files": [
@@ -50,7 +50,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "70563b3604238c6e3fa32a0c2fbf24ca281268c7",
+  "gitHead": "f2bcc19c9990231e0029aa41baf875921f283a33",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }