@zgfe/modules-dm 1.0.57-alpha.0 → 1.0.57-zhongyuan-dz.2

package/es/constants/api.d.ts

@@ -88,6 +88,7 @@ declare let apis: {
         exportFile: string;
         downloadTemple: string;
         allOpenStatus: string;
+        checkStatus: string;
     };
     clearRule: {
         getList: string;
@@ -95,11 +96,17 @@ declare let apis: {
         checkRule: string;
         getDetail: string;
         modifyRule: string;
-        checkStatis: string;
+        checkStatus: string;
         selectStatus: string;
         deleteRule: string;
         exportFile: string;
         allOpenStatus: string;
     };
+    dict: {
+        dictList: string;
+        eventTag: string;
+        addLabelRelation: string;
+        delLabelRelation: string;
+    };
 };
 export default apis;

package/es/constants/api.js

@@ -151,7 +151,8 @@ var apis = {
     downloadRule: '/zg/web/v2/verify/exportVerify',
     exportFile: '/zg/web/v2/verify/report/export',
     downloadTemple: '/zg/web/v2/verify/downloadMould',
-    allOpenStatus: '/zg/web/v2/verify/statusMain'
+    allOpenStatus: '/zg/web/v2/verify/statusMain',
+    checkStatus: '/zg/web/v2/verify/statusBefore'
   },
   clearRule: {
     getList: '/zg/web/v2/rinseShiftRule/queryRinseShiftRuleList',
@@ -159,11 +160,17 @@ var apis = {
     checkRule: '/zg/web/v2/rinseShiftRule/updateRinseShiftRuleCheck',
     getDetail: '/zg/web/v2/rinseShiftRule/detail',
     modifyRule: '/zg/web/v2/rinseShiftRule/updateRinseShiftRule',
-    checkStatis: '/zg/web/v2/rinseShiftRule/statusBefore',
+    checkStatus: '/zg/web/v2/rinseShiftRule/statusBefore',
     selectStatus: '/zg/web/v2/rinseShiftRule/status',
     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/index.d.ts

@@ -3,6 +3,6 @@ import DataManage from './modules/dataManage';
 import PlanList from './modules/dataPlan';
 import DataRealView from './modules/dataReal/index1';
 import DataMapView from './modules/dataMap';
-import ClearRule from './modules/clear-rule';
-import FormulateRule from './modules/formulate-rule';
+import ClearRule from './modules/clearRule';
+import FormulateRule from './modules/formulateRule';
 export { PlanList, DataManage, DataRealView, DataMapView, ClearRule, FormulateRule };

package/es/index.js

@@ -3,6 +3,6 @@ import DataManage from './modules/dataManage';
 import PlanList from './modules/dataPlan';
 import DataRealView from './modules/dataReal/index1';
 import DataMapView from './modules/dataMap';
-import ClearRule from './modules/clear-rule';
-import FormulateRule from './modules/formulate-rule';
+import ClearRule from './modules/clearRule';
+import FormulateRule from './modules/formulateRule';
 export { PlanList, DataManage, DataRealView, DataMapView, ClearRule, FormulateRule };

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/{clear-rule → clearRule}/addRule.js

@@ -65,6 +65,9 @@ var AddRule = function AddRule(_ref) {
     }, {
       ruleType: 5,
       content: undefined
+    }, {
+      ruleType: 6,
+      content: undefined
     }]);
     setBizAttributeSelectorValue(undefined); // 清空属性
     setEvent({
@@ -109,7 +112,7 @@ var AddRule = function AddRule(_ref) {
           // 刷新列表
           getList();
         } else {
-          message.error('修改规则失败！');
+          message.error(res.msg);
         }
       });
       return;
@@ -142,7 +145,7 @@ var AddRule = function AddRule(_ref) {
         // 刷新列表
         getList();
       } else {
-        message.error('添加规则失败！');
+        message.error(res.msg);
       }
     });
   };
@@ -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); // 清空属性
   };
@@ -265,15 +277,9 @@ var AddRule = function AddRule(_ref) {
       setBizAttributeSelectorValue(undefined);
     } else {
       var _value = attr.propCategory === 'eventProp' ? attr.id : attr.name;
-      setBizAttributeSelectorValue({
-        propCategory: attr.propCategory,
-        category: attr.category,
-        value: _value,
-        id: attr.id,
-        label: attr === null || attr === void 0 ? void 0 : attr.label,
-        name: attr === null || attr === void 0 ? void 0 : attr.name,
-        type: attr.type
-      });
+      setBizAttributeSelectorValue(_objectSpread(_objectSpread({}, attr), {}, {
+        value: _value
+      }));
       // 初始化属性基础类型
       if (currentRule.includes(1)) {
         var newArr = optionsRule;
@@ -313,10 +319,6 @@ var AddRule = function AddRule(_ref) {
           if (o.ruleType == j.ruleType) {
             o.content = j.content;
           }
-          // 这个为模拟的区间数据
-          if (o.ruleType == 3) {
-            o.content = '(4,8]';
-          }
         });
       });
       var currentTypeArr = currentRuleDetail.verifyDetailVo.map(function (o) {
@@ -359,7 +361,7 @@ var AddRule = function AddRule(_ref) {
     initialValues: {
       name: '',
       desctiption: '',
-      ruleobj: []
+      ruleobj: {}
     },
     onFinish: onFinish,
     labelAlign: "left"
@@ -386,7 +388,7 @@ var AddRule = function AddRule(_ref) {
     name: "ruleobj",
     rules: [{
       required: true,
-      message: '请寻找校验对象'
+      message: '请选择校验对象'
     }]
   }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Radio.Group, {
     onChange: onSelectType,
@@ -395,7 +397,7 @@ var AddRule = function AddRule(_ref) {
     value: 'eventProp'
   }, "\u4E8B\u4EF6\u5C5E\u6027\u6821\u9A8C"), /*#__PURE__*/React.createElement(Radio, {
     value: 'user'
-  }, "\u7528\u6237\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
+  }, "\u89D2\u8272\u5C5E\u6027\u6821\u9A8C")), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
     className: "selectVent"
   }, selectType == 'eventProp' && (/*#__PURE__*/React.createElement(BizEventSelector, {
     showAllEvent: true,
@@ -415,7 +417,7 @@ var AddRule = function AddRule(_ref) {
     enableEnvProp: true,
     eventIdList: [event === null || event === void 0 ? void 0 : event.id],
     value: bizAttributeSelectorValue,
-    enableDelete: true,
+    enableDelete: false,
     onChange: onChangeAttr,
     onDelete: function onDelete() {
       onChangeAttr(undefined);
@@ -462,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),
@@ -490,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) {
@@ -503,9 +528,10 @@ var TypeComponent = function TypeComponent(_ref2) {
         setMinNum(val.firstNumber);
         setMaxNum(val.secondNumber);
         setIncludedMinState(val.leftSymbol == '(' ? false : true);
-        setIncludedMaxState(val.rightSymbol == '(' ? false : true);
+        setIncludedMaxState(val.rightSymbol == ')' ? false : true);
       }
     }
+    getDictList();
   }, []);
   switch (type) {
     case 1:
@@ -519,7 +545,7 @@ var TypeComponent = function TypeComponent(_ref2) {
           label: '字符串类型'
         }, {
           value: 2,
-          label: '数字类型'
+          label: '数值类型'
         }, {
           value: 3,
           label: '日期类型'
@@ -548,8 +574,11 @@ var TypeComponent = function TypeComponent(_ref2) {
       Component = /*#__PURE__*/React.createElement("div", {
         className: "attrValue-list-right"
       }, /*#__PURE__*/React.createElement(Tooltip, {
-        title: "\u70B9\u51FB\u5207\u6362[\u5F00\u542F/\u5173\u95ED]\u533A\u95F4"
+        title: "\u70B9\u51FB\u5207\u6362[\u5F00/\u95ED]\u533A\u95F4"
       }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          cursor: 'pointer'
+        },
         onClick: function onClick() {
           setIncludedMinState(function (pre) {
             optionsValue.filter(function (r) {
@@ -579,8 +608,11 @@ var TypeComponent = function TypeComponent(_ref2) {
           })[0].content = "".concat(includedMinState ? '[' : '(').concat(minNum, ",").concat(value).concat(includedMaxState ? ']' : ')');
         }
       }), /*#__PURE__*/React.createElement(Tooltip, {
-        title: "\u70B9\u51FB\u5207\u6362[\u5F00\u542F/\u5173\u95ED]\u533A\u95F4"
+        title: "\u70B9\u51FB\u5207\u6362[\u5F00/\u95ED]\u533A\u95F4"
       }, /*#__PURE__*/React.createElement("div", {
+        style: {
+          cursor: 'pointer'
+        },
         onClick: function onClick() {
           setIncludedMaxState(function (pre) {
             optionsValue.filter(function (r) {
@@ -605,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/{clear-rule → clearRule}/css/index.css

@@ -15,8 +15,8 @@
   height: 350px;
 }
 .clearRule-modal .ant-picker-dropdown {
-  left: 13px !important;
   top: 133px !important;
+  left: 13px !important;
 }
 .clearRule-content {
   display: flex;
@@ -125,7 +125,7 @@
 .addRuleForm .attrValue-list {
   display: grid;
   grid-gap: 20px;
-  grid-template-columns: 80px 1fr;
+  grid-template-columns: 120px 1fr;
   align-items: center;
   justify-content: space-between;
   margin: 20px 0px;

package/es/modules/{clear-rule → clearRule}/css/index.less

@@ -78,6 +78,7 @@
   .ant-checkbox-wrapper {
     position: relative;
     margin-right: 8px;
+    margin-bottom: 8px;
     padding: 4px 15px;
     color: #333;
     vertical-align: middle;
@@ -133,7 +134,7 @@
     &-list {
       display: grid;
       grid-gap: 20px;
-      grid-template-columns: 80px 1fr;
+      grid-template-columns: 120px 1fr;
       align-items: center;
       justify-content: space-between;
       margin: 20px 0px;

package/es/modules/{clear-rule → clearRule}/index.js

@@ -133,7 +133,7 @@ var ClearRule = function ClearRule() {
         }
         getDetail(ruleRow.ruleId);
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
@@ -177,7 +177,6 @@ var ClearRule = function ClearRule() {
     downloadDate = _useState14[0],
     setDownloadDate = _useState14[1];
   var handleSelectDate = function handleSelectDate(date) {
-    console.log(date);
     setDownloadDate(date);
   };
   var handleOk = function handleOk() {
@@ -214,6 +213,8 @@ var ClearRule = function ClearRule() {
     setOpenImportModal(false);
     setOpenImportModalResult(false);
     setErrorRule(undefined);
+    // 刷新列表
+    _getList(ruleSearchName);
   };
   // 导出规则
   var handleDownLoadRuleFile = function handleDownLoadRuleFile() {
@@ -226,47 +227,85 @@ var ClearRule = function ClearRule() {
       fileName: "\u89C4\u5219\u5217\u8868_".concat(moment().format('YYYYMMDD'))
     }).then(function (res) {});
   };
+  // 总状态
+  var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
+    style: {
+      fontSize: 24
+    },
+    spin: true,
+    onPointerEnterCapture: undefined,
+    onPointerLeaveCapture: undefined
+  });
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    allOpenRule = _useState22[0],
+    setAllOpenRule = _useState22[1];
+  var _useState23 = useState(false),
+    _useState24 = _slicedToArray(_useState23, 2),
+    statusLoading = _useState24[0],
+    setStatusLoading = _useState24[1];
+  var handleAllOpenStatus = function handleAllOpenStatus(value) {
+    setStatusLoading(true);
+    request(apis.rule.allOpenStatus, {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        status: value ? 1 : 0
+      }
+    }).then(function (res) {
+      if (!res) return;
+      if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
+        message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
+        setAllOpenRule(value);
+        _getList(ruleSearchName);
+      }
+    }).finally(function () {
+      setStatusLoading(false);
+    });
+  };
   /**
    * 规则列表， 搜索名称， 规则列表状态开启/关闭， 删除规则
    */
-  var _useState21 = useState([]),
-    _useState22 = _slicedToArray(_useState21, 2),
-    ruleList = _useState22[0],
-    setRuleList = _useState22[1];
-  var _useState23 = useState(''),
-    _useState24 = _slicedToArray(_useState23, 2),
-    ruleSearchName = _useState24[0],
-    setRuleSearchName = _useState24[1];
+  var _useState25 = useState([]),
+    _useState26 = _slicedToArray(_useState25, 2),
+    ruleList = _useState26[0],
+    setRuleList = _useState26[1];
+  var _useState27 = useState(''),
+    _useState28 = _slicedToArray(_useState27, 2),
+    ruleSearchName = _useState28[0],
+    setRuleSearchName = _useState28[1];
   var searchChange = function searchChange(e) {
     var _value = e.currentTarget.value;
     setRuleSearchName(_value);
+    _getList(_value);
   };
   var handleSearch = function handleSearch() {
     _getList(ruleSearchName);
   };
   var handlePage = function handlePage(pagination) {
     setTableParams(pagination);
-    _getList(ruleSearchName);
+    _getList(ruleSearchName, pagination);
   };
-  var _useState25 = useState({
+  var _useState29 = useState({
       current: 1,
       pageSize: 10,
       total: 0
     }),
-    _useState26 = _slicedToArray(_useState25, 2),
-    tableParams = _useState26[0],
-    setTableParams = _useState26[1];
+    _useState30 = _slicedToArray(_useState29, 2),
+    tableParams = _useState30[0],
+    setTableParams = _useState30[1];
   useEffect(function () {
     _getList();
   }, []);
   var _getList = function getList() {
     var searchName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    var pagination = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : tableParams;
     request(apis.rule.getRuleList, {
       method: 'post',
       data: {
         ruleName: searchName,
-        pageNo: tableParams.current,
-        pageSize: tableParams.pageSize,
+        pageNo: pagination.current,
+        pageSize: pagination.pageSize,
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (res) {
@@ -279,6 +318,7 @@ var ClearRule = function ClearRule() {
             total: res.data.total
           });
         });
+        setAllOpenRule(res.data.status == 1 ? true : false);
       } else {
         message.error('查询列表失败！');
       }
@@ -307,71 +347,68 @@ var ClearRule = function ClearRule() {
         message.success("\u5220\u9664\u89C4\u5219\u6210\u529F\uFF01");
         handleSearch();
       } else {
-        message.error('查询列表失败！');
+        message.error(res.msg);
       }
     });
   };
-  var _onChange = function _onChange(value, ruleRow) {
-    UseModal({
-      onOk: function onOk() {
-        return handleOpenRuleStatus(ruleRow);
-      },
-      okText: "".concat(ruleRow.status == 0 ? '仍然开启' : '仍然关闭'),
-      title: '警告',
-      content: "".concat(ruleRow.status == 0 ? '该规则与已开启规则可能产生冲突，请确认是否继续开启' : '该规则与开始运行现在关闭可能产生冲突，请确认是否关闭', " ")
-    });
-  };
-  var handleOpenRuleStatus = function handleOpenRuleStatus(ruleRow) {
-    request(apis.rule.openRuleStatus, {
+  var statusCheck = function statusCheck(ruleRow) {
+    // 可直接关闭
+    if (ruleRow.status == 1) {
+      handleOpenRuleStatus(ruleRow);
+      return;
+    }
+    request(apis.rule.checkStatus, {
       method: 'post',
       data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         ruleId: ruleRow.ruleId,
         status: ruleRow.status ? 0 : 1
       }
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        message.success("".concat(ruleRow.status == 0 ? '规则开启成功！' : '规则关闭成功'));
-        handleSearch();
+        if (res.data == 0) {
+          handleOpenRuleStatus(ruleRow);
+          return;
+        }
+        if (res.data == 3) {
+          UseModal({
+            onOk: function onOk() {
+              return handleOpenRuleStatus(ruleRow);
+            },
+            okText: "\u4ECD\u7136\u5F00\u542F",
+            title: '警告',
+            content: '该规则与已开启规则可能产生冲突，请确认是否继续开启'.concat(" ")
+          });
+          return;
+        }
+        if (res.data == 2 || res.data == 3) {
+          message.error(res.msg);
+          return;
+        }
       } else {
-        message.error('规则修改失败，请联系管理员');
+        message.error(res.msg);
       }
     });
   };
-  // 总状态
-  var antIcon = /*#__PURE__*/React.createElement(LoadingOutlined, {
-    style: {
-      fontSize: 24
-    },
-    spin: true,
-    onPointerEnterCapture: undefined,
-    onPointerLeaveCapture: undefined
-  });
-  var _useState27 = useState(false),
-    _useState28 = _slicedToArray(_useState27, 2),
-    allOpenRule = _useState28[0],
-    setAllOpenRule = _useState28[1];
-  var _useState29 = useState(false),
-    _useState30 = _slicedToArray(_useState29, 2),
-    statusLoading = _useState30[0],
-    setStatusLoading = _useState30[1];
-  var handleAllOpenStatus = function handleAllOpenStatus(value) {
-    setStatusLoading(true);
-    request(apis.rule.allOpenStatus, {
+  var _onChange = function _onChange(value, ruleRow) {
+    statusCheck(ruleRow);
+  };
+  var handleOpenRuleStatus = function handleOpenRuleStatus(ruleRow) {
+    request(apis.rule.openRuleStatus, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        status: value ? 1 : 0
+        ruleId: ruleRow.ruleId,
+        status: ruleRow.status ? 0 : 1
       }
     }).then(function (res) {
       if (!res) return;
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
-        message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
-        setAllOpenRule(value);
-        _getList(ruleSearchName);
+        message.success("".concat(ruleRow.status == 0 ? '规则开启成功！' : '规则关闭成功'));
+        handleSearch();
+      } else {
+        message.error(res.msg);
       }
-    }).finally(function () {
-      setStatusLoading(false);
     });
   };
   return /*#__PURE__*/React.createElement("div", {

package/es/modules/dataManage/collectionAttributeList.js

@@ -414,7 +414,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
           width: 100
         },
         // disabled={isDemo || record.isIdMappingProp || record.category === 'fixed'}
-        disabled: isDemo || !authority[1000004] || record.category === 'fixed' || record.owner == 'zg_abp',
+        disabled: isDemo || !authority[1000004] || !record.canUpdate || record.category === 'fixed' || record.owner == 'zg_abp',
         onChange: function onChange(e) {
           return attrChangeHandle(e, record, 'type');
         },
@@ -678,7 +678,7 @@ var CollectionAttributeList = function CollectionAttributeList(props) {
         style: {
           padding: 0
         },
-        disabled: source === 'event' ? record.owner == 'zg_abp' || !authority[1000004] : record.category == 'fixed' || isDemo || !authority[1000004],
+        disabled: source === 'event' ? record.owner == 'zg_abp' || !authority[1000004] || !record.canUpdate : record.category == 'fixed' || isDemo || !authority[1000004],
         onClick: function onClick() {
           if (isDemo || !authority[1000004]) {
             message.error('无删除权限');