@zgfe/modules-dm 1.0.57-zhongyuan.42 → 1.0.57-zhongyuan.45

package/es/modules/clearRule/addRule.d.ts

@@ -6,5 +6,6 @@ declare const AddRule: React.FC<{
     onSetclose: Function;
     currentRuleDetail: RuleDetailType | undefined | null;
     getList: Function;
+    ruleRowEdit?: number;
 }>;
 export default AddRule;

package/es/modules/clearRule/addRule.js

@@ -27,7 +27,8 @@ var AddRule = function AddRule(_ref) {
   var addruleShow = _ref.addruleShow,
     onSetclose = _ref.onSetclose,
     currentRuleDetail = _ref.currentRuleDetail,
-    getList = _ref.getList;
+    getList = _ref.getList,
+    ruleRowEdit = _ref.ruleRowEdit;
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
   // 规则启用
@@ -63,6 +64,10 @@ var AddRule = function AddRule(_ref) {
   };
   var onFinish = function onFinish(values) {
     console.log('Success:', values, optionsRule);
+    if (event.id == -100 || !bizAttributeSelectorValue) {
+      message.error('请选择事件或者属性！');
+      return;
+    }
     if (hasEvent) {
       message.error('该属性的规则已存在，请重新选择属性！');
       return;
@@ -271,6 +276,15 @@ var AddRule = function AddRule(_ref) {
       setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, attr), {}, {
         value: _value
       }));
+      var arr = optionsRule.map(function (o) {
+        if (o.ruleType == 1) {
+          return _objectSpread(_objectSpread({}, o), {}, {
+            content: attr.type
+          });
+        }
+        return o;
+      });
+      setOptionsRule(arr);
       setOptions(attr.type != '3' ? [].concat(initOptions, [{
         label: '字典校验',
         value: 6
@@ -346,6 +360,17 @@ var AddRule = function AddRule(_ref) {
     })) {
       result = true;
     }
+    // 类型只能添加一个
+    if (optionsRule.find(function (o) {
+      return o.ruleType != 2;
+    }) && btnItem.value == 2) {
+      result = true;
+    }
+    if (optionsRule.find(function (o) {
+      return o.ruleType == 2;
+    }) && optionsRule.length >= 1) {
+      result = true;
+    }
     return result;
   };
   return /*#__PURE__*/React.createElement("div", {
@@ -366,12 +391,13 @@ var AddRule = function AddRule(_ref) {
     width: "700px",
     footer: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
       onClick: onClose
-    }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
+    }, "\u53D6\u6D88"), (ruleRowEdit == undefined || ruleRowEdit === 0) && (/*#__PURE__*/React.createElement(Button, {
       type: "primary",
       onClick: handleSave
-    }, "\u786E\u5B9A")))
+    }, "\u786E\u5B9A"))))
   }, /*#__PURE__*/React.createElement(Form, {
     form: ruleForm,
+    disabled: ruleRowEdit === 1,
     labelCol: {
       span: 4
     },
@@ -490,7 +516,7 @@ function parseRange(str) {
   };
 }
 var TypeComponent = function TypeComponent(_ref2) {
-  var _optionsValue$find;
+  var _optionsValue$find, _optionsValue$find3;
   var type = _ref2.type,
     optionsValue = _ref2.optionsValue,
     editStatus = _ref2.editStatus,
@@ -578,6 +604,14 @@ var TypeComponent = function TypeComponent(_ref2) {
     _useState30 = _slicedToArray(_useState29, 2),
     typeValue = _useState30[0],
     setTypeValue = _useState30[1];
+  useEffect(function () {
+    var _optionsValue$find2;
+    setTypeValue((_optionsValue$find2 = optionsValue.find(function (o) {
+      return o.uniqueId == id;
+    })) === null || _optionsValue$find2 === void 0 ? void 0 : _optionsValue$find2.content);
+  }, [(_optionsValue$find3 = optionsValue.find(function (o) {
+    return o.uniqueId == id;
+  })) === null || _optionsValue$find3 === void 0 ? void 0 : _optionsValue$find3.content]);
   var _useState31 = useState(optionsValue.filter(function (r) {
       return r.uniqueId == id;
     })[0].content),

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

@@ -1,257 +1,265 @@
-.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;
-  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;
-}
-.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 50px;
-  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 .sourceValueErrortext {
+  color: red;
+  margin: 6px 0px 0px;
+  font-size: 12px;
+  position: absolute;
+  bottom: 0;
+  left: 16px;
+}
+.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;
+  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;
+}
+.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 50px;
+  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;
+}