@zgfe/modules-dm 1.0.57-zhongyuan.18 → 1.0.57-zhongyuan.19

package/es/modules/clearRule/css/index.less

@@ -1,270 +1,271 @@
-.clearRule {
-  height: 100%;
-  padding: 24px;
-  background: #fff;
-  border-radius: 8px;
-  border-radius: 8px;
-  &-searchTop {
-    display: grid;
-    grid-template-columns: 320px 1fr;
-    align-items: center;
-    justify-items: self-end;
-    margin-bottom: 20px;
-  }
-  &-modal {
-    .ant-modal-body {
-      height: 350px;
-    }
-    .ant-picker-dropdown {
-      top: 133px !important;
-      left: 13px !important;
-    }
-  }
-  &-content {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  &-importModal {
-    &-content {
-    }
-    &-tip {
-      margin: 0px 0px 10px;
-      padding: 5px 0px 5px 15px;
-      background-color: #e7f3fe;
-      border: 1px solid #b8e4ff;
-      border-radius: 4px;
-      .icon {
-        margin: 0px 10px;
-        color: #165dff;
-      }
-    }
-    &-list {
-      height: 160px;
-      padding: 10px;
-      overflow-y: scroll;
-      border: 1px solid #e5e5e5;
-      border-radius: 4px;
-    }
-  }
-  &-openRuleModal {
-    &-list {
-      height: 160px;
-      padding: 10px;
-      overflow-y: scroll;
-      border: 1px solid #e5e5e5;
-      border-radius: 4px;
-    }
-    &-closeTip {
-      margin: 10px 0px;
-      color: red;
-    }
-  }
-}
-.openRuleModal-icon {
-  margin: 0px 10px 0px 0px;
-  color: #faad14;
-}
-
-.addRuleForm {
-  .selectVent {
-    display: grid;
-    grid-gap: 20px;
-    grid-template-columns: 1fr 1fr;
-    align-items: center;
-    width: 100%;
-    margin: 20px 0px;
-  }
-  .ant-checkbox-wrapper {
-    position: relative;
-    margin-right: 8px;
-    padding: 4px 15px;
-    color: #333;
-    vertical-align: middle;
-    background-color: #efefef;
-    border: 1px solid #e5e5e5;
-    border-radius: 4px;
-    cursor: pointer;
-    transition: all 0.2s ease;
-    &::after {
-      position: absolute;
-      bottom: -1px;
-      left: 6px;
-      z-index: 10;
-      width: 17px;
-      font-size: 23px;
-      content: '+';
-    }
-  }
-  .ant-checkbox-wrapper-checked {
-    position: relative;
-    color: #165dff;
-    background-color: transparent;
-    border: 1px solid #165dff;
-    &::after {
-      position: absolute;
-      bottom: -1px;
-      left: 6px;
-      z-index: 10;
-      width: 17px;
-      font-size: 23px;
-      content: '+';
-    }
-  }
-  .ant-checkbox-wrapper::after {
-    display: inline;
-  }
-  .ant-checkbox,
-  .ant-checkbox-inner {
-    display: none;
-  }
-  .drawerCloseIcon {
-    float: right;
-    cursor: pointer;
-  }
-  .ant-drawer-close {
-    display: none;
-  }
-  .ant-drawer-footer {
-    display: flex;
-    justify-content: end;
-  }
-  .attrValue {
-    &-list {
-      display: grid;
-      grid-gap: 20px;
-      grid-template-columns: 120px 1fr;
-      align-items: center;
-      justify-content: space-between;
-      margin: 20px 0px;
-    }
-    position: relative;
-    padding-left: 30px;
-    &-styleLine {
-      position: absolute;
-      top: 50%;
-      left: -1px;
-      z-index: 10;
-      width: 20px;
-      color: white;
-      text-align: center;
-      background: #165dff;
-      border-radius: 4px 4px 0px 0px;
-      transform: translate(0, -50%);
-    }
-    &::after {
-      position: absolute;
-      top: 0;
-      left: 8px;
-      z-index: 1;
-      width: 1px;
-      height: 100%;
-      background: #e8efff;
-      content: '';
-    }
-    .attrValue-list-right {
-      display: grid;
-      grid-gap: 20px;
-      grid-template-columns: 3px 80px 10px 80px 3px;
-      align-items: center;
-      justify-content: start;
-    }
-  }
-}
-.columnsActionClass {
-  cursor: pointer;
-}
-.formulateDetail {
-  &-title {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-}
-.addRule-formulate-tip {
-  margin: 10px 0px 0px;
-  color: red;
-}
-.formulateDetailClass {
-  margin: 10px 0px 0px;
-  border: 1px solid #ecedf0;
-  border-radius: 5px;
-  &-time {
-    color: #5f6085;
-  }
-  &-title {
-    display: grid;
-    grid-gap: 16px;
-    grid-template-columns: 200px 1fr;
-    align-items: center;
-    justify-content: space-between;
-    background-color: #f2f3f4;
-    border-bottom: 1px solid #ecedf0;
-    &-left {
-      padding: 10px 0px 10px 10px;
-      border-right: 1px solid #ecedf0;
-    }
-    &-right {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 10px 10px 10px 10px;
-    }
-  }
-  &-content {
-    display: grid;
-    grid-gap: 16px;
-    grid-template-columns: 200px 1fr;
-    align-items: flex-start;
-    justify-content: space-between;
-    height: 300px;
-    &-left {
-      height: 100%;
-      overflow: auto;
-      border-right: 1px solid #ecedf0;
-      &-tip {
-        margin: 0px 5px 0px 0px;
-        color: red;
-      }
-      &-item {
-        padding: 10px;
-        cursor: pointer;
-      }
-      &-itemContent {
-        margin: 0px 0px 0px 5px;
-        padding: 5px;
-        border: 1px solid #5f6085;
-        border-radius: 4px;
-      }
-      .active {
-        position: relative;
-        background-color: #e8efff;
-        &::after {
-          position: absolute;
-          top: 0;
-          left: 0;
-          width: 2px;
-          height: 100%;
-          background-color: #6b8ffd;
-          content: '';
-        }
-      }
-      .activeTime {
-        color: #2467fc;
-        .formulateDetailClass-content-left-tip {
-          color: #2467fc;
-        }
-      }
-    }
-    &-right {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: 15px;
-      line-height: 2;
-    }
-  }
-}
-.addRule-errorTip {
-  color: red;
-}
+.clearRule {
+  height: 100%;
+  padding: 24px;
+  background: #fff;
+  border-radius: 8px;
+  border-radius: 8px;
+  &-searchTop {
+    display: grid;
+    grid-template-columns: 320px 1fr;
+    align-items: center;
+    justify-items: self-end;
+    margin-bottom: 20px;
+  }
+  &-modal {
+    .ant-modal-body {
+      height: 350px;
+    }
+    .ant-picker-dropdown {
+      top: 133px !important;
+      left: 13px !important;
+    }
+  }
+  &-content {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  &-importModal {
+    &-content {
+    }
+    &-tip {
+      margin: 0px 0px 10px;
+      padding: 5px 0px 5px 15px;
+      background-color: #e7f3fe;
+      border: 1px solid #b8e4ff;
+      border-radius: 4px;
+      .icon {
+        margin: 0px 10px;
+        color: #165dff;
+      }
+    }
+    &-list {
+      height: 160px;
+      padding: 10px;
+      overflow-y: scroll;
+      border: 1px solid #e5e5e5;
+      border-radius: 4px;
+    }
+  }
+  &-openRuleModal {
+    &-list {
+      height: 160px;
+      padding: 10px;
+      overflow-y: scroll;
+      border: 1px solid #e5e5e5;
+      border-radius: 4px;
+    }
+    &-closeTip {
+      margin: 10px 0px;
+      color: red;
+    }
+  }
+}
+.openRuleModal-icon {
+  margin: 0px 10px 0px 0px;
+  color: #faad14;
+}
+
+.addRuleForm {
+  .selectVent {
+    display: grid;
+    grid-gap: 20px;
+    grid-template-columns: 1fr 1fr;
+    align-items: center;
+    width: 100%;
+    margin: 20px 0px;
+  }
+  .ant-checkbox-wrapper {
+    position: relative;
+    margin-right: 8px;
+    margin-bottom: 8px;
+    padding: 4px 15px;
+    color: #333;
+    vertical-align: middle;
+    background-color: #efefef;
+    border: 1px solid #e5e5e5;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    &::after {
+      position: absolute;
+      bottom: -1px;
+      left: 6px;
+      z-index: 10;
+      width: 17px;
+      font-size: 23px;
+      content: '+';
+    }
+  }
+  .ant-checkbox-wrapper-checked {
+    position: relative;
+    color: #165dff;
+    background-color: transparent;
+    border: 1px solid #165dff;
+    &::after {
+      position: absolute;
+      bottom: -1px;
+      left: 6px;
+      z-index: 10;
+      width: 17px;
+      font-size: 23px;
+      content: '+';
+    }
+  }
+  .ant-checkbox-wrapper::after {
+    display: inline;
+  }
+  .ant-checkbox,
+  .ant-checkbox-inner {
+    display: none;
+  }
+  .drawerCloseIcon {
+    float: right;
+    cursor: pointer;
+  }
+  .ant-drawer-close {
+    display: none;
+  }
+  .ant-drawer-footer {
+    display: flex;
+    justify-content: end;
+  }
+  .attrValue {
+    &-list {
+      display: grid;
+      grid-gap: 20px;
+      grid-template-columns: 120px 1fr;
+      align-items: center;
+      justify-content: space-between;
+      margin: 20px 0px;
+    }
+    position: relative;
+    padding-left: 30px;
+    &-styleLine {
+      position: absolute;
+      top: 50%;
+      left: -1px;
+      z-index: 10;
+      width: 20px;
+      color: white;
+      text-align: center;
+      background: #165dff;
+      border-radius: 4px 4px 0px 0px;
+      transform: translate(0, -50%);
+    }
+    &::after {
+      position: absolute;
+      top: 0;
+      left: 8px;
+      z-index: 1;
+      width: 1px;
+      height: 100%;
+      background: #e8efff;
+      content: '';
+    }
+    .attrValue-list-right {
+      display: grid;
+      grid-gap: 20px;
+      grid-template-columns: 3px 80px 10px 80px 3px;
+      align-items: center;
+      justify-content: start;
+    }
+  }
+}
+.columnsActionClass {
+  cursor: pointer;
+}
+.formulateDetail {
+  &-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+}
+.addRule-formulate-tip {
+  margin: 10px 0px 0px;
+  color: red;
+}
+.formulateDetailClass {
+  margin: 10px 0px 0px;
+  border: 1px solid #ecedf0;
+  border-radius: 5px;
+  &-time {
+    color: #5f6085;
+  }
+  &-title {
+    display: grid;
+    grid-gap: 16px;
+    grid-template-columns: 200px 1fr;
+    align-items: center;
+    justify-content: space-between;
+    background-color: #f2f3f4;
+    border-bottom: 1px solid #ecedf0;
+    &-left {
+      padding: 10px 0px 10px 10px;
+      border-right: 1px solid #ecedf0;
+    }
+    &-right {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 10px 10px 10px 10px;
+    }
+  }
+  &-content {
+    display: grid;
+    grid-gap: 16px;
+    grid-template-columns: 200px 1fr;
+    align-items: flex-start;
+    justify-content: space-between;
+    height: 300px;
+    &-left {
+      height: 100%;
+      overflow: auto;
+      border-right: 1px solid #ecedf0;
+      &-tip {
+        margin: 0px 5px 0px 0px;
+        color: red;
+      }
+      &-item {
+        padding: 10px;
+        cursor: pointer;
+      }
+      &-itemContent {
+        margin: 0px 0px 0px 5px;
+        padding: 5px;
+        border: 1px solid #5f6085;
+        border-radius: 4px;
+      }
+      .active {
+        position: relative;
+        background-color: #e8efff;
+        &::after {
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 2px;
+          height: 100%;
+          background-color: #6b8ffd;
+          content: '';
+        }
+      }
+      .activeTime {
+        color: #2467fc;
+        .formulateDetailClass-content-left-tip {
+          color: #2467fc;
+        }
+      }
+    }
+    &-right {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: 15px;
+      line-height: 2;
+    }
+  }
+}
+.addRule-errorTip {
+  color: red;
+}

package/es/modules/dataManage/components/createMetaDrawer.js

@@ -376,6 +376,8 @@ var CreateMeta = function CreateMeta(props) {
   useEffect(function () {
     var _Y = getTableScroll(376, 'dataManageCreateMetaTable');
     setScrollY(_Y);
+    getTagList(2);
+    getTagList(3);
   }, []);
   var onClose = function onClose() {
     if (isChange) {
@@ -416,6 +418,42 @@ var CreateMeta = function CreateMeta(props) {
     }]),
     _useState20 = _slicedToArray(_useState19, 1),
     maidianList = _useState20[0];
+  var _useState21 = useState([]),
+    _useState22 = _slicedToArray(_useState21, 2),
+    bizTag = _useState22[0],
+    setBizTag = _useState22[1];
+  var _useState23 = useState([]),
+    _useState24 = _slicedToArray(_useState23, 2),
+    triTag = _useState24[0],
+    setTriTag = _useState24[1];
+  //标签列表数据 2:业务标签 3:触发标签
+  var getTagList = function getTagList(type) {
+    request(apis.dict.eventTag, {
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
+      type: type
+    }).then(function (res) {
+      if (res.code == '100000') {
+        switch (type) {
+          case 2:
+            setBizTag(res.data.map(function (res) {
+              return {
+                label: res.name,
+                value: res.id
+              };
+            }));
+            break;
+          case 3:
+            setTriTag(res.data.map(function (res) {
+              return {
+                label: res.name,
+                value: res.id
+              };
+            }));
+            break;
+        }
+      }
+    });
+  };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     className: classPrefix,
     width: 1000,
@@ -485,9 +523,23 @@ var CreateMeta = function CreateMeta(props) {
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "triggeringOccasion",
     label: "\u89E6\u53D1\u65F6\u673A"
-  }, /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement(Select, {
+    allowClear: true,
     style: {
-      border: 0
+      border: 0,
+      width: '160px',
+      marginRight: '10px'
+    },
+    placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u6807\u7B7E",
+    options: triTag,
+    onChange: function onChange() {
+      setIsChange(true);
+    }
+  }), "\u6216", /*#__PURE__*/React.createElement(Input, {
+    style: {
+      border: 0,
+      width: 'calc(100% - 195px)',
+      marginLeft: '10px'
     },
     placeholder: "\u8BF7\u8F93\u5165\u89E6\u53D1\u65F6\u673A\uFF0C\u4F8B\u5982\uFF1A\u7528\u6237\u70B9\u51FB\u786E\u8BA4\u6309\u94AE",
     showCount: true,
@@ -495,6 +547,16 @@ var CreateMeta = function CreateMeta(props) {
     onChange: function onChange(e) {
       setIsChange(true);
     }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "triggeringOccasion1",
+    label: "\u4E1A\u52A1\u6807\u7B7E"
+  }, /*#__PURE__*/React.createElement(Select, {
+    allowClear: true,
+    placeholder: "\u8BF7\u8F93\u5165\u4E1A\u52A1\u6807\u7B7E",
+    options: bizTag,
+    onChange: function onChange() {
+      setIsChange(true);
+    }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     name: "maidianID",
     label: "\u57CB\u70B9\u5E73\u53F0"

package/es/modules/dataManage/components/tablePlus.d.ts

@@ -18,6 +18,7 @@ interface DataType {
     owner: string;
     triggeringOccasion: string;
     canDel: boolean;
+    triggeringTag: string;
 }
 interface queryPlanType {
     unexpectedPropList: string[];