@zgfe/modules-settings 2.0.0-zhongyuan.4 → 2.0.0-zhongyuan.41

package/es/modules/demandManage/styles/index.less

@@ -1,210 +1,155 @@
-// @import '~@zgfe/business-lib/es/assets/styles/inner.less';
-.system-setting-demand {
-  padding: 24px;
-  background-color: #fff;
-
-  &-title {
-    padding: 16px 0;
-    color: #021429;
-    font-weight: 500;
-    font-size: 20px;
-  }
-
-  &-panel {
-    display: flex;
-    flex-direction: row;
-    gap: 16px;
-    &-all {
-      display: flex;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-      width: 256px;
-      padding: 24px;
-      color: var(--io-N8-, #354354);
-      font-weight: 400;
-      font-size: 16px;
-      background: var(--io-n-02, #fafafb);
-      border-radius: 8px;
-      &-img {
-        width: 64px;
-        height: 64px;
-        background: url('./../images/title-bg.png') no-repeat;
-        background-size: contain;
-      }
-      &-num {
-        color: var(--io-N-, #021429);
-        font-weight: 700;
-        font-size: 32px;
-        line-height: 40px; /* 125% */
-        cursor: pointer;
-      }
-    }
-    &-status {
-      display: flex;
-      flex: 1;
-      flex-direction: row;
-      color: var(--io-N8-, #354354);
-      font-weight: 400;
-      font-size: 16px;
-      font-family: 'PingFang SC';
-      font-style: normal;
-      line-height: normal;
-      background: var(--io-n-02, #fafafb);
-      border-radius: 8px;
-      &-item {
-        display: flex;
-        flex: 1;
-        // align-items: center;
-        flex-direction: column;
-        padding: 24px;
-        &-txt {
-          display: flex;
-          flex-direction: row;
-          gap: 4px;
-          align-items: center;
-          cursor: pointer;
-          &::before {
-            display: block;
-            width: 8px;
-            height: 8px;
-            border-radius: 4px;
-            content: '';
-          }
-        }
-        &-num {
-          margin-top: 4px;
-          margin-left: 12px;
-          color: var(--io-N-, #021429);
-          font-weight: 700;
-          font-size: 32px;
-          font-family: Arial;
-          font-style: normal;
-          line-height: 40px; /* 125% */
-          cursor: pointer;
-        }
-      }
-      &-item:nth-child(1) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #fd9f41;
-        }
-      }
-      &-item:nth-child(2) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #165dff;
-        }
-      }
-      &-item:nth-child(3) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #fb5547;
-        }
-      }
-      &-item:nth-child(4) {
-        .system-setting-demand-panel-status-item-txt::before {
-          background-color: #ccd0d4;
-        }
-      }
-    }
-  }
-  &-filter {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    padding: 16px 0;
-    &-left {
-      display: flex;
-      flex: 1;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-    }
-    &-right {
-      display: flex;
-      flex-direction: row;
-      gap: 16px;
-      align-items: center;
-      .button:not(.disabled):not(.ant-btn-primary) {
-        color: #1454e5;
-        border: 1px solid #1454e5;
-      }
-    }
-  }
-
-  &-table {
-    &-status2 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #165dff);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #e8efff);
-      border-radius: 2px;
-    }
-    &-status1 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #fd9f41);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #ffecd9);
-      border-radius: 2px;
-    }
-    &-status3 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #fb5547);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #ffece8);
-      border-radius: 2px;
-    }
-    &-status4 {
-      display: flex;
-      align-items: center;
-      padding: 1px 8px;
-      color: var(--io-i-, #5f6085);
-      font-weight: 400;
-      font-size: 14px;
-      line-height: 22px; /* 157.143% */
-      background: var(--io-i1-, #f2f3f4);
-      border-radius: 2px;
-    }
-  }
-}
-.system-setting-demand-pop {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  width: 136px;
-  &-header {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: space-between;
-    color: var(--io-N-, #021429);
-    font-weight: 400;
-    font-size: 16px;
-    line-height: 24px; /* 150% */
-    .qingchu {
-      color: #9aa1a9;
-      cursor: pointer;
-    }
-  }
-  &-footer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    .ant-btn-primary {
-      height: 24px;
-      padding-top: 0;
-      padding-bottom: 0;
-    }
-  }
-}
+// @import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.system-setting-demand {
+  padding: 24px;
+  background-color: #fff;
+
+  &-title {
+    padding: 16px 0;
+    color: #021429;
+    font-weight: 500;
+    font-size: 20px;
+  }
+
+  &-panel {
+    display: flex;
+    flex-direction: row;
+    gap: 16px;
+    &-all {
+      display: flex;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+      width: 256px;
+      padding: 24px;
+      color: var(--io-N8-, #354354);
+      font-weight: 400;
+      font-size: 16px;
+      background: var(--io-n-02, #fafafb);
+      border-radius: 8px;
+      &-img {
+        width: 64px;
+        height: 64px;
+        background: url('./../images/title-bg.png') no-repeat;
+        background-size: contain;
+      }
+      &-num {
+        color: var(--io-N-, #021429);
+        font-weight: 700;
+        font-size: 32px;
+        line-height: 40px; /* 125% */
+        cursor: pointer;
+      }
+    }
+    &-status {
+      display: flex;
+      flex: 1;
+      flex-direction: row;
+      color: var(--io-N8-, #354354);
+      font-weight: 400;
+      font-size: 16px;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      line-height: normal;
+      background: var(--io-n-02, #fafafb);
+      border-radius: 8px;
+      &-item {
+        display: flex;
+        flex: 1;
+        // align-items: center;
+        flex-direction: column;
+        padding: 24px;
+        &-txt {
+          display: flex;
+          flex-direction: row;
+          gap: 4px;
+          align-items: center;
+          cursor: pointer;
+        }
+        &-icon {
+          display: block;
+          width: 8px;
+          height: 8px;
+          border-radius: 4px;
+          content: '';
+        }
+        &-num {
+          margin-top: 4px;
+          margin-left: 12px;
+          color: var(--io-N-, #021429);
+          font-weight: 700;
+          font-size: 32px;
+          font-family: Arial;
+          font-style: normal;
+          line-height: 40px; /* 125% */
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  &-filter {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 16px 0;
+    &-left {
+      display: flex;
+      flex: 1;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+    }
+    &-right {
+      display: flex;
+      flex-direction: row;
+      gap: 16px;
+      align-items: center;
+      .button:not(.disabled):not(.ant-btn-primary) {
+        color: #1454e5;
+        border: 1px solid #1454e5;
+      }
+    }
+  }
+
+  &-table {
+    &-status {
+      display: flex;
+      align-items: center;
+      padding: 1px 8px;
+      font-weight: 400;
+      font-size: 14px;
+      line-height: 22px; /* 157.143% */
+      border-radius: 2px;
+    }
+  }
+}
+.system-setting-demand-pop {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  width: 136px;
+  &-header {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    justify-content: space-between;
+    color: var(--io-N-, #021429);
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 24px; /* 150% */
+    .qingchu {
+      color: #9aa1a9;
+      cursor: pointer;
+    }
+  }
+  &-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    .ant-btn-primary {
+      height: 24px;
+      padding-top: 0;
+      padding-bottom: 0;
+    }
+  }
+}

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

@@ -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/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/pointMap/createMetaDrawer.d.ts

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