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

package/es/constants/api.d.ts

@@ -102,5 +102,11 @@ declare let apis: {
         exportFile: string;
         allOpenStatus: string;
     };
+    dict: {
+        dictList: string;
+        eventTag: string;
+        addLabelRelation: string;
+        delLabelRelation: string;
+    };
 };
 export default apis;

package/es/constants/api.js

@@ -165,6 +165,12 @@ var apis = {
     deleteRule: '/zg/web/v2/rinseShiftRule/deleteRule',
     exportFile: '/zg/web/v2/rinseShiftRule/exportReport',
     allOpenStatus: '/zg/web/v2/rinseShiftRule/statusMain'
+  },
+  dict: {
+    dictList: '/zg/web/v2/systemSettings/attr/dict/list',
+    eventTag: '/zg/web/v2/eventLabel/list',
+    addLabelRelation: '/zg/web/v2/eventLabel/addLabelRelation',
+    delLabelRelation: '/zg/web/v2/eventLabel/delLabelRelation'
   }
 };
 export default apis;

package/es/modules/CutsModal.d.ts

@@ -145,3 +145,11 @@ export interface RuleDetailType {
         content: string;
     }[];
 }
+export interface DictData {
+    dictName: string;
+    id: number;
+}
+export interface DictList {
+    label: string;
+    value: string;
+}

package/es/modules/clearRule/addRule.js

@@ -65,6 +65,9 @@ var AddRule = function AddRule(_ref) {
     }, {
       ruleType: 5,
       content: undefined
+    }, {
+      ruleType: 6,
+      content: undefined
     }]);
     setBizAttributeSelectorValue(undefined); // 清空属性
     setEvent({
@@ -165,6 +168,9 @@ var AddRule = function AddRule(_ref) {
     }, {
       ruleType: 5,
       content: undefined
+    }, {
+      ruleType: 6,
+      content: undefined
     }]),
     _useState6 = _slicedToArray(_useState5, 2),
     optionsRule = _useState6[0],
@@ -184,6 +190,9 @@ var AddRule = function AddRule(_ref) {
   }, {
     label: '非空',
     value: 5
+  }, {
+    label: '字典校验',
+    value: 6
   }];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -233,6 +242,9 @@ var AddRule = function AddRule(_ref) {
     }, {
       ruleType: 5,
       content: undefined
+    }, {
+      ruleType: 6,
+      content: undefined
     }]);
     setBizAttributeSelectorValue(undefined); // 清空属性
   };
@@ -452,6 +464,8 @@ var TypeComponent = function TypeComponent(_ref2) {
     editStatus = _ref2.editStatus;
   // type:1 string    2:正则   3：数字区间 4：枚举
   var Component = null;
+  var _useContext2 = useContext(BizGlobalDataContext),
+    currentApp = _useContext2.currentApp;
   // 枚举
   var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
@@ -480,6 +494,27 @@ var TypeComponent = function TypeComponent(_ref2) {
     _useState24 = _slicedToArray(_useState23, 2),
     includedMaxState = _useState24[0],
     setIncludedMaxState = _useState24[1];
+  //字典
+  var _useState25 = useState([]),
+    _useState26 = _slicedToArray(_useState25, 2),
+    dictList = _useState26[0],
+    setDictList = _useState26[1];
+  var getDictList = function getDictList() {
+    request(apis.dict.dictList, {
+      appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
+    }).then(function (res) {
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        var _res$data;
+        setDictList((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
+          return {
+            label: item.dictName,
+            value: item.id,
+            id: item.id
+          };
+        }));
+      }
+    });
+  };
   // 只会执行一次 区间回显
   useEffect(function () {
     if (editStatus) {
@@ -496,6 +531,7 @@ var TypeComponent = function TypeComponent(_ref2) {
         setIncludedMaxState(val.rightSymbol == ')' ? false : true);
       }
     }
+    getDictList();
   }, []);
   switch (type) {
     case 1:
@@ -601,6 +637,23 @@ var TypeComponent = function TypeComponent(_ref2) {
         options: optionsEnum
       });
       break;
+    case 6:
+      Component = /*#__PURE__*/React.createElement(Select
+      //  defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
+      , {
+        //  defaultValue={Number(optionsValue.filter((r) => r.ruleType == type)[0].content)}
+        value: Number(optionsValue.filter(function (r) {
+          return r.ruleType == type;
+        })[0].content),
+        placeholder: "\u9009\u62E9\u5B57\u5178\u89C4\u5219",
+        options: dictList,
+        onChange: function onChange(value) {
+          optionsValue.filter(function (r) {
+            return r.ruleType == type;
+          })[0].content = value;
+        }
+      });
+      break;
     default:
       Component = /*#__PURE__*/React.createElement("div", null, "\u5FC5\u586B");
       break;

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

@@ -1,256 +1,256 @@
-.clearRule {
-  height: 100%;
-  padding: 24px;
-  background: #fff;
-  border-radius: 8px;
-}
-.clearRule-searchTop {
-  display: grid;
-  grid-template-columns: 320px 1fr;
-  align-items: center;
-  justify-items: self-end;
-  margin-bottom: 20px;
-}
-.clearRule-modal .ant-modal-body {
-  height: 350px;
-}
-.clearRule-modal .ant-picker-dropdown {
-  top: 133px !important;
-  left: 13px !important;
-}
-.clearRule-content {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-.clearRule-importModal-tip {
-  margin: 0px 0px 10px;
-  padding: 5px 0px 5px 15px;
-  background-color: #e7f3fe;
-  border: 1px solid #b8e4ff;
-  border-radius: 4px;
-}
-.clearRule-importModal-tip .icon {
-  margin: 0px 10px;
-  color: #165dff;
-}
-.clearRule-importModal-list {
-  height: 160px;
-  padding: 10px;
-  overflow-y: scroll;
-  border: 1px solid #e5e5e5;
-  border-radius: 4px;
-}
-.clearRule-openRuleModal-list {
-  height: 160px;
-  padding: 10px;
-  overflow-y: scroll;
-  border: 1px solid #e5e5e5;
-  border-radius: 4px;
-}
-.clearRule-openRuleModal-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;
-}
-.addRuleForm .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;
-}
-.addRuleForm .ant-checkbox-wrapper::after {
-  position: absolute;
-  bottom: -1px;
-  left: 6px;
-  z-index: 10;
-  width: 17px;
-  font-size: 23px;
-  content: '+';
-}
-.addRuleForm .ant-checkbox-wrapper-checked {
-  position: relative;
-  color: #165dff;
-  background-color: transparent;
-  border: 1px solid #165dff;
-}
-.addRuleForm .ant-checkbox-wrapper-checked::after {
-  position: absolute;
-  bottom: -1px;
-  left: 6px;
-  z-index: 10;
-  width: 17px;
-  font-size: 23px;
-  content: '+';
-}
-.addRuleForm .ant-checkbox-wrapper::after {
-  display: inline;
-}
-.addRuleForm .ant-checkbox,
-.addRuleForm .ant-checkbox-inner {
-  display: none;
-}
-.addRuleForm .drawerCloseIcon {
-  float: right;
-  cursor: pointer;
-}
-.addRuleForm .ant-drawer-close {
-  display: none;
-}
-.addRuleForm .ant-drawer-footer {
-  display: flex;
-  justify-content: end;
-}
-.addRuleForm .attrValue {
-  position: relative;
-  padding-left: 30px;
-}
-.addRuleForm .attrValue-list {
-  display: grid;
-  grid-gap: 20px;
-  grid-template-columns: 120px 1fr;
-  align-items: center;
-  justify-content: space-between;
-  margin: 20px 0px;
-}
-.addRuleForm .attrValue-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%);
-}
-.addRuleForm .attrValue::after {
-  position: absolute;
-  top: 0;
-  left: 8px;
-  z-index: 1;
-  width: 1px;
-  height: 100%;
-  background: #e8efff;
-  content: '';
-}
-.addRuleForm .attrValue .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;
-}
-.formulateDetailClass-time {
-  color: #5f6085;
-}
-.formulateDetailClass-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;
-}
-.formulateDetailClass-title-left {
-  padding: 10px 0px 10px 10px;
-  border-right: 1px solid #ecedf0;
-}
-.formulateDetailClass-title-right {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 10px 10px 10px 10px;
-}
-.formulateDetailClass-content {
-  display: grid;
-  grid-gap: 16px;
-  grid-template-columns: 200px 1fr;
-  align-items: flex-start;
-  justify-content: space-between;
-  height: 300px;
-}
-.formulateDetailClass-content-left {
-  height: 100%;
-  overflow: auto;
-  border-right: 1px solid #ecedf0;
-}
-.formulateDetailClass-content-left-tip {
-  margin: 0px 5px 0px 0px;
-  color: red;
-}
-.formulateDetailClass-content-left-item {
-  padding: 10px;
-  cursor: pointer;
-}
-.formulateDetailClass-content-left-itemContent {
-  margin: 0px 0px 0px 5px;
-  padding: 5px;
-  border: 1px solid #5f6085;
-  border-radius: 4px;
-}
-.formulateDetailClass-content-left .active {
-  position: relative;
-  background-color: #e8efff;
-}
-.formulateDetailClass-content-left .active::after {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 2px;
-  height: 100%;
-  background-color: #6b8ffd;
-  content: '';
-}
-.formulateDetailClass-content-left .activeTime {
-  color: #2467fc;
-}
-.formulateDetailClass-content-left .activeTime .formulateDetailClass-content-left-tip {
-  color: #2467fc;
-}
-.formulateDetailClass-content-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;
+}
+.clearRule-searchTop {
+  display: grid;
+  grid-template-columns: 320px 1fr;
+  align-items: center;
+  justify-items: self-end;
+  margin-bottom: 20px;
+}
+.clearRule-modal .ant-modal-body {
+  height: 350px;
+}
+.clearRule-modal .ant-picker-dropdown {
+  top: 133px !important;
+  left: 13px !important;
+}
+.clearRule-content {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.clearRule-importModal-tip {
+  margin: 0px 0px 10px;
+  padding: 5px 0px 5px 15px;
+  background-color: #e7f3fe;
+  border: 1px solid #b8e4ff;
+  border-radius: 4px;
+}
+.clearRule-importModal-tip .icon {
+  margin: 0px 10px;
+  color: #165dff;
+}
+.clearRule-importModal-list {
+  height: 160px;
+  padding: 10px;
+  overflow-y: scroll;
+  border: 1px solid #e5e5e5;
+  border-radius: 4px;
+}
+.clearRule-openRuleModal-list {
+  height: 160px;
+  padding: 10px;
+  overflow-y: scroll;
+  border: 1px solid #e5e5e5;
+  border-radius: 4px;
+}
+.clearRule-openRuleModal-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;
+}
+.addRuleForm .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;
+}
+.addRuleForm .ant-checkbox-wrapper::after {
+  position: absolute;
+  bottom: -1px;
+  left: 6px;
+  z-index: 10;
+  width: 17px;
+  font-size: 23px;
+  content: '+';
+}
+.addRuleForm .ant-checkbox-wrapper-checked {
+  position: relative;
+  color: #165dff;
+  background-color: transparent;
+  border: 1px solid #165dff;
+}
+.addRuleForm .ant-checkbox-wrapper-checked::after {
+  position: absolute;
+  bottom: -1px;
+  left: 6px;
+  z-index: 10;
+  width: 17px;
+  font-size: 23px;
+  content: '+';
+}
+.addRuleForm .ant-checkbox-wrapper::after {
+  display: inline;
+}
+.addRuleForm .ant-checkbox,
+.addRuleForm .ant-checkbox-inner {
+  display: none;
+}
+.addRuleForm .drawerCloseIcon {
+  float: right;
+  cursor: pointer;
+}
+.addRuleForm .ant-drawer-close {
+  display: none;
+}
+.addRuleForm .ant-drawer-footer {
+  display: flex;
+  justify-content: end;
+}
+.addRuleForm .attrValue {
+  position: relative;
+  padding-left: 30px;
+}
+.addRuleForm .attrValue-list {
+  display: grid;
+  grid-gap: 20px;
+  grid-template-columns: 120px 1fr;
+  align-items: center;
+  justify-content: space-between;
+  margin: 20px 0px;
+}
+.addRuleForm .attrValue-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%);
+}
+.addRuleForm .attrValue::after {
+  position: absolute;
+  top: 0;
+  left: 8px;
+  z-index: 1;
+  width: 1px;
+  height: 100%;
+  background: #e8efff;
+  content: '';
+}
+.addRuleForm .attrValue .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;
+}
+.formulateDetailClass-time {
+  color: #5f6085;
+}
+.formulateDetailClass-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;
+}
+.formulateDetailClass-title-left {
+  padding: 10px 0px 10px 10px;
+  border-right: 1px solid #ecedf0;
+}
+.formulateDetailClass-title-right {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px 10px 10px 10px;
+}
+.formulateDetailClass-content {
+  display: grid;
+  grid-gap: 16px;
+  grid-template-columns: 200px 1fr;
+  align-items: flex-start;
+  justify-content: space-between;
+  height: 300px;
+}
+.formulateDetailClass-content-left {
+  height: 100%;
+  overflow: auto;
+  border-right: 1px solid #ecedf0;
+}
+.formulateDetailClass-content-left-tip {
+  margin: 0px 5px 0px 0px;
+  color: red;
+}
+.formulateDetailClass-content-left-item {
+  padding: 10px;
+  cursor: pointer;
+}
+.formulateDetailClass-content-left-itemContent {
+  margin: 0px 0px 0px 5px;
+  padding: 5px;
+  border: 1px solid #5f6085;
+  border-radius: 4px;
+}
+.formulateDetailClass-content-left .active {
+  position: relative;
+  background-color: #e8efff;
+}
+.formulateDetailClass-content-left .active::after {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 2px;
+  height: 100%;
+  background-color: #6b8ffd;
+  content: '';
+}
+.formulateDetailClass-content-left .activeTime {
+  color: #2467fc;
+}
+.formulateDetailClass-content-left .activeTime .formulateDetailClass-content-left-tip {
+  color: #2467fc;
+}
+.formulateDetailClass-content-right {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 15px;
+  line-height: 2;
+}
+.addRule-errorTip {
+  color: red;
+}