uepay-mesh 4.0.21 → 4.0.22-beta-2

package/bpm/list/waitTable.js

@@ -9,11 +9,12 @@ var _react = _interopRequireWildcard(require("react"));
 var _uepayOps = require("uepay-ops2");
 var _optionsFormQueryAbleTable = _interopRequireDefault(require("../../mesh/table/optionsFormQueryAbleTable"));
 var _router = require("next/router");
+var _serverEnums = require("../config/serverEnums");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const CustomOptions = [{
-  type: 'Approved',
+  type: _serverEnums.BpmStepOperation.Waiting,
   icon: /*#__PURE__*/_react.default.createElement("span", null, "\u5BA1\u6279"),
   tip: '审批'
 }];
@@ -26,8 +27,12 @@ const CustomOptions = [{
 const WaitTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   const router = (0, _router.useRouter)();
   function handleAction(type, pkValue, record, tex) {
-    if ("Approved" === type) {
-      router.push("/bpm/form?insId=".concat(record['bpm_ins_id']));
+    if (_serverEnums.BpmStepOperation.Waiting === type) {
+      const loop = {
+        insId: record['instance_fk'],
+        operation: _serverEnums.BpmStepOperation.Waiting
+      };
+      router.push("/bpm/form?content=".concat(btoa(encodeURIComponent(JSON.stringify(loop)))));
     }
   }
   return /*#__PURE__*/_react.default.createElement(_optionsFormQueryAbleTable.default, {
@@ -36,7 +41,7 @@ const WaitTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     deliverAuth: 0,
     actionOptions: CustomOptions,
     type: "auto",
-    collectId: 3514181970775040,
+    collectId: "14377468589515264",
     host: (0, _uepayOps.getHost)()
   });
 });

package/bpm/list.js

@@ -72,90 +72,60 @@ class BpmList extends _react.default.Component {
     (0, _react.createRef)(),
     /*#__PURE__*/
     //1
-    (0, _react.createRef)(),
-    /*#__PURE__*/
-    //2
-    (0, _react.createRef)(),
-    /*#__PURE__*/
-    //3
-    (0, _react.createRef)() //4
+    (0, _react.createRef)() //2
+    // createRef(), //3
+    // createRef() //4
     ]);
     _defineProperty(this, "state", {
       count: null
     });
     _defineProperty(this, "id", null);
   }
-  count() {
-    const _this = this;
-    (0, _request.getBpmCount)().then(res => {
-      if (res.code) {
-        _this.setState({
-          count: res.data
-        });
-      } else {
-        _antd.notification.error({
-          message: res && res.msg || '獲取流程信息錯誤，請稍後再試!'
-        });
-      }
-    });
-  }
+  // count() {
+  //     const _this = this;
+  //     getBpmCount().then(res => {
+  //         if (res.code) {
+  //             _this.setState({count: res.data});
+  //         } else {
+  //             notification.error({message: res && res.msg || '獲取流程信息錯誤，請稍後再試!'});
+  //         }
+  //     })
+  // }
+
   componentDidMount() {
     const _this = this;
     function flush() {
       for (let dom of _this.domList) {
         dom && dom.current && dom.current.flush();
       }
-      _this.count();
+      // _this.count();
     }
     this.id = addFoo(flush);
-    this.count();
+    // this.count();
   }
   componentWillUnmount() {
     removeFoo(this.id);
   }
   render() {
-    const {
-        count
-      } = this.state,
-      _this = this;
-    return count ? /*#__PURE__*/_react.default.createElement(_antd.Tabs, {
+    //const {count} = this.state, _this = this;
+    return /*#__PURE__*/_react.default.createElement(_antd.Tabs, {
       defaultActiveKey: "todoList"
     }, /*#__PURE__*/_react.default.createElement(TabPane, {
-      tab: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FileSyncOutlined.default, null), "\u5F85\u8FA6", /*#__PURE__*/_react.default.createElement(_numTip.default, {
-        num: count.wait
-      })),
+      tab: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FileSyncOutlined.default, null), "\u5F85\u8FA6"),
       key: "todoList"
     }, /*#__PURE__*/_react.default.createElement(_waitTable.default, {
       ref: this.domList[0]
     })), /*#__PURE__*/_react.default.createElement(TabPane, {
-      tab: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FileDoneOutlined.default, null), "\u5DF2\u8FA6", /*#__PURE__*/_react.default.createElement(_numTip.default, {
-        num: count.complete
-      })),
+      tab: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FileDoneOutlined.default, null), "\u5DF2\u8FA6"),
       key: "syncList"
     }, /*#__PURE__*/_react.default.createElement(_completeTable.default, {
       ref: this.domList[1]
     })), /*#__PURE__*/_react.default.createElement(TabPane, {
-      tab: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FileAddOutlined.default, null), "\u767C\u8D77", /*#__PURE__*/_react.default.createElement(_numTip.default, {
-        num: count.applicant
-      })),
+      tab: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FileAddOutlined.default, null), "\u767C\u8D77"),
       key: "applicantList"
     }, /*#__PURE__*/_react.default.createElement(_applicantTable.default, {
       ref: this.domList[2]
-    })), /*#__PURE__*/_react.default.createElement(TabPane, {
-      tab: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CopyOutlined.default, null), "\u8349\u7A3F", /*#__PURE__*/_react.default.createElement(_numTip.default, {
-        num: count.draft
-      })),
-      key: "cdList"
-    }, /*#__PURE__*/_react.default.createElement(_draftTable.default, {
-      ref: this.domList[3]
-    })), /*#__PURE__*/_react.default.createElement(TabPane, {
-      tab: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CopyOutlined.default, null), "\u6284\u9001", /*#__PURE__*/_react.default.createElement(_numTip.default, {
-        num: count.notice
-      })),
-      key: "ccList"
-    }, /*#__PURE__*/_react.default.createElement(_noticeTable.default, {
-      ref: this.domList[4]
-    }))) : /*#__PURE__*/_react.default.createElement(_loading.default, null);
+    })));
   }
 }
 BpmList.tabName = '流程列表';

package/index.d.ts

@@ -5,6 +5,6 @@ export {default as PopSelectQueryAbleTable} from './mesh/table/popSelectQueryAbl
 export {default as QueryAbleTable} from './mesh/table/queryAbleTable'
 export {default as EditCompareForm} from './mesh/form/editCompareForm'
 export {default as BpmList} from './bpm/list'
-export {default as BpmForm} from './bpm/form'
+export {default as BpmForm} from './bpm/bpmForm'
 export {default as CollectEntry} from './mesh/pages/collectEntry'
 export {default as Page} from './mesh/pages/page'

package/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "BpmForm", {
   enumerable: true,
   get: function get() {
-    return _form.default;
+    return _bpmForm.default;
   }
 });
 Object.defineProperty(exports, "BpmList", {
@@ -69,8 +69,8 @@ var _selectQueryAbleTable = _interopRequireDefault(require("./mesh/table/selectQ
 var _popSelectQueryAbleTable = _interopRequireDefault(require("./mesh/table/popSelectQueryAbleTable"));
 var _queryAbleTable = _interopRequireDefault(require("./mesh/table/queryAbleTable"));
 var _editCompareForm = _interopRequireDefault(require("./mesh/form/editCompareForm"));
-var _form = _interopRequireDefault(require("./bpm/form"));
 var _list = _interopRequireDefault(require("./bpm/list"));
+var _bpmForm = _interopRequireDefault(require("./bpm/bpmForm"));
 var _collectEntry = _interopRequireDefault(require("./mesh/pages/collectEntry"));
 var _page = _interopRequireDefault(require("./mesh/pages/page"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/mesh/cell/compare/comparePopoverView.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _antd = require("antd");
+var _FullscreenOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/FullscreenOutlined"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const IconStyle = {
+  'font-size': '.6rem',
+  margin: '0 0 .1rem .2rem',
+  cursor: 'pointer'
+};
+const DividerStyle = {
+  'font-size': '.8rem',
+  color: '#999'
+};
+function ComparePopoverView(_ref) {
+  let {
+    originComp,
+    modifyComp
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement(_antd.Popover, {
+    placement: "topLeft",
+    content: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+      orientation: "left"
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      style: DividerStyle
+    }, "\u539F\u503C")), originComp, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+      orientation: "left"
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      style: DividerStyle
+    }, "\u65B0\u503C")), modifyComp),
+    trigger: "click"
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    style: IconStyle
+  }, /*#__PURE__*/_react.default.createElement(_FullscreenOutlined.default, null)));
+}
+ComparePopoverView.propTypes = {
+  originComp: _propTypes.default.object,
+  modifyComp: _propTypes.default.object
+};
+var _default = exports.default = ComparePopoverView;

package/mesh/cell/compare/input/standardCompare.js

@@ -4,11 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/es6.symbol.js");
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _antd = require("antd");
 var _standardView = _interopRequireDefault(require("../../view/input/standardView"));
+var _comparePopoverView = _interopRequireDefault(require("../comparePopoverView"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /**
  * 标准选择器的演示框
  * @param props.value {String|Number} 默認值
@@ -24,17 +31,31 @@ const StandardCompare = props => {
     value,
     modify
   } = props;
-  return modify ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_standardView.default, {
+  const params = _objectSpread({}, props);
+  delete params.value;
+  delete params.modify;
+  const originComp = /*#__PURE__*/_react.default.createElement(_standardView.default, _extends({
     style: props.style,
-    value: value,
+    value: value
+  }, params, {
     className: "uepay-cell-standard-compare uepay-cell-standard-compare-origin"
-  }), "->", /*#__PURE__*/_react.default.createElement(_standardView.default, {
+  }));
+  const modifyComp = modify ? /*#__PURE__*/_react.default.createElement(_standardView.default, _extends({
     style: props.modifyStyle,
-    value: modify,
+    value: modify
+  }, params, {
     className: "uepay-cell-standard-compare uepay-cell-standard-compare-modify"
-  })) : /*#__PURE__*/_react.default.createElement(_standardView.default, {
+  })) : null;
+  return modify ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_comparePopoverView.default, {
+    originComp: originComp,
+    modifyComp: modifyComp
+  }), originComp, /*#__PURE__*/_react.default.createElement("span", {
+    style: {
+      color: 'red'
+    }
+  }, '->'), modifyComp) : /*#__PURE__*/_react.default.createElement(_standardView.default, _extends({
     value: value
-  });
+  }, params));
 };
 StandardCompare.propTypes = {
   style: _propTypes.default.object,

package/mesh/cell/compare/picker/imageUpdatePickerCompare.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _imageUpdatePickerView = _interopRequireDefault(require("../../view/picker/imageUpdatePickerView"));
-var _imageView = _interopRequireDefault(require("../../image/imageView"));
+var _comparePopoverView = _interopRequireDefault(require("../comparePopoverView"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 时间戳选择器显示框
@@ -21,15 +21,24 @@ const ImageUpdatePickerCompare = props => {
     value,
     modify
   } = props;
-  return modify ? /*#__PURE__*/_react.default.createElement("span", {
-    className: "uepay-cell-image-picker-compare"
-  }, /*#__PURE__*/_react.default.createElement(_imageUpdatePickerView.default, {
+  const originComp = /*#__PURE__*/_react.default.createElement(_imageUpdatePickerView.default, {
     className: "uepay-cell-image-picker compare-cell",
     value: value
-  }), /*#__PURE__*/_react.default.createElement("span", null, "->"), /*#__PURE__*/_react.default.createElement(_imageUpdatePickerView.default, {
+  });
+  const modifyComp = modify ? /*#__PURE__*/_react.default.createElement(_imageUpdatePickerView.default, {
     className: "uepay-cell-image-picker compare-cell",
     value: modify
-  })) : /*#__PURE__*/_react.default.createElement(_imageUpdatePickerView.default, {
+  }) : null;
+  return modify ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_comparePopoverView.default, {
+    originComp: originComp,
+    modifyComp: modifyComp
+  }), /*#__PURE__*/_react.default.createElement("span", {
+    className: "uepay-cell-image-picker-compare"
+  }, originComp, /*#__PURE__*/_react.default.createElement("span", {
+    style: {
+      color: 'red'
+    }
+  }, '->'), modifyComp)) : /*#__PURE__*/_react.default.createElement(_imageUpdatePickerView.default, {
     value: value
   });
 };

package/mesh/cell/compare/picker/timestampDatePickerCompare.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _timestampDatePickerView = _interopRequireDefault(require("../../view/picker/timestampDatePickerView"));
+var _comparePopoverView = _interopRequireDefault(require("../comparePopoverView"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const DateFormat = 'YYYY-MM-DD',
   TimeFormat = "".concat(DateFormat, " HH:mm:ss");
@@ -31,19 +32,28 @@ const TimestampDatePickerCompare = props => {
     showTime,
     stringTime
   } = props;
-  return modify ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_timestampDatePickerView.default, {
+  const originComp = /*#__PURE__*/_react.default.createElement(_timestampDatePickerView.default, {
     style: props.style,
     value: value,
     showTime: showTime,
     stringTime: stringTime,
     className: "uepay-cell-standard-compare uepay-cell-standard-compare-origin"
-  }), "->", /*#__PURE__*/_react.default.createElement(_timestampDatePickerView.default, {
+  });
+  const modifyComp = modify ? /*#__PURE__*/_react.default.createElement(_timestampDatePickerView.default, {
     style: props.modifyStyle,
     value: modify,
     showTime: showTime,
     stringTime: stringTime,
     className: "uepay-cell-standard-compare uepay-cell-standard-compare-modify"
-  })) : /*#__PURE__*/_react.default.createElement(_timestampDatePickerView.default, {
+  }) : null;
+  return modify ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_comparePopoverView.default, {
+    originComp: originComp,
+    modifyComp: modifyComp
+  }), originComp, /*#__PURE__*/_react.default.createElement("span", {
+    style: {
+      color: 'red'
+    }
+  }, '->'), modifyComp) : /*#__PURE__*/_react.default.createElement(_timestampDatePickerView.default, {
     value: value,
     showTime: showTime,
     stringTime: stringTime

package/mesh/cell/compare/select/standardSelectCompare.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _standardSelectView = _interopRequireDefault(require("../../view/select/standardSelectView"));
+var _comparePopoverView = _interopRequireDefault(require("../comparePopoverView"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * 标准选择器的演示框
@@ -24,17 +25,26 @@ const StandardSelectCompare = props => {
     modify,
     options
   } = props;
-  return typeof modify !== "undefined" ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_standardSelectView.default, {
+  const originComp = /*#__PURE__*/_react.default.createElement(_standardSelectView.default, {
     style: props.style,
     value: value,
     options: options,
     className: "uepay-cell-standard-compare uepay-cell-standard-compare-origin"
-  }), "->", /*#__PURE__*/_react.default.createElement(_standardSelectView.default, {
+  });
+  const modifyComp = typeof modify !== "undefined" ? /*#__PURE__*/_react.default.createElement(_standardSelectView.default, {
     style: props.modifyStyle,
     value: modify,
     options: options,
     className: "uepay-cell-standard-compare uepay-cell-standard-compare-modify"
-  })) : /*#__PURE__*/_react.default.createElement(_standardSelectView.default, {
+  }) : null;
+  return typeof modify !== "undefined" ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_comparePopoverView.default, {
+    originComp: originComp,
+    modifyComp: modifyComp
+  }), originComp, /*#__PURE__*/_react.default.createElement("span", {
+    style: {
+      color: 'red'
+    }
+  }, '->'), modifyComp) : /*#__PURE__*/_react.default.createElement(_standardSelectView.default, {
     value: value,
     options: options
   });

package/mesh/cell/compare/switch/standardSwitchCompare.js

@@ -11,14 +11,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const StandardSwitchCompare = props => {
   const {
     value,
-    modify
+    modify,
+    scale
   } = props;
   return typeof modify !== "undefined" ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_standardSwitchView.default, {
-    value: value
-  }), "->", /*#__PURE__*/_react.default.createElement(_standardSwitchView.default, {
-    value: modify
+    value: value,
+    scale: scale
+  }), /*#__PURE__*/_react.default.createElement("span", {
+    style: {
+      color: 'red'
+    }
+  }, '->'), /*#__PURE__*/_react.default.createElement(_standardSwitchView.default, {
+    value: modify,
+    scale: scale
   })) : /*#__PURE__*/_react.default.createElement(_standardSwitchView.default, {
-    value: value
+    value: value,
+    scale: scale
   });
 };
 StandardSwitchCompare.propTypes = {

package/mesh/crud/remove.js

@@ -121,7 +121,7 @@ const removeDataList = _ref2 => {
       _antd.notification.error({
         message: res && res.msg || '網絡故障，請稍後再試!'
       });
-      handle('ERROR', res.msg | '網絡故障，請稍後再試!');
+      handle('ERROR', res && res.msg | '網絡故障，請稍後再試!');
     }
   });
 };

package/mesh/form/editAbleForm.js

@@ -147,8 +147,8 @@ class EditAbleForm extends _react.default.Component {
               break;
             case 1000:
             case 2000:
-              const bpm = (0, _builder.build)(res);
-              (0, _tip.resultTip)(bpm);
+              //const bpm = build(res);
+              (0, _tip.resultTip)(res.msg);
               _this.dom.endSubmit();
               _this.props.onClose();
               break;

package/mesh/form/loading/parentPosLoading.js

@@ -14,6 +14,6 @@ const ParentPosLoading = props => /*#__PURE__*/_react.default.createElement("div
 }), /*#__PURE__*/_react.default.createElement("div", {
   className: "info"
 }, /*#__PURE__*/_react.default.createElement(_antd.Spin, {
-  tip: "\u63D0\u4EA4\u4E2D"
+  tip: "\u8655\u7406\u4E2D"
 })));
 var _default = exports.default = ParentPosLoading;

package/mesh/form/options/bpm/collectStateResponse.js

@@ -11,38 +11,24 @@ var _confirmBtn = _interopRequireDefault(require("../confirmBtn"));
 var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function response(bpm, handleClick) {
+function response(res, handleClick) {
   const {
       state,
       msg
-    } = bpm,
+    } = res,
     tip = _tip.Tip[state];
   switch (state) {
-    case _serverEnums.BpmAccessState.Related:
-      (0, _tip.relatedTip)(bpm);
-      return /*#__PURE__*/_react.default.createElement(_BpmOptBtn.default, {
-        bpm: bpm,
-        isDraft: true,
-        tip: tip,
-        onClick: handleClick
-      });
-    case _serverEnums.BpmAccessState.Draft:
-      (0, _tip.draftTip)(bpm);
-      return /*#__PURE__*/_react.default.createElement(_BpmOptBtn.default, {
-        bpm: bpm,
-        isDraft: true,
-        tip: tip,
-        onClick: handleClick
-      });
-    case _serverEnums.BpmAccessState.Access:
-      (0, _tip.accessTip)(bpm);
-      return /*#__PURE__*/_react.default.createElement(_BpmOptBtn.default, {
-        bpm: bpm,
-        tip: tip,
-        onClick: handleClick
-      });
+    // case BpmAccessState.Related:
+    //     relatedTip(bpm);
+    //     return (<BpmOptBtn bpm={bpm} isDraft tip={tip} onClick={handleClick}/>);
+    // case BpmAccessState.Draft:
+    //     draftTip(bpm);
+    //     return(<BpmOptBtn bpm={bpm} isDraft tip={tip} onClick={handleClick}/>);
+    // case BpmAccessState.Access:
+    //     accessTip(bpm)
+    //     return(<BpmOptBtn bpm={bpm} tip={tip} onClick={handleClick}/>);
     case _serverEnums.BpmAccessState.Execute:
-      (0, _tip.executeTip)(bpm);
+      (0, _tip.executeTip)(msg);
       return null;
     case _serverEnums.BpmAccessState.None:
       return /*#__PURE__*/_react.default.createElement(_confirmBtn.default, {

package/mesh/form/options/btn/tip.js

@@ -83,7 +83,7 @@ function accessTip(bpm) {
           bpm: bpm
         })
       }, /*#__PURE__*/_react.default.createElement("a", null, "\u67E5\u770B\u6D41\u7A0B"))),
-      duration: 30
+      duration: 15
     });
   } else {
     bpmTypeError();
@@ -94,52 +94,50 @@ function accessTip(bpm) {
  *
  * @param bpm {BpmInstance}
  */
-function executeTip(bpm) {
-  if (bpm.isIns()) {
-    _antd.notification.warn({
-      message: /*#__PURE__*/_react.default.createElement("p", null, "\u60A8\u5DF2\u63D0\u4EA4\u4FEE\u6539\u7533\u8ACB\uFF0C\u8ACB\u5148\u64A4\u56DE->\u7D42\u6B62\u5DF2\u63D0\u4EA4\u6D41\u7A0B\u518D\u9032\u884C\u4FEE\u6539!", /*#__PURE__*/_react.default.createElement(_bpmFormLink.default, {
-        bpm: bpm
-      })),
-      duration: 30
-    });
-  } else {
-    bpmTypeError();
-  }
+function executeTip(msg) {
+  _antd.notification.warn({
+    message: /*#__PURE__*/_react.default.createElement("p", null, msg),
+    duration: 15
+  });
 }
 
 /**
  *
  * @param bpm {BpmInstance}
  */
-function resultTip(bpm) {
+function resultTip(msg) {
   let tip = null;
-  if (bpm.isIns()) {
-    const {
-      status
-    } = bpm.getIns();
-    let isSuc = false;
-    switch (status) {
-      case _serverEnums.InsStatus.REVOKE:
-      case _serverEnums.InsStatus.DRAFT:
-        tip = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "\u4FEE\u6539\u5DF2\u521B\u5EFA\u6D41\u7A0B\u672A\u63D0\u4EA4\uFF0C\u8ACB\u81F3\uFF1A");
-        isSuc = true;
-        break;
-      case _serverEnums.InsStatus.EXECUTE:
-        tip = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "\u7533\u8ACB\u4FEE\u6539\u6578\u64DA\u7684\u7533\u8ACB\u5DF2\u63D0\u4EA4\uFF0C\u8ACB\u7B49\u5F85", /*#__PURE__*/_react.default.createElement("strong", null, bpm.getCurExeUsrs().map(usr => usr.name).join()), "\u5BE9\u6279");
-        isSuc = true;
-        break;
-      default:
-        isSuc = false;
-    }
-    isSuc ? _antd.notification.success({
-      message: /*#__PURE__*/_react.default.createElement("p", null, tip, /*#__PURE__*/_react.default.createElement(_bpmFormLink.default, {
-        bpm: bpm
-      })),
-      duration: 15
-    }) : _antd.notification.error({
-      message: /*#__PURE__*/_react.default.createElement("p", null, "\u6D41\u7A0B\u72C0\u614B\u932F\u8AA4\uFF0C\u8ACB\u806F\u7E6B\u7BA1\u7406\u54E1!")
-    });
-  } else {
-    bpmTypeError();
-  }
+  _antd.notification.success({
+    message: /*#__PURE__*/_react.default.createElement("p", null, msg),
+    duration: 15
+  });
+
+  // if (bpm.isIns()) {
+  //     const { status } = bpm.getIns();
+  //     let isSuc = false;
+
+  //     switch (status) {
+  //         case InsStatus.REVOKE:
+  //         case InsStatus.DRAFT:
+  //             tip = (<>修改已创建流程未提交，請至：</>);
+  //             isSuc = true;
+  //             break;
+  //         case InsStatus.EXECUTE:
+  //             tip = (<>
+  //                 申請修改數據的申請已提交，請等待<strong>{bpm.getCurExeUsrs().map(usr => usr.name).join()}</strong>審批
+  //             </>)
+  //             isSuc = true;
+  //             break;
+  //         default:
+  //             isSuc = false;
+  //     }
+  //     isSuc ? notification.success({
+  //         message: (<p>{tip}
+  //             <BpmFormLink bpm={bpm} />
+  //         </p>),
+  //         duration: 15
+  //     }) : notification.error({ message: <p>流程狀態錯誤，請聯繫管理員!</p> })
+  // } else {
+  //     bpmTypeError();
+  // }
 }

package/mesh/form/options/submitBtn.js

@@ -39,8 +39,8 @@ function SubmitBtn(_ref) {
     });
   }
   (0, _react.useEffect)(() => {
-    collect.collectId ? (0, _builder.collectState)(collect.collectId, pkData).then(bpm => {
-      setComp((0, _collectStateResponse.default)(bpm, handleClick));
+    collect.collectId ? (0, _builder.collectState)(collect.collectId, pkData).then(res => {
+      setComp((0, _collectStateResponse.default)(res, handleClick));
     }) : (() => {
       setComp( /*#__PURE__*/_react.default.createElement(_confirmBtn.default, {
         type: "primary",