@zgfe/modules-settings 2.0.0-zhongyuan.9 → 2.1.0-zhongyuan.0

package/es/modules/personalSetting/index.js

@@ -14,11 +14,13 @@ import { useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
 import util from '../../utils/util';
 import SecurityLog from './securityLog';
+import CreateProcess from '../messageList';
 var PersonalSetting = function PersonalSetting(_ref) {
   var settingsCallback = _ref.settingsCallback;
   var _useContext = useContext(BizGlobalDataContext),
     currentUser = _useContext.currentUser,
-    isDemo = _useContext.isDemo;
+    isDemo = _useContext.isDemo,
+    route = _useContext.route;
   var _useState = useState('1'),
     _useState2 = _slicedToArray(_useState, 2),
     currentKey = _useState2[0],
@@ -29,8 +31,10 @@ var PersonalSetting = function PersonalSetting(_ref) {
     className: "tab-header-title"
   }, "\u4E2A\u4EBA\u8BBE\u7F6E"));
   useEffect(function () {
+    var _route$query, _route$query2;
     var query = util.getHrefData(window.location.href);
     if (query.password) setCurrentKey('2');
+    if (route === null || route === void 0 ? void 0 : (_route$query = route.query) === null || _route$query === void 0 ? void 0 : _route$query.currentKey) setCurrentKey(route === null || route === void 0 ? void 0 : (_route$query2 = route.query) === null || _route$query2 === void 0 ? void 0 : _route$query2.currentKey);
   }, []);
   var items = [{
     key: '1',
@@ -54,6 +58,12 @@ var PersonalSetting = function PersonalSetting(_ref) {
     key: '4',
     label: '安全日志',
     content: /*#__PURE__*/React.createElement(SecurityLog, null)
+  }, {
+    key: '5',
+    label: '消息通知',
+    content: /*#__PURE__*/React.createElement(CreateProcess, {
+      onClose: undefined
+    })
   }];
   return /*#__PURE__*/React.createElement(SettingTabs, {
     typeName: "personal",

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

@@ -18,7 +18,8 @@ var PersonalInfo = function PersonalInfo(_ref) {
     isDemo = _useContext.isDemo;
   var _useState = useState({
       username: currentUser === null || currentUser === void 0 ? void 0 : currentUser.username,
-      emailNote: currentUser === null || currentUser === void 0 ? void 0 : currentUser.emailNote
+      emailNote: currentUser === null || currentUser === void 0 ? void 0 : currentUser.emailNote,
+      telphone: currentUser === null || currentUser === void 0 ? void 0 : currentUser.telphone
     }),
     _useState2 = _slicedToArray(_useState, 2),
     initialValues = _useState2[0],
@@ -34,14 +35,15 @@ var PersonalInfo = function PersonalInfo(_ref) {
   var onSubmit = function onSubmit(value) {
     setLoading(true);
     var username = value.username,
-      emailNote = value.emailNote;
+      emailNote = value.emailNote,
+      telphone = value.telphone;
     urlRequest(apis.setting.updateUserInfo, {
       method: 'post',
       data: {
         data: JSON.stringify({
           name: username,
           email: emailNote,
-          mobile: currentUser === null || currentUser === void 0 ? void 0 : currentUser.telphone
+          mobile: telphone
         })
       }
     }).then(function (res) {
@@ -52,11 +54,13 @@ var PersonalInfo = function PersonalInfo(_ref) {
         // 表单重置
         setInitialValues({
           username: username,
-          emailNote: emailNote
+          emailNote: emailNote,
+          telphone: telphone
         });
         form.resetFields();
         currentUser.username = username;
         currentUser.emailNote = emailNote;
+        currentUser.telphone = telphone;
         // 主应用更新currentUser,同公司设置-更新应用名称回调
         settingsCallback('settingChangeCompanyNameCallback');
       } else {
@@ -96,6 +100,20 @@ var PersonalInfo = function PersonalInfo(_ref) {
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u59D3\u540D",
     disabled: isDemo
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u624B\u673A\u53F7",
+    name: "telphone",
+    rules: [{
+      required: true,
+      message: '请输入手机号'
+    }, {
+      pattern: /^[0-9]{11}$/,
+      message: '请输入正确的手机号'
+    }]
+  }, /*#__PURE__*/React.createElement(Input, {
+    maxLength: 11,
+    placeholder: "\u624B\u673A\u53F7",
+    disabled: isDemo
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u90AE\u7BB1",
     name: "emailNote",
@@ -116,7 +134,7 @@ var PersonalInfo = function PersonalInfo(_ref) {
       type: "primary",
       htmlType: "submit",
       loading: loading,
-      disabled: isDemo || !(form.isFieldTouched('username') || form.isFieldTouched('emailNote')) || !!form.getFieldsError().filter(function (_ref2) {
+      disabled: isDemo || !(form.isFieldTouched('username') || form.isFieldTouched('emailNote') || form.isFieldTouched('telphone')) || !!form.getFieldsError().filter(function (_ref2) {
         var errors = _ref2.errors;
         return errors.length;
       }).length || JSON.stringify(initialValues) === JSON.stringify(form.getFieldsValue())

package/es/modules/pointMap/createMetaDrawer.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { CreateMetaDrawerProps } from './types';
+import './styles/index.less';
+declare const CreateMeta: React.FC<CreateMetaDrawerProps>;
+export default CreateMeta;