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

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

@@ -536,11 +536,11 @@ var User = function User(props) {
       width: 400
     }
   }, dialogContent)), /*#__PURE__*/React.createElement(BizDialog, {
-    title: pwdPanelUserConfig ? '创建成功' : '密码已生成',
+    title: pwdPanelUserConfig && pwdPanelUserConfig.id ? '创建成功' : '密码已生成',
     visible: showPasswordPanel,
     closable: true,
     onCancel: closePwdPanel,
-    footer: [pwdPanelUserConfig ? /*#__PURE__*/React.createElement(Button, {
+    footer: [pwdPanelUserConfig && pwdPanelUserConfig.id ? /*#__PURE__*/React.createElement(Button, {
       style: {
         float: 'left'
       },

package/es/modules/personalSetting/index.js

@@ -9,8 +9,7 @@ import { BizGlobalDataContext } from '@zgfe/business-lib';
 var PersonalSetting = function PersonalSetting(_ref) {
   var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
-    currentUser = _useContext.currentUser,
-    isDemo = _useContext.isDemo;
+    currentUser = _useContext.currentUser;
   var title = /*#__PURE__*/React.createElement("div", {
     className: "tab-header"
   }, /*#__PURE__*/React.createElement(UserOutlined, null), /*#__PURE__*/React.createElement("span", {
@@ -19,20 +18,17 @@ var PersonalSetting = function PersonalSetting(_ref) {
   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, {

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/package.json

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