@zgfe/modules-dm 1.0.57-zhongyuan.7 → 1.0.57-zhongyuan.9

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/modules/clearRule/addRule.js

@@ -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;
@@ -499,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);
       }
     }
   }, []);
@@ -544,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) {
@@ -575,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/clearRule/css/index.less

@@ -1,270 +1,270 @@
-.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: 80px 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;
+    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: 80px 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/clearRule/importMetaDialog/styles/index.less

@@ -1,91 +1,91 @@
-@import '~@zgfe/business-lib/es/assets/styles/inner.less';
-
-.import-meta-modal {
-  &-icon-file {
-    color: @primary-color;
-    font-size: 48px !important;
-  }
-  &-icon-export {
-    margin-right: @margin-xss;
-  }
-  &-export-btn {
-    display: block;
-    width: fit-content;
-    // margin-top: @margin-md;
-  }
-  .ant-upload.ant-upload-drag {
-    background: #fafafb;
-    /* io/中性/N2-置灰信息 */
-    border: 1px dashed #ccd0d4;
-  }
-  .ant-upload.ant-upload-drag .ant-upload {
-    padding: 40px 0;
-  }
-  &-export-container {
-    border-radius: 4px;
-    &-h1 {
-      margin-top: -8px;
-      margin-bottom: 4px;
-    }
-    &-h2 {
-      color: @text-color-secondary;
-      font-size: 12px;
-    }
-  }
-
-  &-show-container {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 24px;
-    background: #fafafb;
-    /* io/中性/N1-按钮边框 线色 */
-    border: 1px solid #e6e7ea;
-    border-radius: 4px;
-    &-content {
-      display: flex;
-      align-items: center;
-      &-icon {
-        margin-right: 12px;
-        color: @primary-color;
-        font-size: 40px !important;
-      }
-      &-file {
-        &-title {
-          font-size: 16px;
-        }
-        &-size {
-          color: @text-color-secondary;
-          font-size: 12px;
-        }
-      }
-    }
-  }
-
-  &-spin {
-    background: #fafafb;
-    border: 1px solid #e6e7ea;
-    border-radius: 4px;
-    &-icon.anticon {
-      color: @primary-color;
-      font-size: 24px;
-    }
-    .ant-spin-text {
-      margin-top: @margin-xs;
-    }
-  }
-
-  &-upload-txt {
-    font-size: 16px;
-  }
-
-  .ant-modal-body {
-    padding-top: 8px !important;
-  }
-  &-footer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-  }
-}
+@import '~@zgfe/business-lib/es/assets/styles/inner.less';
+
+.import-meta-modal {
+  &-icon-file {
+    color: @primary-color;
+    font-size: 48px !important;
+  }
+  &-icon-export {
+    margin-right: @margin-xss;
+  }
+  &-export-btn {
+    display: block;
+    width: fit-content;
+    // margin-top: @margin-md;
+  }
+  .ant-upload.ant-upload-drag {
+    background: #fafafb;
+    /* io/中性/N2-置灰信息 */
+    border: 1px dashed #ccd0d4;
+  }
+  .ant-upload.ant-upload-drag .ant-upload {
+    padding: 40px 0;
+  }
+  &-export-container {
+    border-radius: 4px;
+    &-h1 {
+      margin-top: -8px;
+      margin-bottom: 4px;
+    }
+    &-h2 {
+      color: @text-color-secondary;
+      font-size: 12px;
+    }
+  }
+
+  &-show-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24px;
+    background: #fafafb;
+    /* io/中性/N1-按钮边框 线色 */
+    border: 1px solid #e6e7ea;
+    border-radius: 4px;
+    &-content {
+      display: flex;
+      align-items: center;
+      &-icon {
+        margin-right: 12px;
+        color: @primary-color;
+        font-size: 40px !important;
+      }
+      &-file {
+        &-title {
+          font-size: 16px;
+        }
+        &-size {
+          color: @text-color-secondary;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+
+  &-spin {
+    background: #fafafb;
+    border: 1px solid #e6e7ea;
+    border-radius: 4px;
+    &-icon.anticon {
+      color: @primary-color;
+      font-size: 24px;
+    }
+    .ant-spin-text {
+      margin-top: @margin-xs;
+    }
+  }
+
+  &-upload-txt {
+    font-size: 16px;
+  }
+
+  .ant-modal-body {
+    padding-top: 8px !important;
+  }
+  &-footer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+  }
+}

package/es/modules/clearRule/index.js

@@ -313,16 +313,40 @@ 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.data == 0) {
+          UseModal({
+            onOk: function onOk() {
+              return handleOpenRuleStatus(ruleRow);
+            },
+            okText: "\u4ECD\u7136\u5F00\u542F",
+            title: '警告',
+            content: '该规则与已开启规则可能产生冲突，请确认是否继续开启'.concat(" ")
+          });
+        }
+      } 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/formulateRule/addFormulate.js

@@ -199,13 +199,15 @@ var AddFormulate = function AddFormulate(_ref) {
   // 回显
   useEffect(function () {
     if (detailData) {
+      var _detailData$rinseObje, _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: detailData === null || detailData === void 0 ? void 0 : (_detailData$rinseObje = detailData.rinseObjects) === null || _detailData$rinseObje === void 0 ? void 0 : _detailData$rinseObje[0],
+        ruleArr: detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails
       });
-      var arr = detailData.rinseShiftRuleDetails.map(function (o) {
+      var arr = [];
+      arr = (_detailData$rinseShif = detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails) !== null && _detailData$rinseShif !== void 0 ? _detailData$rinseShif : detailData === null || detailData === void 0 ? void 0 : detailData.rinseShiftRuleDetails.map(function (o) {
         return {
           currentType: o.ruleType,
           currentTypeName: typeArr.filter(function (j) {

package/es/modules/formulateRule/index.js

@@ -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,
@@ -182,8 +182,10 @@ 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"
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.57-zhongyuan.7",
+  "version": "1.0.57-zhongyuan.9",
   "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": "ff2b189d1b171c2fdea85754a66e9370090120e0",
+  "gitHead": "6aa135c32ec66af4faeba83f19a97df26b576817",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }