Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

package.json

@@ -131,7 +131,7 @@
         "jszip": "^3.10.1",
         "lodash": "4.17.11",
         "minimist": "1.2.0",
-        "panda-xform": "6.11.32",
+        "panda-xform": "6.11.38",
         "parseForm": "^2.3.8",
         "prop-types": "15.7.2",
         "qrcode.react": "^3.1.0",

src/pages/bsmanager/workOrder/autoCase/components/CaseModify/index.js

@@ -962,15 +962,16 @@ const CaseModify = props => {
   const handleSelectRuleType = (e, type) => {
     const { checked } = e.target;
     generatePostData({ triggerMethod: type });
+    const cInfo = {
+      ...configInfo,
+      flowId: null,
+      activityId: null,
+    }
     if (type === '定时触发') {
       generatePostData({});
-      if (nodeNams.length > 0) {
-        setConfigInfo({ ...configInfo, triggerType: type, activityId: nodeNams[0].value });
-        return;
-      }
-      setConfigInfo({ ...configInfo, triggerType: type });
+      setConfigInfo({ ...cInfo, triggerType: type });
     } else {
-      setConfigInfo({ ...configInfo, triggerType: type });
+      setConfigInfo({ ...cInfo, triggerType: type });
     }
   };
 

src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/NodeModal.jsx

@@ -74,7 +74,9 @@ const NodeModal = props => {
       confirm({
         title: '提示',
         content: <>首节点未配置<span style={{ color: 'red' }}>处理站点</span>，确定继续吗？</>,
-        onOk: onFinish
+        onOk: onFinish,
+        okText: '确定',
+        cancelText: '取消',
       })
     } else {
       onFinish();
@@ -331,7 +333,7 @@ const NodeModal = props => {
           </div>
         </div>
         <div className={styles.footer}>
-          <Button type="primary" onClick={onOk}>
+          <Button type="primary" onClick={onFinish}>
             确定
           </Button>
         </div>