@zgfe/modules-dm 1.0.57-zhongyuan.0 → 1.0.57-zhongyuan.11

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,7 +96,7 @@ declare let apis: {
         checkRule: string;
         getDetail: string;
         modifyRule: string;
-        checkStatis: string;
+        checkStatus: string;
         selectStatus: string;
         deleteRule: string;
         exportFile: string;

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,7 +160,7 @@ 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',

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

@@ -109,7 +109,7 @@ var AddRule = function AddRule(_ref) {
           // 刷新列表
           getList();
         } else {
-          message.error('修改规则失败！');
+          message.error(res.msg);
         }
       });
       return;
@@ -142,7 +142,7 @@ var AddRule = function AddRule(_ref) {
         // 刷新列表
         getList();
       } else {
-        message.error('添加规则失败！');
+        message.error(res.msg);
       }
     });
   };
@@ -265,15 +265,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 +307,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 +349,7 @@ var AddRule = function AddRule(_ref) {
     initialValues: {
       name: '',
       desctiption: '',
-      ruleobj: []
+      ruleobj: {}
     },
     onFinish: onFinish,
     labelAlign: "left"
@@ -386,7 +376,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 +385,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 +405,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);
@@ -503,7 +493,7 @@ 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);
       }
     }
   }, []);
@@ -548,8 +538,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 +572,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) {

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

@@ -213,6 +213,8 @@ var ClearRule = function ClearRule() {
     setOpenImportModal(false);
     setOpenImportModalResult(false);
     setErrorRule(undefined);
+    // 刷新列表
+    _getList(ruleSearchName);
   };
   // 导出规则
   var handleDownLoadRuleFile = function handleDownLoadRuleFile() {
@@ -239,6 +241,7 @@ var ClearRule = function ClearRule() {
   var searchChange = function searchChange(e) {
     var _value = e.currentTarget.value;
     setRuleSearchName(_value);
+    _getList(_value);
   };
   var handleSearch = function handleSearch() {
     _getList(ruleSearchName);
@@ -310,16 +313,49 @@ var ClearRule = function ClearRule() {
       }
     });
   };
-  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 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') {
+        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('查询列表失败！');
+      }
     });
   };
+  var _onChange = function _onChange(value, ruleRow) {
+    statusCheck(ruleRow);
+  };
   var handleOpenRuleStatus = function handleOpenRuleStatus(ruleRow) {
     request(apis.rule.openRuleStatus, {
       method: 'post',

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

@@ -82,7 +82,7 @@ var panelList = function panelList(props) {
     }
   }, {
     title: '看板链接',
-    dataIndex: 'id',
+    dataIndex: 'panelId',
     width: 150,
     render: function render(text) {
       return /*#__PURE__*/React.createElement(Button, {

package/es/modules/{formulate-rule → formulateRule}/addFormulate.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 interface Result {
     appId: number;
     isDelete: number;

package/es/modules/{formulate-rule → formulateRule}/addFormulate.js

@@ -12,7 +12,7 @@ import { Drawer, Input, Button, Space, Form, Table, Select, message } from 'antd
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import React, { useState, useEffect, useContext } from 'react';
 import { BizGlobalDataContext } from '@zgfe/business-lib';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 import AddRule from './addRule';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
@@ -199,13 +199,18 @@ var AddFormulate = function AddFormulate(_ref) {
   // 回显
   useEffect(function () {
     if (detailData) {
+      var _detailData$rinseObje2, _detailData$rinseShif;
       ruleForm.setFieldsValue({
         name: detailData.ruleName,
-        description: detailData.ruleDescription,
-        target: detailData.rinseObjects[0],
-        ruleArr: detailData.rinseShiftRuleDetails
+        description: detailData === null || detailData === void 0 ? void 0 : detailData.ruleDescription,
+        target: ruleList.find(function (o) {
+          var _detailData$rinseObje;
+          return (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0]) == o.ruleId;
+        }) ? detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje2 = detailData.rinseObjects) === null || _detailData$rinseObje2 === void 0 ? void 0 : _detailData$rinseObje2[0] : undefined,
+        ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
       });
-      var arr = detailData.rinseShiftRuleDetails.map(function (o) {
+      var arr = [];
+      arr = (detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails) && (detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseShif = detailData.rinseShiftRuleDetails) === null || _detailData$rinseShif === void 0 ? void 0 : _detailData$rinseShif.map(function (o) {
         return {
           currentType: o.ruleType,
           currentTypeName: typeArr.filter(function (j) {
@@ -215,7 +220,7 @@ var AddFormulate = function AddFormulate(_ref) {
           targetValue: o.targetValue,
           key: o.id
         };
-      });
+      }));
       setDataSoure(arr);
     }
   }, []);

package/es/modules/{formulate-rule → formulateRule}/addRule.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 interface TypeRule {
     key: string;
     currentType: number;

package/es/modules/{formulate-rule → formulateRule}/addRule.js

@@ -17,7 +17,7 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { Drawer, Input, Button, Space, Form, Table, Select } from 'antd';
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import React, { useEffect, useState } from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 import { typeArr, dateArr, tianchongArr, shuzhiArr } from './data';
 var AddRule = function AddRule(_ref) {
   var addruleShow = _ref.addruleShow,

package/es/modules/{formulate-rule → formulateRule}/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 declare const FormulateRule: React.FC;
 export default FormulateRule;

package/es/modules/{formulate-rule → formulateRule}/index.js

@@ -18,7 +18,7 @@ import UseModal from '../CutsModal';
 import AddFormulate from './addFormulate';
 import request from '../../utils/ajax';
 import apis from '../../constants/api';
-import '../clear-rule/css/index.less';
+import '../clearRule/css/index.less';
 import moment from 'moment';
 var Text = Typography.Text;
 var RangePicker = DatePicker.RangePicker;
@@ -96,7 +96,7 @@ var FormulateRule = function FormulateRule() {
     openAddDraw = _useState2[0],
     setOpenAddDraw = _useState2[1];
   var handleOpenStatus = function handleOpenStatus(ruleObj) {
-    request(apis.clearRule.checkStatis, {
+    request(apis.clearRule.checkStatus, {
       method: 'post',
       data: {
         ruleId: ruleObj.ruleId,
@@ -109,8 +109,7 @@ var FormulateRule = function FormulateRule() {
         if (res.data.data == 1) {
           UseModal({
             onOk: function onOk() {
-              setDetailData(ruleObj);
-              setOpenAddDraw(true);
+              getDetail(ruleObj.ruleId);
             },
             okText: '去修改',
             title: '自定义校验规则已删除',
@@ -153,6 +152,8 @@ var FormulateRule = function FormulateRule() {
           return;
         }
         endOpen(ruleObj);
+      } else {
+        message.error(res.msg);
       }
     });
   };
@@ -168,6 +169,8 @@ var FormulateRule = function FormulateRule() {
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         message.success("".concat(ruleObj.status ? '关闭' : '开启', "\u6210\u529F\uFF01"));
         getList(ruleSearchName);
+      } else {
+        message.error(res.msg);
       }
     });
   };
@@ -182,14 +185,18 @@ var FormulateRule = function FormulateRule() {
       if ((res === null || res === void 0 ? void 0 : res.code) == '100000') {
         if (res.data == 1) {
           UseModal({
-            onOk: function onOk() {},
-            okText: '确定',
+            onOk: function onOk() {
+              getDetail(ruleId);
+            },
+            okText: '去修改',
             title: '校验对象已被删除',
             content: "\u6821\u9A8C\u5BF9\u8C61\u5DF2\u88AB\u5220\u9664\uFF0C\u5C06\u4E0D\u4F1A\u8FDB\u884C\u4F7F\u7528\uFF0C\u8BF7\u8FDB\u884C\u4FEE\u6539"
           });
           return;
         }
         getDetail(ruleId);
+      } else {
+        message.error(res.msg);
       }
     });
   };
@@ -325,6 +332,8 @@ var FormulateRule = function FormulateRule() {
         message.success("".concat(value ? '开启' : '关闭', "\u6210\u529F\uFF01"));
         setAllOpenRule(value);
         getList(ruleSearchName);
+      } else {
+        message.error(res.msg);
       }
     }).finally(function () {
       setStatusLoading(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.0",
+  "version": "1.0.57-zhongyuan.11",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -57,7 +57,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "4cd164cffdc1b9cf867e4dba929d3d8433bd16c2",
+  "gitHead": "89a73c012b336ac25db06ea6b16ebd5460bad587",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }