@xatlas/rainbow-core 1.6.1 → 1.6.4

package/dist/core.common.js

@@ -2110,8 +2110,8 @@ function file_asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg)
 
 function file_asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { file_asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { file_asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var openDownload = function openDownload(apiBaseURL) {
-  window.open("".concat(apiBaseURL, "/api/download?_time='").concat(new Date().getTime()), '_blank');
+var openDownload = function openDownload(apiBaseURL, fileId) {
+  window.open("/file/getfile/".concat(fileId, "?_time='").concat(new Date().getTime()), '_blank');
 };
 
 /* harmony default export */ var action_file = ({
@@ -2207,7 +2207,7 @@ var openDownload = function openDownload(apiBaseURL) {
                           case 3:
                             result = _context3.sent;
                             hide();
-                            if (!(result instanceof Error)) openDownload(_this3.apiBaseURL);
+                            if (!(result instanceof Error)) openDownload(_this3.apiBaseURL, result.file_id);
 
                           case 6:
                           case "end":
@@ -2281,7 +2281,7 @@ var openDownload = function openDownload(apiBaseURL) {
                           case 3:
                             result = _context5.sent;
                             hide();
-                            if (!(result instanceof Error)) openDownload(_this4.apiBaseURL);
+                            if (!(result instanceof Error)) openDownload(_this4.apiBaseURL, result.file_id);
 
                           case 6:
                           case "end":
@@ -2353,7 +2353,7 @@ var openDownload = function openDownload(apiBaseURL) {
                           case 3:
                             result = _context7.sent;
                             hide();
-                            if (!(result instanceof Error)) openDownload(_this5.apiBaseURL);
+                            if (!(result instanceof Error)) openDownload(_this5.apiBaseURL, result.file_id);
 
                           case 6:
                           case "end":
@@ -3024,7 +3024,7 @@ function flow_asyncToGenerator(fn) { return function () { var self = this, args
       var _this = this;
 
       return flow_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
-        var model, data, rowSelectionType;
+        var model, data;
         return regenerator_default.a.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -3054,13 +3054,10 @@ function flow_asyncToGenerator(fn) { return function () { var self = this, args
                   todo_actors: []
                 });
                 _this.actionViewWidget = 'workflow-report';
-                rowSelectionType = action.params && action.params.rowSelectionType ? action.params.rowSelectionType : null;
-                _this.actionParams.flow = rowSelectionType ? flow_objectSpread(flow_objectSpread({}, data), {}, {
-                  rowSelectionType: rowSelectionType
-                }) : data;
+                _this.actionParams.flow = data;
                 _this.actionViewVisible = true;
 
-              case 13:
+              case 12:
               case "end":
                 return _context.stop();
             }
@@ -12709,8 +12706,8 @@ var PickerSelectView_component = normalizeComponent(
 )
 
 /* harmony default export */ var PickerSelectView = (PickerSelectView_component.exports);
-// CONCATENATED MODULE: ../node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"842ff382-vue-loader-template"}!../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../node_modules/cache-loader/dist/cjs.js??ref--1-0!../node_modules/vue-loader/lib??vue-loader-options!../src/web/components/forms/WorkflowReport.vue?vue&type=template&id=5fc116f7&
-var WorkflowReportvue_type_template_id_5fc116f7_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-form-model',{ref:"form",staticStyle:{"min-height":"400px"},attrs:{"model":_vm.actionModel,"rules":_vm.rules}},[_c('a-tabs',{attrs:{"tab-position":'top'},model:{value:(_vm.activeName),callback:function ($$v) {_vm.activeName=$$v},expression:"activeName"}},[(_vm.actionModel.confirm)?_c('a-tab-pane',{key:"1",staticClass:"flow-approve-content",attrs:{"tab":"上报/审批","bodyStyle":{ 'overflow-y': 'auto', 'max-height': '350px' }}},[(_vm.actionModel.flow_action_name)?_c('a-card',{attrs:{"size":"small"}},[_c('a-form-model-item',{attrs:{"prop":"flow_action_name","size":"small"}},[_c('a-radio-group',{attrs:{"defaultValue":"submit"},model:{value:(_vm.actionModel.flow_action_name),callback:function ($$v) {_vm.$set(_vm.actionModel, "flow_action_name", $$v)},expression:"actionModel.flow_action_name"}},[_c('a-radio-button',{attrs:{"value":"submit"}},[_vm._v("审批通过")]),(_vm.allowBack)?_c('a-radio-button',{attrs:{"value":"back"}},[_vm._v("审批退回")]):_vm._e()],1)],1),_vm._l((_vm.attrs),function(attr){return _c('Item',{key:attr.name,attrs:{"formModel":_vm.actionModel,"prop":attr.name,"schema":attr,"required":attr.required,"params":{}},on:{"change":function($event){return _vm.handleItemChange($event, attr)}},model:{value:(_vm.actionModel[attr.name]),callback:function ($$v) {_vm.$set(_vm.actionModel, attr.name, $$v)},expression:"actionModel[attr.name]"}})}),_c('a-form-model-item',{attrs:{"label":"审批意见","prop":"deal_note","size":"small"}},[_c('a-textarea',{attrs:{"placeholder":"请输入审批或退回意见","auto-size":{ minRows: 4, maxRows: 6 }},model:{value:(_vm.actionModel.deal_note),callback:function ($$v) {_vm.$set(_vm.actionModel, "deal_note", $$v)},expression:"actionModel.deal_note"}})],1),(
+// CONCATENATED MODULE: ../node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"842ff382-vue-loader-template"}!../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../node_modules/cache-loader/dist/cjs.js??ref--1-0!../node_modules/vue-loader/lib??vue-loader-options!../src/web/components/forms/WorkflowReport.vue?vue&type=template&id=16e8cc18&
+var WorkflowReportvue_type_template_id_16e8cc18_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-form-model',{ref:"form",staticStyle:{"min-height":"400px"},attrs:{"model":_vm.actionModel,"rules":_vm.rules}},[_c('a-tabs',{attrs:{"tab-position":'top'},model:{value:(_vm.activeName),callback:function ($$v) {_vm.activeName=$$v},expression:"activeName"}},[(_vm.actionModel.confirm)?_c('a-tab-pane',{key:"1",staticClass:"flow-approve-content",attrs:{"tab":"上报/审批","bodyStyle":{ 'overflow-y': 'auto', 'max-height': '350px' }}},[(_vm.actionModel.flow_action_name)?_c('a-card',{attrs:{"size":"small"}},[_c('a-form-model-item',{attrs:{"prop":"flow_action_name","size":"small"}},[_c('a-radio-group',{attrs:{"defaultValue":"submit"},model:{value:(_vm.actionModel.flow_action_name),callback:function ($$v) {_vm.$set(_vm.actionModel, "flow_action_name", $$v)},expression:"actionModel.flow_action_name"}},[_c('a-radio-button',{attrs:{"value":"submit"}},[_vm._v("审批通过")]),(_vm.allowBack)?_c('a-radio-button',{attrs:{"value":"back"}},[_vm._v("审批退回")]):_vm._e()],1)],1),_vm._l((_vm.attrs),function(attr){return _c('Item',{key:attr.name,attrs:{"formModel":_vm.actionModel,"prop":attr.name,"schema":attr,"required":attr.required,"params":{}},on:{"change":function($event){return _vm.handleItemChange($event, attr)}},model:{value:(_vm.actionModel[attr.name]),callback:function ($$v) {_vm.$set(_vm.actionModel, attr.name, $$v)},expression:"actionModel[attr.name]"}})}),_c('a-form-model-item',{attrs:{"label":"审批意见","prop":"deal_note","size":"small"}},[_c('a-textarea',{attrs:{"placeholder":"请输入审批或退回意见","auto-size":{ minRows: 4, maxRows: 6 }},model:{value:(_vm.actionModel.deal_note),callback:function ($$v) {_vm.$set(_vm.actionModel, "deal_note", $$v)},expression:"actionModel.deal_note"}})],1),(
             _vm.actionModel.flow_action_name === 'back' && _vm.backs && _vm.backs.length
           )?_c('a-form-model-item',{attrs:{"label":"退回步骤","prop":"deal_note","size":"small"}},[_c('a-select',_vm._l((_vm.backs),function(step){return _c('a-select-option',{key:step.step_id,attrs:{"value":step.step_id},model:{value:(_vm.actionModel.back_step),callback:function ($$v) {_vm.$set(_vm.actionModel, "back_step", $$v)},expression:"actionModel.back_step"}},[_vm._v(" "+_vm._s(step.step_name)+" ")])}),1)],1):_vm._e(),(_vm.allowOver)?_c('a-form-model-item',{attrs:{"label":"结束工作流","prop":"allow_over","size":"small"}},[_c('a-switch',{model:{value:(_vm.actionModel.is_over),callback:function ($$v) {_vm.$set(_vm.actionModel, "is_over", $$v)},expression:"actionModel.is_over"}})],1):_vm._e()],2):_vm._e(),(!_vm.actionModel.flow_action_name)?_c('a-card',_vm._l((_vm.attrs),function(attr){return _c('Item',{key:attr.name,attrs:{"formModel":_vm.actionModel,"prop":attr.name,"schema":attr,"params":{}},on:{"change":function($event){return _vm.handleItemChange($event, attr)}},model:{value:(_vm.actionModel[attr.name]),callback:function ($$v) {_vm.$set(_vm.actionModel, attr.name, $$v)},expression:"actionModel[attr.name]"}})}),1):_vm._e(),(
           _vm.todos.length &&
@@ -12729,10 +12726,10 @@ var WorkflowReportvue_type_template_id_5fc116f7_render = function () {var _vm=th
                 : _vm.stepIndex === index
                 ? 'green'
                 : '#999'}},[_c('span',[_vm._v(_vm._s(index + 1))]),_vm._v(". "+_vm._s(step.step_name)+" "),(_vm.stepIndex > index)?_c('span',[_vm._v(" ("+_vm._s(_vm.logs[index + _vm.dealIndex + 1] ? _vm.logs[index + _vm.dealIndex + 1].operator.actor_name : '')+") ")]):_vm._e(),(_vm.stepIndex === index)?_c('span',[_vm._v(" "+_vm._s(_vm.operatorName)+" ")]):_vm._e()])}),1)],1)],1),_c('a-tab-pane',{key:"4",attrs:{"tab":"流程图","forceRender":""}},[_c('a-card',{attrs:{"bodyStyle":{ 'overflow-y': 'auto', 'max-height': '350px' }}},[_c('div',{ref:"graph"})])],1)],1)],1)}
-var WorkflowReportvue_type_template_id_5fc116f7_staticRenderFns = []
+var WorkflowReportvue_type_template_id_16e8cc18_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ../src/web/components/forms/WorkflowReport.vue?vue&type=template&id=5fc116f7&
+// CONCATENATED MODULE: ../src/web/components/forms/WorkflowReport.vue?vue&type=template&id=16e8cc18&
 
 // EXTERNAL MODULE: external {"root":"@antv/g6","commonjs2":"@antv/g6","commonjs":"@antv/g6","amd":"@antv/g6"}
 var g6_ = __webpack_require__("336c");
@@ -13063,13 +13060,19 @@ var Plugin = __webpack_require__("019f");
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                // if (this.todos[0].todo_actors.length && !this.actionModel.todo_actors.length && this.actionModel.flow_action_name !== 'back') {
-                //   this.$message.error('请选择下一步审批者')
-                //   return
-                // }
+                if (!(_this3.todos[0].todo_actors.length && !_this3.actionModel.todo_actors.length && _this3.actionModel.flow_action_name !== 'back' && !_this3.params.todoActorsNotRequired)) {
+                  _context.next = 3;
+                  break;
+                }
+
+                _this3.$message.error('请选择下一步审批者');
+
+                return _context.abrupt("return");
+
+              case 3:
                 _this3.$emit('commit', _this3.actionModel);
 
-              case 1:
+              case 4:
               case "end":
                 return _context.stop();
             }
@@ -13303,8 +13306,8 @@ var WorkflowReportvue_type_style_index_0_lang_css_ = __webpack_require__("632f")
 
 var WorkflowReport_component = normalizeComponent(
   forms_WorkflowReportvue_type_script_lang_js_,
-  WorkflowReportvue_type_template_id_5fc116f7_render,
-  WorkflowReportvue_type_template_id_5fc116f7_staticRenderFns,
+  WorkflowReportvue_type_template_id_16e8cc18_render,
+  WorkflowReportvue_type_template_id_16e8cc18_staticRenderFns,
   false,
   null,
   null,