@zgfe/modules-settings 2.0.0-zhongyuan.11 → 2.0.0-zhongyuan.13

package/es/constants/api.d.ts

@@ -14,6 +14,8 @@ declare let apis: {
         editVirtualSourceApp: string;
     };
     setting: {
+        queryRealTimeData: string;
+        updateStatus: string;
         updateCompanyName: string;
         updateLicense: string;
         groupInfos: string;

package/es/constants/api.js

@@ -16,6 +16,8 @@ var apis = {
     editVirtualSourceApp: '/user/editSourceApp.jsp' // 修改虚拟应用的来源应用配置
   },
   setting: {
+    queryRealTimeData: 'zg/web/v2/newapp/delay',
+    updateStatus: 'zg/web/v2/list/status',
     updateCompanyName: '/company/v2updateInfo.jsp',
     updateLicense: apiPrefix + '/system/license',
     groupInfos: '/auth/groupInfos.jsp',

package/es/modules/companySetting/application/index.d.ts

@@ -7,6 +7,17 @@ export interface ApplicationItem {
     appVersion: number;
     appVersionName: string;
     platform: number[];
+    children?: ApplicationListChildren[];
+    status?: number;
+    joinDatabaseDelay: string;
+    realTimeDelay: string;
+}
+export interface ApplicationListChildren {
+    label: string;
+    key: 'appVersionName' | 'name' | 'platform' | 'status' | 'realTimeDelay' | 'joinDatabaseDelay';
+    type: string;
+    style?: any;
+    list?: number[];
 }
 declare const Application: React.FC<{
     companyId: number;

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

@@ -17,7 +17,6 @@ import React, { useEffect, useState, useRef, useContext } from 'react';
 import request from '../../../utils/ajax';
 import apis from '../../../constants/api';
 import { notification, Tooltip, Modal, Row, Col, Drawer, Button, Divider, message } from 'antd';
-import Card from '../../../components/card';
 import { BizGlobalDataContext, BizLoading, IconFont } from '@zgfe/business-lib';
 import ApplicationForm from './applicationForm';
 import './index.less';
@@ -65,7 +64,7 @@ var Application = function Application(_ref) {
   var settingRef = useRef();
   var handleQueryList = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _res$data, _res$data2, _res$data4, _res$data5, res, _res$data3;
+      var _res$data, _res$data2, _res$data5, _res$data6, res, _res$data3, _res$data4;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -92,26 +91,63 @@ var Application = function Application(_ref) {
                   item.platform = item.platform.reverse();
                 }
               });
+              //添加列表数据
+              res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.list.forEach(function (item) {
+                item.children = [{
+                  label: '',
+                  key: 'name',
+                  type: 'text',
+                  style: {
+                    fontWeight: 'bold',
+                    fontSize: '14px',
+                    color: '#000000',
+                    'min-width': '100px'
+                  }
+                }, {
+                  label: '实时数据延迟',
+                  key: 'realTimeDelay',
+                  type: 'text'
+                }, {
+                  label: '入库数据延迟',
+                  key: 'joinDatabaseDelay',
+                  type: 'text'
+                }, {
+                  label: '接入平台',
+                  key: 'platform',
+                  type: 'icon',
+                  list: item.platform
+                }, {
+                  label: '版本',
+                  key: 'appVersionName',
+                  type: 'text'
+                }, {
+                  label: '状态',
+                  key: 'status',
+                  type: 'status'
+                }];
+              });
             }
-            setList((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.list) || []);
+            setList((res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.list) || []);
             // 如果无应用，自定展示新建应用弹窗
-            if (!(res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.list)) {
+            if (!(res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.list)) {
               handleAddClick();
             }
-            _context.next = 17;
+            //对实时渲染数据进行处理
+            getRealTimeData();
+            _context.next = 18;
             break;
-          case 13:
-            _context.prev = 13;
+          case 14:
+            _context.prev = 14;
             _context.t0 = _context["catch"](1);
             setLoading(false);
             notification.error({
               message: _context.t0
             });
-          case 17:
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 13]]);
+      }, _callee, null, [[1, 14]]);
     }));
     return function handleQueryList() {
       return _ref2.apply(this, arguments);
@@ -120,52 +156,6 @@ var Application = function Application(_ref) {
   useEffect(function () {
     handleQueryList();
   }, []);
-  var btnNodes = function btnNodes() {
-    var array = [{
-      Element: function Element(props) {
-        return /*#__PURE__*/React.createElement(Tooltip, {
-          title: "\u7F16\u8F91",
-          placement: "top"
-        }, /*#__PURE__*/React.createElement("span", _objectSpread({}, props)));
-      },
-      options: {
-        className: "zhuge icon-bianji2 ".concat(!authority[1716284360] ? classPrefix + '-disabled' : ''),
-        onClick: function onClick(props) {
-          return authority[1716284360] && handleEditClick(props);
-        }
-      }
-    }, {
-      Element: function Element(props) {
-        return /*#__PURE__*/React.createElement(Tooltip, {
-          title: "\u5220\u9664",
-          placement: "top"
-        }, /*#__PURE__*/React.createElement("span", _objectSpread({}, props)));
-      },
-      options: {
-        className: "zhuge icon-shanchu ".concat(!authority[10101] ? classPrefix + '-disabled' : ''),
-        onClick: function onClick(props) {
-          return authority[10101] && handleDeleteClick(props);
-        }
-      }
-    }];
-    if (!isOpen) {
-      return [{
-        Element: function Element(props) {
-          return /*#__PURE__*/React.createElement(Tooltip, {
-            title: "\u8BBE\u7F6E",
-            placement: "top"
-          }, /*#__PURE__*/React.createElement("span", _objectSpread({}, props)));
-        },
-        options: {
-          className: "zhuge icon-shezhi ".concat(!authority[1716285396] ? classPrefix + '-disabled' : ''),
-          onClick: function onClick(props) {
-            return authority[1716285396] && handleSettingClick(props);
-          }
-        }
-      }].concat(array);
-    }
-    return array;
-  };
   var handleAddClick = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -177,7 +167,7 @@ var Application = function Application(_ref) {
               onCancel: function onCancel() {},
               onOk: function () {
                 var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-                  var _formRef$current, _formRef$current2, _res$data6, data, res;
+                  var _formRef$current, _formRef$current2, _res$data7, data, res;
                   return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
                       case 0:
@@ -207,7 +197,7 @@ var Application = function Application(_ref) {
                         message.success('创建成功');
                         handleQueryList();
                         settingCallback && settingCallback('settingAddApplicationCallback', {
-                          id: res === null || res === void 0 ? void 0 : (_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.appId
+                          id: res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.appId
                         });
                         _context2.next = 19;
                         break;
@@ -248,7 +238,7 @@ var Application = function Application(_ref) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             Modal.confirm(_objectSpread(_objectSpread({}, modalConfig), {}, {
-              title: '编辑应用',
+              title: '修改名称',
               icon: null,
               onCancel: function onCancel() {},
               onOk: function () {
@@ -319,8 +309,8 @@ var Application = function Application(_ref) {
   // 主体开关关闭时，设置的是默认主体
   var handleSettingClick = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(record) {
-      var _res$data7, _res$data8, _res$data8$results;
-      var res, _res$data9, mainPart;
+      var _res$data8, _res$data9, _res$data9$results;
+      var res, _res$data10, mainPart;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -334,8 +324,8 @@ var Application = function Application(_ref) {
             });
           case 2:
             res = _context6.sent;
-            if ((res === null || res === void 0 ? void 0 : (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.results) && (res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : (_res$data8$results = _res$data8.results) === null || _res$data8$results === void 0 ? void 0 : _res$data8$results.length) > 0) {
-              mainPart = res === null || res === void 0 ? void 0 : (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.results[0];
+            if ((res === null || res === void 0 ? void 0 : (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.results) && (res === null || res === void 0 ? void 0 : (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : (_res$data9$results = _res$data9.results) === null || _res$data9$results === void 0 ? void 0 : _res$data9$results.length) > 0) {
+              mainPart = res === null || res === void 0 ? void 0 : (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.results[0];
               setProfile(mainPart);
               setShowSetting(true);
             }
@@ -484,6 +474,126 @@ var Application = function Application(_ref) {
       return _ref7.apply(this, arguments);
     };
   }();
+  // 应用状态开关
+  // 0:关闭 1:开启
+  var landleStatusClick = /*#__PURE__*/function () {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(props) {
+      return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
+          case 0:
+            Modal.confirm(_objectSpread(_objectSpread({}, modalConfig), {}, {
+              title: props.status ? '关闭应用' : '开启应用',
+              content: props.status ? '关闭应用后，应用将不再接收数据' : '开启应用后，应用将开始接收数据',
+              icon: null,
+              onCancel: function onCancel() {},
+              onOk: function () {
+                var _onOk4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+                  var res;
+                  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+                    while (1) switch (_context10.prev = _context10.next) {
+                      case 0:
+                        _context10.prev = 0;
+                        _context10.next = 3;
+                        return request(apis.setting.updateStatus, {
+                          method: 'post',
+                          data: {
+                            companyId: companyId,
+                            projectId: props === null || props === void 0 ? void 0 : props.id,
+                            status: props.status ? 0 : 1
+                          },
+                          intercept: false
+                        });
+                      case 3:
+                        res = _context10.sent;
+                        if (['101000', '100000'].includes(res === null || res === void 0 ? void 0 : res.code)) {
+                          _context10.next = 7;
+                          break;
+                        }
+                        message.error(res === null || res === void 0 ? void 0 : res.msg);
+                        return _context10.abrupt("return", Promise.reject());
+                      case 7:
+                        message.success(props.status ? '关闭应用成功' : '开启应用成功');
+                        handleQueryList();
+                        _context10.next = 15;
+                        break;
+                      case 11:
+                        _context10.prev = 11;
+                        _context10.t0 = _context10["catch"](0);
+                        console.log('catch', _context10.t0);
+                        return _context10.abrupt("return", Promise.reject(_context10.t0));
+                      case 15:
+                      case "end":
+                        return _context10.stop();
+                    }
+                  }, _callee10, null, [[0, 11]]);
+                }));
+                function onOk() {
+                  return _onOk4.apply(this, arguments);
+                }
+                return onOk;
+              }()
+            }));
+          case 1:
+          case "end":
+            return _context11.stop();
+        }
+      }, _callee11);
+    }));
+    return function landleStatusClick(_x4) {
+      return _ref8.apply(this, arguments);
+    };
+  }();
+  // 获取实时渲染数据
+  var getRealTimeData = /*#__PURE__*/function () {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var res, intList;
+      return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
+          case 0:
+            _context12.prev = 0;
+            _context12.next = 3;
+            return request(apis.setting.queryRealTimeData, {
+              method: 'get',
+              data: {}
+            });
+          case 3:
+            res = _context12.sent;
+            if (['101000', '100000'].includes(res === null || res === void 0 ? void 0 : res.code)) {
+              _context12.next = 6;
+              break;
+            }
+            return _context12.abrupt("return", Promise.reject());
+          case 6:
+            if (res === null || res === void 0 ? void 0 : res.data) {
+              intList = list.map(function (item) {
+                var obj = item;
+                //对相关数据进行合并
+                res.data.forEach(function (resItem) {
+                  if (item.id === resItem.id) {
+                    obj = Object.assign(item, resItem);
+                    return;
+                  }
+                });
+                return obj;
+              });
+              setList(intList);
+            }
+            _context12.next = 12;
+            break;
+          case 9:
+            _context12.prev = 9;
+            _context12.t0 = _context12["catch"](0);
+            return _context12.abrupt("return", Promise.reject(_context12.t0));
+          case 12:
+          case "end":
+            return _context12.stop();
+        }
+      }, _callee12, null, [[0, 9]]);
+    }));
+    return function getRealTimeData() {
+      return _ref9.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix)
   }, /*#__PURE__*/React.createElement("div", {
@@ -501,24 +611,78 @@ var Application = function Application(_ref) {
     size: "small",
     onClick: handleAddClick
   }, "\u521B\u5EFA\u5E94\u7528")), /*#__PURE__*/React.createElement(Divider, null), /*#__PURE__*/React.createElement(Row, {
-    gutter: [16, 16]
+    className: "".concat(classPrefix, "-rowContent"),
+    gutter: [0, 16]
   }, list.length > 0 && (list === null || list === void 0 ? void 0 : list.map(function (item) {
-    var _item$platform2;
     var content = /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-content")
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-content-item")
-    }, /*#__PURE__*/React.createElement("div", null, "\u7248\u672C\uFF1A", item.appVersionName), /*#__PURE__*/React.createElement("div", {
-      className: "".concat(classPrefix, "-content-item-platform")
-    }, "\u63A5\u5165\u5E73\u53F0\uFF1A", (item === null || item === void 0 ? void 0 : (_item$platform2 = item.platform) === null || _item$platform2 === void 0 ? void 0 : _item$platform2.length) > 0 ? item === null || item === void 0 ? void 0 : item.platform.map(function (item) {
-      return /*#__PURE__*/React.createElement(Tooltip, {
-        title: getPlatText(item),
+      className: "".concat(classPrefix, "-contentList")
+    }, item.children && item.children.length > 0 && item.children.map(function (child) {
+      var _child$list, _child$list2;
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-contentList-item")
+      }, child.label && (/*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-contentList-item-label")
+      }, child.label)), /*#__PURE__*/React.createElement("div", {
+        className: "".concat(classPrefix, "-contentList-item-value")
+      }, child.type === 'icon' && child.list && ((_child$list = child.list) === null || _child$list === void 0 ? void 0 : _child$list.length) > 0 && ((_child$list2 = child.list) === null || _child$list2 === void 0 ? void 0 : _child$list2.map(function (plat) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          title: getPlatText(plat),
+          placement: "top"
+        }, /*#__PURE__*/React.createElement("span", {
+          key: plat,
+          className: "icon-".concat(getPlatIcon(plat))
+        }));
+      })), child.type === 'text' && (/*#__PURE__*/React.createElement(Tooltip, {
+        title: item[child.key],
         placement: "top"
       }, /*#__PURE__*/React.createElement("span", {
-        key: item,
-        className: "icon-".concat(getPlatIcon(item))
-      }));
-    }) : '未接入数据')), isOpen && (/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+        className: "".concat(classPrefix, "-contentList-item-label-text"),
+        style: child.style
+      }, item[child.key]))), child.type === 'status' && (/*#__PURE__*/React.createElement("span", {
+        className: "".concat(classPrefix, "-contentList-item-status")
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "".concat(classPrefix, "-contentList-item-status-icon").concat(item[child.key] || 0)
+      }), item[child.key] ? '运行中' : '关闭'))));
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-contentList-btn")
+    }, /*#__PURE__*/React.createElement(Button, {
+      type: "link",
+      style: {
+        padding: '0 10px'
+      },
+      disabled: !authority[1716284934],
+      onClick: function onClick() {
+        return landleStatusClick && landleStatusClick(item);
+      }
+    }, item.status ? '关闭' : '开启'), /*#__PURE__*/React.createElement(Button, {
+      type: "link",
+      style: {
+        padding: '0 10px'
+      },
+      disabled: !authority[1716284360],
+      onClick: function onClick() {
+        return authority[1716284360] && handleEditClick(item);
+      }
+    }, "\u4FEE\u6539\u540D\u79F0"), /*#__PURE__*/React.createElement(Button, {
+      type: "link",
+      style: {
+        padding: '0 10px'
+      },
+      disabled: !authority[10101],
+      onClick: function onClick() {
+        return authority[10101] && handleDeleteClick(item);
+      }
+    }, "\u5220\u9664"), !isOpen && (/*#__PURE__*/React.createElement(Button, {
+      type: "link",
+      style: {
+        padding: '0 10px'
+      },
+      disabled: !authority[1716285396],
+      onClick: function onClick() {
+        return authority[1716285396] && handleSettingClick(item);
+      }
+    }, "\u8BBE\u7F6E")), isOpen && (/*#__PURE__*/React.createElement(Button, {
+      type: "link",
       style: {
         padding: '0 10px'
       },
@@ -529,12 +693,8 @@ var Application = function Application(_ref) {
     }, "\u4E3B\u4F53\u7BA1\u7406"))));
     return /*#__PURE__*/React.createElement(Col, {
       key: item.id,
-      span: 8
-    }, /*#__PURE__*/React.createElement(Card, _objectSpread(_objectSpread({}, item), {}, {
-      title: item.name,
-      btnNodes: btnNodes(),
-      content: content
-    })));
+      span: 24
+    }, content);
   })), loading && /*#__PURE__*/React.createElement(BizLoading, null)), /*#__PURE__*/React.createElement(Drawer, {
     className: "".concat(classPrefix, "-drawer"),
     open: showSetting,

package/es/modules/companySetting/application/index.less

@@ -1,126 +1,166 @@
-.application {
-  min-height: 400px;
-  overflow-x: hidden;
-  overflow-y: auto;
-
-  &-modal {
-    .ant-modal-body {
-      padding: 24px !important;
-    }
-    .ant-modal-confirm-body .ant-modal-confirm-title {
-      color: #000;
-      font-size: 24px;
-      line-height: 24px;
-    }
-
-    .ant-modal-confirm-body .ant-modal-confirm-content {
-      margin-top: 0;
-      padding-top: 24px;
-    }
-
-    .ant-modal-close {
-      padding-top: 8px;
-      padding-right: 6px;
-
-      &-x {
-        color: #021429;
-        font-size: 24px;
-      }
-    }
-  }
-
-  &-drawer {
-    .ant-drawer-header-title {
-      flex-direction: row-reverse;
-    }
-  }
-
-  .bsicon {
-    color: #9aa1a9;
-    font-size: 16px !important;
-  }
-  .bsicon:hover {
-    color: var(--io-i-, #165dff);
-  }
-
-  .bsicon.shanchu:hover {
-    color: #fb5547;
-  }
-
-  .zhuge.icon-shanchu:hover {
-    color: #fb5547;
-  }
-
-  &-alert-info {
-    background-color: #e6f7ff;
-    border: 1px solid #91d5ff;
-    border-radius: 2px;
-  }
-
-  &-form {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    &-item {
-      display: flex;
-      gap: 8px;
-      align-items: center;
-
-      .bsicon {
-        color: #fd9f41;
-      }
-
-      .bsicon:hover {
-        color: var(--io-i-, #fd9f41);
-      }
-    }
-
-    .ant-btn-sm {
-      height: 32px;
-      padding: 4px 16px;
-    }
-  }
-
-  .ant-divider-horizontal {
-    margin: 14px 0;
-  }
-
-  &-content {
-    display: flex;
-    align-items: flex-end;
-    justify-content: space-between;
-
-    &-item-platform {
-      display: flex;
-      gap: 4px;
-      align-items: center;
-      justify-content: flex-start;
-      white-space: nowrap;
-    }
-  }
-
-  .biz-loading-container.loading {
-    margin-top: 100px;
-  }
-
-  &-disabled,
-  &-disabled:hover,
-  &-disabled:focus {
-    cursor: not-allowed !important;
-  }
-
-  .ant-btn-primary[disabled],
-  .ant-btn-primary[disabled]:hover,
-  .ant-btn-primary[disabled]:focus,
-  .ant-btn-primary[disabled]:active {
-    color: #fff;
-    background: var(--io-i2-, #d0dfff);
-    border: 1px solid #d0dfff;
-  }
-
-  .settings-card {
-    gap: 6px;
-    height: 120px;
-  }
-}
+.application {
+  min-height: 400px;
+  overflow-x: hidden;
+  overflow-y: auto;
+
+  &-modal {
+    .ant-modal-body {
+      padding: 24px !important;
+    }
+    .ant-modal-confirm-body .ant-modal-confirm-title {
+      color: #000;
+      font-size: 24px;
+      line-height: 24px;
+    }
+
+    .ant-modal-confirm-body .ant-modal-confirm-content {
+      margin-top: 0;
+      padding-top: 24px;
+    }
+
+    .ant-modal-close {
+      padding-top: 8px;
+      padding-right: 6px;
+
+      &-x {
+        color: #021429;
+        font-size: 24px;
+      }
+    }
+  }
+
+  &-drawer {
+    .ant-drawer-header-title {
+      flex-direction: row-reverse;
+    }
+  }
+
+  .bsicon {
+    color: #9aa1a9;
+    font-size: 16px !important;
+  }
+  .bsicon:hover {
+    color: var(--io-i-, #165dff);
+  }
+
+  .bsicon.shanchu:hover {
+    color: #fb5547;
+  }
+
+  .zhuge.icon-shanchu:hover {
+    color: #fb5547;
+  }
+
+  &-alert-info {
+    background-color: #e6f7ff;
+    border: 1px solid #91d5ff;
+    border-radius: 2px;
+  }
+
+  &-form {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    &-item {
+      display: flex;
+      gap: 8px;
+      align-items: center;
+
+      .bsicon {
+        color: #fd9f41;
+      }
+
+      .bsicon:hover {
+        color: var(--io-i-, #fd9f41);
+      }
+    }
+
+    .ant-btn-sm {
+      height: 32px;
+      padding: 4px 16px;
+    }
+  }
+
+  .ant-divider-horizontal {
+    margin: 14px 0;
+  }
+
+  .biz-loading-container.loading {
+    margin-top: 100px;
+  }
+
+  &-disabled,
+  &-disabled:hover,
+  &-disabled:focus {
+    cursor: not-allowed !important;
+  }
+
+  .ant-btn-primary[disabled],
+  .ant-btn-primary[disabled]:hover,
+  .ant-btn-primary[disabled]:focus,
+  .ant-btn-primary[disabled]:active {
+    color: #fff;
+    background: var(--io-i2-, #d0dfff);
+    border: 1px solid #d0dfff;
+  }
+
+  .settings-card {
+    gap: 6px;
+    height: 120px;
+  }
+  &-rowContent {
+    overflow: auto;
+  }
+  &-contentList {
+    display: grid;
+    grid-template-columns: 240px repeat(5, minmax(95px, 1fr)) 260px;
+    align-items: center;
+    &-item {
+      flex: 1;
+      color: var(--io-N6-, #67727f);
+      text-align: center;
+      &-label {
+        font-size: 14px;
+      }
+      &-value {
+        display: flex;
+        grid-gap: 4px;
+        gap: 4px;
+        align-items: center;
+        justify-content: center;
+        white-space: nowrap;
+      }
+      &-label-text {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+      &-status-icon0,
+      &-status-icon1 {
+        display: inline-block;
+        width: 6px;
+        height: 6px;
+        margin-right: 3px;
+        border-radius: 50%;
+        transform: translateY(-1px);
+      }
+      &-status-icon0 {
+        background: #67727f;
+      }
+      &-status-icon1 {
+        background: #165dff;
+      }
+    }
+    &-btn {
+      position: sticky;
+      top: 0;
+      right: 0;
+      display: flex;
+      align-items: center;
+      height: 100%;
+      background-color: #fff;
+      box-shadow: -12px 0px 8px -8px #0505050f;
+    }
+  }
+}

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

@@ -134,7 +134,7 @@ var PersonalInfo = function PersonalInfo(_ref) {
       type: "primary",
       htmlType: "submit",
       loading: loading,
-      disabled: isDemo || !(form.isFieldTouched('username') || form.isFieldTouched('emailNote')) || form.isFieldTouched('telphone') || !!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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-settings",
-  "version": "2.0.0-zhongyuan.11",
+  "version": "2.0.0-zhongyuan.13",
   "private": false,
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e4f87332532842c61a15291282ee08bce1626971",
+  "gitHead": "98b123e9526464b5e41ea5ce970e03456df20642",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }