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

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/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;
+  }
+}

package/es/modules/personalSetting/styles/unbinding.less

@@ -1,73 +1,73 @@
-.personal-mfa-unbinding-page {
-  // margin: -40px;
-
-  .unbinding-banner {
-    width: 100%;
-    padding: 32px 0 24px;
-    text-align: center;
-    background: url('../images/banner.png');
-    background-size: 100% 100%;
-
-    .unbinding-img {
-      display: inline-block;
-      width: 120px;
-      height: 120px;
-      background-image: url('../images/unbinding.png');
-      background-size: 120px 120px;
-    }
-
-    .title {
-      margin-top: 16px;
-      color: #021429;
-      font-weight: 600;
-      font-size: 16px;
-      line-height: 22px;
-    }
-
-    .desc {
-      margin-top: 8px;
-      color: #67727f;
-      font-size: 14px;
-      line-height: 20px;
-    }
-
-    .label {
-      width: 86px;
-      height: 24px;
-      margin: 8px auto 0;
-      color: #29bd52;
-      font-size: 14px;
-      line-height: 24px;
-      background: #d4f2dc;
-      border-radius: 2px;
-    }
-  }
-
-  .unbinding-content-wrap {
-    padding-top: 24px;
-
-    .unbinding-content {
-      width: 520px;
-      height: 180px;
-      margin: 0 auto;
-      padding: 24px;
-      border: 1px solid #e6e7ea;
-      border-radius: 4px;
-
-      .title {
-        color: #021429;
-        font-weight: 500;
-        font-size: 14px;
-        line-height: 20px;
-      }
-
-      .verification {
-        margin-top: 24px;
-        .button-container {
-          margin-left: 40px;
-          text-align: center;
-        }
-      }
-    }
-  }
-}
+.personal-mfa-unbinding-page {
+  // margin: -40px;
+
+  .unbinding-banner {
+    width: 100%;
+    padding: 32px 0 24px;
+    text-align: center;
+    background: url('../images/banner.png');
+    background-size: 100% 100%;
+
+    .unbinding-img {
+      display: inline-block;
+      width: 120px;
+      height: 120px;
+      background-image: url('../images/unbinding.png');
+      background-size: 120px 120px;
+    }
+
+    .title {
+      margin-top: 16px;
+      color: #021429;
+      font-weight: 600;
+      font-size: 16px;
+      line-height: 22px;
+    }
+
+    .desc {
+      margin-top: 8px;
+      color: #67727f;
+      font-size: 14px;
+      line-height: 20px;
+    }
+
+    .label {
+      width: 86px;
+      height: 24px;
+      margin: 8px auto 0;
+      color: #29bd52;
+      font-size: 14px;
+      line-height: 24px;
+      background: #d4f2dc;
+      border-radius: 2px;
+    }
+  }
+
+  .unbinding-content-wrap {
+    padding-top: 24px;
+
+    .unbinding-content {
+      width: 520px;
+      height: 180px;
+      margin: 0 auto;
+      padding: 24px;
+      border: 1px solid #e6e7ea;
+      border-radius: 4px;
+
+      .title {
+        color: #021429;
+        font-weight: 500;
+        font-size: 14px;
+        line-height: 20px;
+      }
+
+      .verification {
+        margin-top: 24px;
+        .button-container {
+          margin-left: 40px;
+          text-align: center;
+        }
+      }
+    }
+  }
+}

package/es/modules/pointMap/ImportModal/styles/index.less

@@ -1,91 +1,91 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.import-meta-modal {
-  &-icon-file {
-    color: @primary-color;
-    font-size: 48px !important;
-  }
-  &-icon-export {
-    margin-right: @margin-xss;
-  }
-  &-export-btn {
-    display: block;
-    width: fit-content;
-    // margin-top: @margin-md;
-  }
-  .ant-upload.ant-upload-drag {
-    background: #fafafb;
-    /* io/中性/N2-置灰信息 */
-    border: 1px dashed #ccd0d4;
-  }
-  .ant-upload.ant-upload-drag .ant-upload {
-    padding: 40px 0;
-  }
-  &-export-container {
-    border-radius: 4px;
-    &-h1 {
-      margin-top: -8px;
-      margin-bottom: 4px;
-    }
-    &-h2 {
-      color: @text-color-secondary;
-      font-size: 12px;
-    }
-  }
-
-  &-show-container {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 24px;
-    background: #fafafb;
-    /* io/中性/N1-按钮边框 线色 */
-    border: 1px solid #e6e7ea;
-    border-radius: 4px;
-    &-content {
-      display: flex;
-      align-items: center;
-      &-icon {
-        margin-right: 12px;
-        color: @primary-color;
-        font-size: 40px !important;
-      }
-      &-file {
-        &-title {
-          font-size: 16px;
-        }
-        &-size {
-          color: @text-color-secondary;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-
-  &-spin {
-    background: #fafafb;
-    border: 1px solid #e6e7ea;
-    border-radius: 4px;
-    &-icon.anticon {
-      color: @primary-color;
-      font-size: 24px;
-    }
-    .ant-spin-text {
-      margin-top: @margin-xs;
-    }
-  }
-
-  &-upload-txt {
-    font-size: 16px;
-  }
-
-  .ant-modal-body {
-    padding-top: 8px !important;
-  }
-  &-footer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.import-meta-modal {
+  &-icon-file {
+    color: @primary-color;
+    font-size: 48px !important;
+  }
+  &-icon-export {
+    margin-right: @margin-xss;
+  }
+  &-export-btn {
+    display: block;
+    width: fit-content;
+    // margin-top: @margin-md;
+  }
+  .ant-upload.ant-upload-drag {
+    background: #fafafb;
+    /* io/中性/N2-置灰信息 */
+    border: 1px dashed #ccd0d4;
+  }
+  .ant-upload.ant-upload-drag .ant-upload {
+    padding: 40px 0;
+  }
+  &-export-container {
+    border-radius: 4px;
+    &-h1 {
+      margin-top: -8px;
+      margin-bottom: 4px;
+    }
+    &-h2 {
+      color: @text-color-secondary;
+      font-size: 12px;
+    }
+  }
+
+  &-show-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24px;
+    background: #fafafb;
+    /* io/中性/N1-按钮边框 线色 */
+    border: 1px solid #e6e7ea;
+    border-radius: 4px;
+    &-content {
+      display: flex;
+      align-items: center;
+      &-icon {
+        margin-right: 12px;
+        color: @primary-color;
+        font-size: 40px !important;
+      }
+      &-file {
+        &-title {
+          font-size: 16px;
+        }
+        &-size {
+          color: @text-color-secondary;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+
+  &-spin {
+    background: #fafafb;
+    border: 1px solid #e6e7ea;
+    border-radius: 4px;
+    &-icon.anticon {
+      color: @primary-color;
+      font-size: 24px;
+    }
+    .ant-spin-text {
+      margin-top: @margin-xs;
+    }
+  }
+
+  &-upload-txt {
+    font-size: 16px;
+  }
+
+  .ant-modal-body {
+    padding-top: 8px !important;
+  }
+  &-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+  }
+}

package/es/modules/pointMap/createMetaDrawer.js

@@ -131,33 +131,21 @@ var CreateMeta = function CreateMeta(props) {
             resultArr = [];
             newArr = findDuplicateObjects(eventAttrList);
             if (!(newArr.length >= 1)) {
-              _context.next = 18;
+              _context.next = 16;
               break;
             }
             notification.warning({
               message: '有事件属性名称相同'
             });
-            resultArr = eventAttrList.map(function (j) {
-              if (newArr.find(function (k) {
-                return j.name || j.attr_name == k;
-              })) {
-                return _objectSpread(_objectSpread({}, j), {}, {
-                  status: 'error'
-                });
-              }
-              return j;
-            });
-            setEventAttrList(resultArr);
+            // resultArr = eventAttrList.map((j) => {
+            //   if (newArr.find((k) => j.name == k)) {
+            //     return { ...j, status: 'error' };
+            //   }
+            //   return j;
+            // });
+            // setEventAttrList(resultArr);
             return _context.abrupt("return");
-          case 18:
-            if (newArr.length == 0) {
-              resultArr = eventAttrList.map(function (o) {
-                return _objectSpread(_objectSpread({}, o), {}, {
-                  status: ''
-                });
-              });
-            }
-            setEventAttrList(resultArr);
+          case 16:
             //把参数传递给主页面
             if (props.onSubmit) {
               props.onSubmit({
@@ -175,17 +163,17 @@ var CreateMeta = function CreateMeta(props) {
                 eventAttrList: eventAttrList
               }, props.data ? 'update' : 'create');
             }
-            _context.next = 26;
+            _context.next = 22;
             break;
-          case 23:
-            _context.prev = 23;
+          case 19:
+            _context.prev = 19;
             _context.t0 = _context["catch"](1);
             console.log('表单验证失败:', _context.t0);
-          case 26:
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 23]]);
+      }, _callee, null, [[1, 19]]);
     }));
     return function submit() {
       return _ref.apply(this, arguments);

package/es/modules/pointMap/editTxt/index.less

@@ -1,55 +1,55 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-.setting-point-map-edit-text {
-  display: flex;
-  align-items: center;
-  &-input {
-    position: relative;
-    width: 350px;
-    height: 100%;
-    .ant-input {
-      background-color: #fff !important;
-      border-color: #fff;
-      &:not(.ant-input-status-error):hover {
-        border-color: @primary-color!important;
-      }
-      &:not(.ant-input-status-error):focus {
-        border-color: @primary-color!important;
-      }
-    }
-    &-content {
-      padding-right: 55px;
-    }
-    &-num {
-      position: absolute;
-      right: 12px;
-      bottom: 8px;
-      color: var(--io-N4-, #9aa1a9);
-      font-weight: 400;
-      font-size: 14px;
-    }
-  }
-  &-error-tip {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    color: @error-color;
-    line-height: 1.2;
-  }
-
-  &-content {
-    display: inline-block;
-    max-width: 330px;
-    height: @height-sm;
-    color: #021429;
-    // font-weight: bold;
-    font-size: 14px;
-    line-height: @height-sm;
-    .__default-overflow();
-  }
-  &-icon {
-    margin-left: @margin-xs;
-    color: #9aa1a9;
-    font-size: 16px !important;
-    cursor: pointer;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+.setting-point-map-edit-text {
+  display: flex;
+  align-items: center;
+  &-input {
+    position: relative;
+    width: 350px;
+    height: 100%;
+    .ant-input {
+      background-color: #fff !important;
+      border-color: #fff;
+      &:not(.ant-input-status-error):hover {
+        border-color: @primary-color!important;
+      }
+      &:not(.ant-input-status-error):focus {
+        border-color: @primary-color!important;
+      }
+    }
+    &-content {
+      padding-right: 55px;
+    }
+    &-num {
+      position: absolute;
+      right: 12px;
+      bottom: 8px;
+      color: var(--io-N4-, #9aa1a9);
+      font-weight: 400;
+      font-size: 14px;
+    }
+  }
+  &-error-tip {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    color: @error-color;
+    line-height: 1.2;
+  }
+
+  &-content {
+    display: inline-block;
+    max-width: 330px;
+    height: @height-sm;
+    color: #021429;
+    // font-weight: bold;
+    font-size: 14px;
+    line-height: @height-sm;
+    .__default-overflow();
+  }
+  &-icon {
+    margin-left: @margin-xs;
+    color: #9aa1a9;
+    font-size: 16px !important;
+    cursor: pointer;
+  }
+}