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

package/es/modules/getPassword/index.less

@@ -1,122 +1,122 @@
-.get-password-box {
-  height: 100%;
-  &-button {
-    height: 40px;
-  }
-  &-background {
-    height: 250px;
-    padding: 50px 0;
-    text-align: center;
-    background: url('./images/zg_regist_top.png') 100% 50%;
-    img {
-      width: 200px;
-      height: 150px;
-    }
-  }
-  &-logo {
-    width: 200px;
-    height: 150px;
-    margin: 0 auto;
-    background: url('./images/register_logo.png') 100% 100%;
-  }
-  &-form1 {
-    > :nth-child(1) {
-      .ant-input-affix-wrapper {
-        height: 40px;
-      }
-      .ant-input-affix-wrapper:not(:hover):not(.ant-input-affix-wrapper-focused):not(
-          .ant-input-affix-wrapper-status-error
-        ) {
-        border: 1px solid #ecedf0 !important;
-      }
-    }
-  }
-  &-form2 {
-    .ant-form-item {
-      .ant-input-affix-wrapper {
-        height: 40px;
-      }
-    }
-    > :nth-child(2) {
-      margin-bottom: 32px;
-    }
-  }
-  &-saas {
-    width: 366px;
-    margin: 72px auto 0 auto;
-    > :nth-child(1) {
-      display: flex;
-      flex-direction: column;
-    }
-  }
-  &-img-code {
-    display: flex;
-    gap: 14px;
-    .ant-input {
-      width: 248px;
-      height: 40px;
-    }
-    > :nth-child(2) {
-      position: relative;
-      img {
-        width: 102px;
-        height: 40px;
-      }
-      > div {
-        position: absolute;
-        top: 0;
-        left: 0;
-        display: none;
-        width: 100%;
-        height: 40px;
-        color: #fff;
-        font-size: 14px;
-        line-height: 40px;
-        text-align: center;
-        background: rgba(0, 0, 0, 0.7);
-        border-radius: 4px;
-        cursor: pointer;
-      }
-    }
-    > :nth-child(2):hover {
-      > div {
-        display: block;
-      }
-    }
-  }
-  &-mobile-code {
-    display: flex;
-    gap: 14px;
-    .ant-input {
-      width: 248px;
-      height: 40px;
-    }
-    > :nth-child(2) {
-      width: 102px;
-      height: 40px;
-      color: #fff;
-      line-height: 40px;
-      text-align: center;
-      background: var(--io-i-, #165dff);
-      border-radius: 4px;
-      cursor: not-allowed;
-      opacity: 0.5;
-    }
-    .mobile-send {
-      cursor: pointer;
-      opacity: 1;
-    }
-  }
-  &-not-saas {
-    width: 100%;
-    margin: 40px auto;
-    color: #858585;
-    font-size: 16px;
-    text-align: center;
-    > div {
-      width: 100%;
-      margin-bottom: 20px;
-      text-align: center;
-    }
-  }
-}
+.get-password-box {
+  height: 100%;
+  &-button {
+    height: 40px;
+  }
+  &-background {
+    height: 250px;
+    padding: 50px 0;
+    text-align: center;
+    background: url('./images/zg_regist_top.png') 100% 50%;
+    img {
+      width: 200px;
+      height: 150px;
+    }
+  }
+  &-logo {
+    width: 200px;
+    height: 150px;
+    margin: 0 auto;
+    background: url('./images/register_logo.png') 100% 100%;
+  }
+  &-form1 {
+    > :nth-child(1) {
+      .ant-input-affix-wrapper {
+        height: 40px;
+      }
+      .ant-input-affix-wrapper:not(:hover):not(.ant-input-affix-wrapper-focused):not(
+          .ant-input-affix-wrapper-status-error
+        ) {
+        border: 1px solid #ecedf0 !important;
+      }
+    }
+  }
+  &-form2 {
+    .ant-form-item {
+      .ant-input-affix-wrapper {
+        height: 40px;
+      }
+    }
+    > :nth-child(2) {
+      margin-bottom: 32px;
+    }
+  }
+  &-saas {
+    width: 366px;
+    margin: 72px auto 0 auto;
+    > :nth-child(1) {
+      display: flex;
+      flex-direction: column;
+    }
+  }
+  &-img-code {
+    display: flex;
+    gap: 14px;
+    .ant-input {
+      width: 248px;
+      height: 40px;
+    }
+    > :nth-child(2) {
+      position: relative;
+      img {
+        width: 102px;
+        height: 40px;
+      }
+      > div {
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: none;
+        width: 100%;
+        height: 40px;
+        color: #fff;
+        font-size: 14px;
+        line-height: 40px;
+        text-align: center;
+        background: rgba(0, 0, 0, 0.7);
+        border-radius: 4px;
+        cursor: pointer;
+      }
+    }
+    > :nth-child(2):hover {
+      > div {
+        display: block;
+      }
+    }
+  }
+  &-mobile-code {
+    display: flex;
+    gap: 14px;
+    .ant-input {
+      width: 248px;
+      height: 40px;
+    }
+    > :nth-child(2) {
+      width: 102px;
+      height: 40px;
+      color: #fff;
+      line-height: 40px;
+      text-align: center;
+      background: var(--io-i-, #165dff);
+      border-radius: 4px;
+      cursor: not-allowed;
+      opacity: 0.5;
+    }
+    .mobile-send {
+      cursor: pointer;
+      opacity: 1;
+    }
+  }
+  &-not-saas {
+    width: 100%;
+    margin: 40px auto;
+    color: #858585;
+    font-size: 16px;
+    text-align: center;
+    > div {
+      width: 100%;
+      margin-bottom: 20px;
+      text-align: center;
+    }
+  }
+}

package/es/modules/messageList/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import './index.less';
 declare const CreateProcess: React.FC<{
-    onClose: Function;
+    onClose: Function | undefined;
     changeRead?: Function;
 }>;
 export default CreateProcess;

package/es/modules/messageList/index.js

@@ -74,7 +74,7 @@ var CreateProcess = function CreateProcess(props) {
     });
   };
   var gotoPage = function gotoPage(businessId, content) {
-    var pageNmae = businessId === -1 ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : content.includes('埋点待测试') ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/setting/systemSetting/createDemand?id=' + businessId;
+    var pageNmae = businessId === -1 ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : content.includes('埋点待测试') ? '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/dataCollectManage' : '/webapp/app/' + (currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId) + '/plat/0/analytics/setting/systemSetting/demandManage?id=' + businessId;
     window.open(pageNmae, '_blank');
     // const pageNmae = businessId === -1 ? routes.dataAccess.manage : routes.createDemand;
     // const currentPage =
@@ -100,12 +100,12 @@ var CreateProcess = function CreateProcess(props) {
     className: "".concat(classPrefix)
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header")
-  }, "\u6D88\u606F\u901A\u77E5\uFF08", unReadNum, "\uFF09", /*#__PURE__*/React.createElement(IconFont, {
+  }, "\u6D88\u606F\u901A\u77E5\uFF08", unReadNum, "\uFF09", onclose ? (/*#__PURE__*/React.createElement(IconFont, {
     type: "qingchu",
     onClick: function onClick() {
-      return props.onClose();
+      return props.onClose && props.onClose();
     }
-  })), /*#__PURE__*/React.createElement("div", {
+  })) : ''), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content")
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-content-filter")
@@ -167,7 +167,7 @@ var CreateProcess = function CreateProcess(props) {
         },
         onClick: function onClick() {
           gotoPage(v.businessId, v.content);
-          props.onClose();
+          props.onClose && props.onClose();
           // changeAllRead(v.id);
         }
       }, v.content), /*#__PURE__*/React.createElement("div", {
@@ -190,7 +190,7 @@ var CreateProcess = function CreateProcess(props) {
         className: "".concat(classPrefix, "-content-list-item-title"),
         onClick: function onClick() {
           gotoPage(v.businessId, v.content);
-          props.onClose();
+          props.onClose && props.onClose();
           changeAllRead(v.id);
         }
       }, v.content), /*#__PURE__*/React.createElement("div", {

package/es/modules/messageList/index.less

@@ -1,81 +1,81 @@
-.system-setting-message {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  background-color: #fff;
-  &-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    height: 56px;
-    padding: 16px 24px;
-    color: var(--io-N-, #021429);
-    font-weight: 500;
-    font-size: 16px;
-    border-bottom: 1px solid var(--io-N1-, #e6e7ea);
-    .qingchu {
-      font-size: 24px !important;
-      cursor: pointer;
-    }
-  }
-  &-content {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    overflow-y: auto;
-    &-filter {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: space-between;
-      padding: 16px 16px 8px 16px;
-      &-select {
-        width: 120px;
-      }
-    }
-    &-list {
-      display: flex;
-      flex-direction: column;
-      align-items: flex-start;
-      padding: 0 16px;
-      &-empty {
-        width: 100%;
-        margin-top: 54px;
-      }
-      &-item {
-        display: flex;
-        flex-direction: row;
-        gap: 8px;
-        padding: 12px 0;
-        &-dian {
-          width: 8px;
-          height: 8px;
-          margin: 6px;
-          border-radius: 8px;
-        }
-        &-title {
-          margin-bottom: 8px;
-          color: var(--io-N-, #021429);
-          font-size: 14px;
-          line-height: 20px;
-          cursor: pointer;
-          &:hover {
-            color: #165dff !important;
-          }
-        }
-        &-date {
-          color: var(--io-N6-, #67727f);
-          font-size: 14px;
-          line-height: 20px;
-        }
-      }
-    }
-  }
-  &-search-popup {
-    .ant-select-item {
-      height: 32px !important;
-      padding: 4px 12px !important;
-    }
-  }
-}
+.system-setting-message {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+  &-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 56px;
+    padding: 16px 24px;
+    color: var(--io-N-, #021429);
+    font-weight: 500;
+    font-size: 16px;
+    border-bottom: 1px solid var(--io-N1-, #e6e7ea);
+    .qingchu {
+      font-size: 24px !important;
+      cursor: pointer;
+    }
+  }
+  &-content {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    overflow-y: auto;
+    &-filter {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      padding: 16px 16px 8px 16px;
+      &-select {
+        width: 120px;
+      }
+    }
+    &-list {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      padding: 0 16px;
+      &-empty {
+        width: 100%;
+        margin-top: 54px;
+      }
+      &-item {
+        display: flex;
+        flex-direction: row;
+        gap: 8px;
+        padding: 12px 0;
+        &-dian {
+          width: 8px;
+          height: 8px;
+          margin: 6px;
+          border-radius: 8px;
+        }
+        &-title {
+          margin-bottom: 8px;
+          color: var(--io-N-, #021429);
+          font-size: 14px;
+          line-height: 20px;
+          cursor: pointer;
+          &:hover {
+            color: #165dff !important;
+          }
+        }
+        &-date {
+          color: var(--io-N6-, #67727f);
+          font-size: 14px;
+          line-height: 20px;
+        }
+      }
+    }
+  }
+  &-search-popup {
+    .ant-select-item {
+      height: 32px !important;
+      padding: 4px 12px !important;
+    }
+  }
+}

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: () => React.JSX.Element;
+export default _default;

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

@@ -0,0 +1,12 @@
+import React from 'react';
+import PersonalSetting from '../index';
+import { DemoWrapper } from '@zgfe/business-lib';
+export default (function () {
+  return /*#__PURE__*/React.createElement(DemoWrapper, {
+    defaultApp: 99825
+  }, /*#__PURE__*/React.createElement(PersonalSetting, {
+    settingsCallback: function settingsCallback(type) {
+      throw new Error('Function not implemented.');
+    }
+  }));
+});

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/personalSetting/securityLog/index.less

@@ -1,11 +1,11 @@
-.security-log-page {
-  padding: 40px;
-  &-spin {
-    padding-top: 200px;
-    text-align: center;
-  }
-  &-header {
-    margin-bottom: 30px;
-    text-align: right;
-  }
-}
+.security-log-page {
+  padding: 40px;
+  &-spin {
+    padding-top: 200px;
+    text-align: center;
+  }
+  &-header {
+    margin-bottom: 30px;
+    text-align: right;
+  }
+}