uepay-mesh 4.0.21 → 4.0.22-beta-2

package/bpm/bpmForm.js

@@ -0,0 +1,191 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+require("core-js/modules/web.dom.iterable.js");
+var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
+var _builder = require("./builder");
+var _bpmSteps = _interopRequireDefault(require("./form/bpmSteps"));
+var _title = _interopRequireDefault(require("./form/title"));
+var _info = _interopRequireDefault(require("./form/info"));
+var _flow = _interopRequireDefault(require("./form/flow"));
+var _collect = _interopRequireDefault(require("./form/collect"));
+var _options = _interopRequireDefault(require("./form/options"));
+var _request = require("./data/request");
+var _local = require("../common/local");
+var _processor = require("./form/processor");
+var _list = require("./list");
+var _standardCompareForm = _interopRequireDefault(require("../mesh/form/standardCompareForm"));
+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 {
+  Panel
+} = _antd.Collapse;
+
+/**
+ *
+ * @param insId
+ * @param pageId
+ * @param onPageClose
+ * @return {*}
+ * @constructor
+ */
+const BpmForm = (0, _list.withBpmList)(function (_ref) {
+  let {
+    content,
+    pageId,
+    onPageClose,
+    bpmListFlush
+  } = _ref;
+  const [loading, setLoading] = (0, _react.useState)(false),
+    [bpm, setBpm] = (0, _react.useState)(null);
+  function enLoading() {
+    setLoading(true);
+    _antd.message.loading('数据处理中......', 30);
+  }
+  function unLoading() {
+    setLoading(false);
+    _antd.message.destroy();
+  }
+  function handleClose() {
+    onPageClose(pageId);
+  }
+  function handleApprove(comment) {
+    enLoading();
+    (0, _builder.approved)(bpm, comment).then(_ref2 => {
+      let {
+        suc,
+        msg
+      } = _ref2;
+      unLoading();
+      if (suc) {
+        _antd.message.success('審批成功');
+        bpmListFlush();
+        onPageClose(pageId);
+      } else {
+        _antd.notification.error({
+          message: '審批失敗',
+          description: msg || (0, _local.errorMessage)()
+        });
+      }
+    });
+  }
+  function handleRefuse(comment) {
+    enLoading();
+    (0, _builder.refuse)(bpm, comment).then(_ref3 => {
+      let {
+        suc,
+        msg
+      } = _ref3;
+      unLoading();
+      if (suc) {
+        _antd.message.success('拒絕成功');
+        bpmListFlush();
+        onPageClose(pageId);
+      } else {
+        _antd.notification.error({
+          message: '拒絕失敗',
+          description: msg || (0, _local.errorMessage)()
+        });
+      }
+    });
+  }
+  function handleRevoke(comment) {
+    enLoading();
+    (0, _builder.revoke)(bpm, comment).then(_ref4 => {
+      let {
+        suc,
+        msg
+      } = _ref4;
+      unLoading();
+      if (suc) {
+        _antd.message.success('撤回成功');
+        bpmListFlush();
+        onPageClose(pageId);
+      } else {
+        _antd.notification.error({
+          message: '撤回失敗',
+          description: msg || (0, _local.errorMessage)()
+        });
+      }
+    });
+  }
+  (0, _react.useEffect)(() => {
+    enLoading();
+    const {
+      insId,
+      operation
+    } = JSON.parse(decodeURIComponent(atob(content)));
+    (0, _builder.getInstanceByInsId)(insId, operation).then(_ref5 => {
+      let {
+        suc,
+        msg,
+        bpm
+      } = _ref5;
+      unLoading();
+      if (suc) {
+        if (_serverEnums.BpmStepOperation.Waiting === operation) {
+          bpm.options[_serverEnums.BpmFormOptions.Approve] = true;
+        } else if (_serverEnums.BpmStepOperation.Submitted === operation && "ACTIVITY" === bpm.instance.state) {
+          bpm.options[_serverEnums.BpmFormOptions.Revoke] = true;
+        }
+        setBpm(bpm);
+      } else {
+        _antd.notification.error({
+          message: '獲取流程信息失敗',
+          description: msg || (0, _local.errorMessage)()
+        });
+      }
+    });
+  }, []);
+  return bpm ? /*#__PURE__*/_react.default.createElement("div", {
+    style: ContainStyle
+  }, /*#__PURE__*/_react.default.createElement(_title.default, {
+    loading: loading,
+    bpm: bpm,
+    onApprove: handleApprove,
+    onRefuse: handleRefuse,
+    onRevoke: handleRevoke,
+    onClose: handleClose
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    style: ContextStyle
+  }, /*#__PURE__*/_react.default.createElement(_antd.Collapse, {
+    defaultActiveKey: ['1'],
+    ghost: true
+  }, /*#__PURE__*/_react.default.createElement(Panel, {
+    key: 1,
+    header: "\u8868\u5355\u4FE1\u606F"
+  }, /*#__PURE__*/_react.default.createElement(_standardCompareForm.default, {
+    collect: bpm.collect,
+    data: bpm.data,
+    modify: bpm.modify
+  })), /*#__PURE__*/_react.default.createElement(Panel, {
+    key: 2,
+    header: "\u6D41\u7A0B\u4FE1\u606F"
+  }, /*#__PURE__*/_react.default.createElement(_flow.default, {
+    bpm: bpm
+  }))))) : null;
+});
+const ContainStyle = {
+  height: '100%',
+  'overflow-y': 'hidden'
+};
+const ContextStyle = {
+  height: '100%',
+  'overflow-y': 'auto'
+};
+BpmForm.tabName = '流程信息';
+BpmForm.getInitialProps = function (_ref6) {
+  let {
+    query
+  } = _ref6;
+  return {
+    content: query.content
+  };
+};
+var _default = exports.default = BpmForm;

package/bpm/builder.js

@@ -17,6 +17,7 @@ var _bpmDefined = _interopRequireDefault(require("./data/bpmDefined"));
 var _request = require("./data/request");
 var _uepayOps = require("uepay-ops2");
 var _serverEnums = require("./config/serverEnums");
+var _bpm = _interopRequireDefault(require("./data/bpm"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function responseProcess(res) {
   if (res && 0 < res.code) {
@@ -32,16 +33,77 @@ function responseProcess(res) {
     };
   }
 }
+function resForBpm(res) {
+  if (res && res.code === 1) {
+    return {
+      suc: true,
+      bpm: new _bpm.default(res)
+    };
+  } else {
+    return {
+      suc: false,
+      msg: res && res.msg || '流程處理失敗!'
+    };
+  }
+}
 
 /**
  *
  * @param insId
- * @return {Promise<unknown>}
+ * @return {Promise<{
+ *      suc: boolean,
+ *      msg: String,
+ *      data: {label: String, value: String},  
+ *      modify: {label: String, value: String},
+ *      collect: {ClassDescriptor},
+ *      instance: {DataMeshBpmInstance},
+ *      steps: {[DataMeshBpmInstanceStep]}
+ * }>}
  */
-function getInstanceByInsId(insId) {
-  return (0, _request.getBpmForm)(insId).then(res => {
-    return responseProcess(res);
+function getInstanceByInsId(insId, operation) {
+  return (0, _request.getBpmForm)(insId, operation).then(res => resForBpm(res));
+}
+
+/**
+ * 審批流程
+ * @param bpm {Bpm}
+ * @param context {String} 森皮説明
+ * @return {Promise<{suc: boolean, msg: String}>}
+ */
+function approved(bpm, context) {
+  const instanceId = bpm.instance.id;
+  return (0, _request.bpmApprove)(instanceId, getCurStepId(bpm), context).then(res => resForBpm(res));
+}
+
+/**
+ * 拒絕
+ * @param bpm {Bpm}
+ * @param context {String} 森皮説明
+ * @return {Promise<{suc: boolean, msg: String}>}
+ */
+function refuse(bpm, context) {
+  const instanceId = bpm.instance.id;
+  return (0, _request.bpmRefuse)(instanceId, getCurStepId(bpm), context).then(res => resForBpm(res));
+}
+
+/**
+ * 異步提交流程
+ * @param insId {Number}
+ * @param opinion {String|Boolean} 撤回意见
+ * @return {Promise<{suc: boolean, curUsr: *, bpmCacheId: (number|boolean), bpm: (InstanceBpmImpl|DefinedBpmImpl)} | {suc: boolean}>}
+ */
+function revoke(bpm, context) {
+  const instanceId = bpm.instance.id;
+  return (0, _request.bpmRevoke)(instanceId, getCurStepId(bpm), context).then(res => resForBpm(res));
+}
+function getCurStepId(bpm) {
+  let stepId = null;
+  bpm.steps.forEach(step => {
+    if (step.stepOperation === _serverEnums.BpmStepOperation.Waiting) {
+      stepId = step.id;
+    }
   });
+  return stepId;
 }
 
 /**
@@ -58,7 +120,7 @@ function getInstanceByInsId(insId) {
  */
 function collectState(collectId, pkData) {
   return (0, _request.bpmCollectState)((0, _uepayOps.getHost)(), collectId, pkData).then(res => {
-    let ret;
+    const ret = {};
     if (res && res.code > 0) {
       const {
         bpmDefined,
@@ -66,21 +128,16 @@ function collectState(collectId, pkData) {
         usrDict
       } = res;
       switch (res.state) {
-        case _serverEnums.BpmAccessState.Related:
-        case _serverEnums.BpmAccessState.Draft:
+        //case BpmAccessState.Related:
+        //case BpmAccessState.Draft:
         case _serverEnums.BpmAccessState.Execute:
-        case _serverEnums.BpmAccessState.Access:
-          ret = build({
-            bpmDefined,
-            bpmInstance,
-            usrDict
-          });
-          ret.state = res.state;
+          //case BpmAccessState.Access:
+          //ret = build({bpmDefined, bpmInstance, usrDict});
+          ret.state = _serverEnums.BpmAccessState.Execute;
+          ret.msg = res.msg;
           break;
         case _serverEnums.BpmAccessState.None:
-          ret = {
-            state: _serverEnums.BpmAccessState.None
-          };
+          ret.state = _serverEnums.BpmAccessState.None;
           break;
         default:
           ret = {
@@ -149,59 +206,6 @@ function end(_ref3) {
   });
 }
 
-/**
- * 審批流程
- * @param insId {Number}
- * @param opinion {String} 流程说明
- * @param formData {Object|Boolean} {{formNodeId: {Number}, 流程执行表单的主键, formData: {String}, 对应的JSON字符串}[]}
- * @param tos
- * @return {Promise<{suc: boolean, curUsr: *, bpmCacheId: (number|boolean), bpm: (InstanceBpmImpl|DefinedBpmImpl)} | {suc: boolean}>}
- */
-function approved(_ref4) {
-  let {
-    insId,
-    opinion,
-    formData = false,
-    tos = false
-  } = _ref4;
-  return (0, _request.bpmApprove)(insId, opinion, formData, tos).then(res => {
-    return responseProcess(res);
-  });
-}
-
-/**
- * 拒絕
- * @param insId
- * @param opinion
- * @param tos
- * @return {Promise<{suc: boolean, curUsr: *, bpmCacheId: (number|boolean), bpm: (InstanceBpmImpl|DefinedBpmImpl)}|{suc: boolean, msg: *}>}
- */
-function refuse(_ref5) {
-  let {
-    insId,
-    opinion
-  } = _ref5;
-  return (0, _request.bpmRefuse)(insId, opinion).then(res => {
-    return responseProcess(res);
-  });
-}
-
-/**
- * 異步提交流程
- * @param insId {Number}
- * @param opinion {String|Boolean} 撤回意见
- * @return {Promise<{suc: boolean, curUsr: *, bpmCacheId: (number|boolean), bpm: (InstanceBpmImpl|DefinedBpmImpl)} | {suc: boolean}>}
- */
-function revoke(_ref6) {
-  let {
-    insId,
-    opinion
-  } = _ref6;
-  return (0, _request.bpmRevoke)(insId, opinion).then(res => {
-    return responseProcess(res);
-  });
-}
-
 /**
  * @param bpmDefined: {BpmDefined}|boolean 流程定義信息:,
  * @param bpmInstance: {BpmInstance}|boolean 流程實例信息,
@@ -222,12 +226,12 @@ function revoke(_ref6) {
  *     isDef(); 返回 true
  * }
  */
-function build(_ref7) {
+function build(_ref4) {
   let {
     bpmDefined,
     bpmInstance,
     usrDict
-  } = _ref7;
+  } = _ref4;
   if (bpmInstance) {
     const {
       instance,

package/bpm/config/serverEnums.js

@@ -3,7 +3,69 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.InsStatus = exports.InsFormTypeName = exports.InsFormType = exports.ExeUsrType = exports.ExeNodeUserOptionsName = exports.ExeNodeUserOptions = exports.ExeNodeStatus = exports.DefNodeType = exports.DefNodeApprovalType = exports.BpmFormOptions = exports.BpmAccessState = void 0;
+exports.InsStatus = exports.InsFormTypeName = exports.InsFormType = exports.ExeUsrType = exports.ExeNodeUserOptionsName = exports.ExeNodeUserOptions = exports.ExeNodeStatus = exports.DefNodeType = exports.DefNodeApprovalType = exports.BpmStepOperation = exports.BpmInstanceState = exports.BpmInstanceAccessDisplayName = exports.BpmInstanceAccess = exports.BpmFormOptions = exports.BpmAccessState = void 0;
+var _submit = _interopRequireDefault(require("../form/options/submit"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * 審批頁面操作選項
+ * @type {{Comment: number, Revoke: number, Submit: number, Close: number, Approve: number}}
+ */
+const BpmFormOptions = exports.BpmFormOptions = {
+  /**
+   * 可審批
+   */
+  Approve: 1,
+  /**
+   * 可关闭
+   */
+  Close: 2,
+  /**
+   * 可评论
+   */
+  Comment: 3,
+  /**
+   * 可撤销
+   */
+  Revoke: 4,
+  /**
+   * 可以提交
+   */
+  Submit: 5,
+  /**
+   * 可以停止
+   */
+  End: 6,
+  /**
+   * 可以保存
+   */
+  Save: 7
+};
+const BpmStepOperation = exports.BpmStepOperation = {
+  Submitted: 'Submitted',
+  Standby: 'Standby',
+  Approved: 'Approved',
+  Rejected: 'Rejected',
+  Waiting: 'Waiting',
+  Revoked: 'Revoked'
+};
+const BpmInstanceState = exports.BpmInstanceState = {
+  ACTIVITY: 'ACTIVITY',
+  COMPLETE: 'COMPLETE',
+  BACKOUT: 'BACKOUT',
+  REJECT: 'REJECT'
+};
+const BpmInstanceAccess = exports.BpmInstanceAccess = {
+  UPDATE: 'UPDATE',
+  INSERT: 'INSERT',
+  DELETE: 'DELETE'
+};
+const BpmInstanceAccessDisplayName = exports.BpmInstanceAccessDisplayName = {
+  UPDATE: '修改',
+  INSERT: '新增',
+  DELETE: '刪除'
+};
+//
+
 /**
  * 數據集和流程的關聯狀態
  * @type {{Execute: string, Access: string, Error: string, None: string}}
@@ -131,41 +193,6 @@ const InsFormTypeName = exports.InsFormTypeName = {
   Update: '修改'
 };
 
-/**
- * 審批頁面操作選項
- * @type {{Comment: number, Revoke: number, Submit: number, Close: number, Approve: number}}
- */
-const BpmFormOptions = exports.BpmFormOptions = {
-  /**
-   * 可審批
-   */
-  Approve: 1,
-  /**
-   * 可关闭
-   */
-  Close: 2,
-  /**
-   * 可评论
-   */
-  Comment: 3,
-  /**
-   * 可撤销
-   */
-  Revoke: 4,
-  /**
-   * 可以提交
-   */
-  Submit: 5,
-  /**
-   * 可以停止
-   */
-  End: 6,
-  /**
-   * 可以保存
-   */
-  Save: 7
-};
-
 /**
  * 流程執行人类型
  * @type {{TODO: string, COMPLETE: string, NOTICE: string, APPLICANT: string}}

package/bpm/data/bpm.js

@@ -4,12 +4,52 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("core-js/modules/es6.symbol.js");
+var _serverEnums = require("../config/serverEnums");
+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); }
 class Bpm {
-  isInstance() {
-    return false;
-  }
-  isDefined() {
-    return false;
+  constructor(_ref) {
+    let {
+      collect,
+      instance,
+      steps,
+      data,
+      modify
+    } = _ref;
+    /**
+     * 流程实例信息
+     * @type {{ClassDescriptor}|null}
+     */
+    _defineProperty(this, "collect", null);
+    /**
+     * 流程实例信息
+     * @type {{DataMeshBpmInstance}|null}
+     */
+    _defineProperty(this, "instance", null);
+    /**
+     * 流程实例信息
+     * @type {{[DataMeshBpmInstanceStep]}|null}
+     */
+    _defineProperty(this, "steps", null);
+    /**
+     * 流程实例信息
+     * @type {{Object}|null}
+     */
+    _defineProperty(this, "data", null);
+    /**
+     * 流程实例信息
+     * @type {{Object}|null}
+     */
+    _defineProperty(this, "modify", null);
+    _defineProperty(this, "options", {});
+    this.collect = collect;
+    this.instance = instance;
+    this.steps = steps;
+    this.data = data;
+    this.modify = modify;
+    this.options[_serverEnums.BpmFormOptions.Close] = true;
   }
 }
 exports.default = Bpm;

package/bpm/data/request.js

@@ -60,15 +60,60 @@ const bpmCollectState = (host, collectId, pkData) => {
  *
  */
 exports.bpmCollectState = bpmCollectState;
-const getBpmForm = insId => {
-  return (0, _net.get)("".concat((0, _uepayOps.getHost)(), "/api/bpm/execute/usr/form?insId=").concat(insId));
+const getBpmForm = (insId, operation) => {
+  //return get(`${getHost()}/api/bpm/execute/usr/form?insId=${insId}`);
+  return (0, _net.get)("".concat((0, _uepayOps.getHost)(), "/data/mesh/bpm/ins?insId=").concat(insId, "&operation=").concat(operation));
 };
 
 /**
- * 获取当前各种办理清单
+ * 同意流程
+ * @param instanceId
+ * @param context
  * @return {Promise<Response>}
  */
 exports.getBpmForm = getBpmForm;
+const bpmApprove = (instanceId, stepId, context) => {
+  return (0, _net.post)("".concat((0, _uepayOps.getHost)(), "/data/mesh/bpm/ins/approve"), {
+    instanceId,
+    stepId,
+    context
+  });
+};
+
+/**
+ * 審批者拒絕流程
+ * @param insId
+ * @param opinion
+ * @return {Promise<Response>}
+ */
+exports.bpmApprove = bpmApprove;
+const bpmRefuse = (instanceId, stepId, context) => {
+  return (0, _net.post)("".concat((0, _uepayOps.getHost)(), "/data/mesh/bpm/ins/refuse"), {
+    instanceId,
+    stepId,
+    context
+  });
+};
+
+/**
+ * 撤回/撤销流程，InsStatus.EXECUTE由ExeUsrStatus.APPLICANT执行。
+ * @param insId {Number} 流程实例ID
+ * @param opinion {String} 撤销说明
+ */
+exports.bpmRefuse = bpmRefuse;
+const bpmRevoke = (instanceId, stepId, context) => {
+  return (0, _net.post)("".concat((0, _uepayOps.getHost)(), "/data/mesh/bpm/ins/revoke"), {
+    instanceId,
+    stepId,
+    context
+  });
+};
+
+/**
+ * 获取当前各种办理清单
+ * @return {Promise<Response>}
+ */
+exports.bpmRevoke = bpmRevoke;
 const getBpmCount = () => {
   return (0, _net.get)("".concat((0, _uepayOps.getHost)(), "/api/bpm/execute/usr/view"));
 };
@@ -125,58 +170,13 @@ const bpmEnd = insId => {
   });
 };
 
-/**
- * 同意流程
- * @param insId
- * @param opinion
- * @param formData
- * @param tos
- * @return {Promise<Response>}
- */
-exports.bpmEnd = bpmEnd;
-const bpmApprove = (insId, opinion, formData, tos) => {
-  return (0, _net.post)("".concat((0, _uepayOps.getHost)(), "/api/bpm/execute/usr/approve"), {
-    insId,
-    opinion,
-    formData,
-    tos
-  });
-};
-
-/**
- * 審批者拒絕流程
- * @param insId
- * @param opinion
- * @return {Promise<Response>}
- */
-exports.bpmApprove = bpmApprove;
-const bpmRefuse = (insId, opinion) => {
-  return (0, _net.post)("".concat((0, _uepayOps.getHost)(), "/api/bpm/execute/usr/refuse"), {
-    insId,
-    opinion
-  });
-};
-
-/**
- * 撤回/撤销流程，InsStatus.EXECUTE由ExeUsrStatus.APPLICANT执行。
- * @param insId {Number} 流程实例ID
- * @param opinion {String} 撤销说明
- */
-exports.bpmRefuse = bpmRefuse;
-const bpmRevoke = (insId, opinion) => {
-  return (0, _net.post)("".concat((0, _uepayOps.getHost)(), "/api/bpm/execute/usr/revoke"), {
-    insId,
-    opinion
-  });
-};
-
 /**
  * 评论，InsStatus.EXECUTE, InsStatus.FINISHED。所有可见人均可执行。
  * @param insId {Number} 流程实例ID
  * @param comment {String} 评论信息
  * @param tos {Number} 评论对象Id列表
  */
-exports.bpmRevoke = bpmRevoke;
+exports.bpmEnd = bpmEnd;
 const bpmComment = (insId, comment, tos) => {
   return (0, _net.post)("".concat((0, _uepayOps.getHost)(), "/api/bpm/execute/usr/comment"), {
     insId,