eoss-ui 0.8.50 → 0.8.52

package/lib/eoss-ui.common.js

@@ -61918,8 +61918,8 @@ flow_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_flow = (flow_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=template&id=1aa747e6&
-var mainvue_type_template_id_1aa747e6_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=template&id=56bceb54&
+var mainvue_type_template_id_56bceb54_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -63193,11 +63193,11 @@ var mainvue_type_template_id_1aa747e6_render = function () {
     2
   )
 }
-var mainvue_type_template_id_1aa747e6_staticRenderFns = []
-mainvue_type_template_id_1aa747e6_render._withStripped = true
+var mainvue_type_template_id_56bceb54_staticRenderFns = []
+mainvue_type_template_id_56bceb54_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-group/src/main.vue?vue&type=template&id=1aa747e6&
+// CONCATENATED MODULE: ./packages/flow-group/src/main.vue?vue&type=template&id=56bceb54&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=script&lang=js&
 var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || 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; };
@@ -63701,6 +63701,11 @@ var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
     isSubmit: {
       type: Boolean,
       default: true
+    },
+    saveValidate: {
+      // 暂存时是否验证必填项
+      type: Boolean,
+      default: true
     }
   },
   data: function data() {
@@ -63811,7 +63816,7 @@ var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
         }
       });
     },
-    handleSubmit: function handleSubmit(res) {
+    handleSubmit: function handleSubmit(res, event) {
       var _this2 = this;
 
       if (this.submit) {
@@ -63847,10 +63852,12 @@ var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
       }
       esFlowForm;
       this.showMsg = res == 1 ? false : true;
+      // 暂存（event === 'save'）时由 saveValidate 控制是否验证必填，其余操作保持原逻辑（res === 1 才验证）
+      var validate = event === 'save' || res === 2 ? this.saveValidate : res === 1;
 
       if (this.otherValidate) {
         return new Promise(function (resolve, reject) {
-          esFlowForm.submitData(undefined, false, res, res === 1).then(function () {
+          esFlowForm.submitData({ validate: validate }, false, res, validate).then(function () {
             // 如果submitData验证通过，则执行otherValidate验证
             _this2.otherValidate(resolve, reject);
           }).catch(function (error) {
@@ -63859,7 +63866,7 @@ var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
           });
         });
       }
-      return esFlowForm.submitData(undefined, false, res, res === 1);
+      return esFlowForm.submitData({ validate: validate }, false, res, validate);
     },
     handleTaskRead: function handleTaskRead(res) {
       if (res.data.taskExamine && res.data.taskExamine.appId) {
@@ -63951,8 +63958,8 @@ var flow_group_src_mainvue_type_script_lang_js_extends = Object.assign || functi
 
 var flow_group_src_main_component = normalizeComponent(
   packages_flow_group_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1aa747e6_render,
-  mainvue_type_template_id_1aa747e6_staticRenderFns,
+  mainvue_type_template_id_56bceb54_render,
+  mainvue_type_template_id_56bceb54_staticRenderFns,
   false,
   null,
   null,
@@ -96143,8 +96150,17 @@ function select_src_mainvue_type_script_lang_js_objectWithoutProperties(obj, key
         format: this.format,
         data: params
       }).then(function (res) {
+        console.log('res', res);
         _this4.loading = false;
         _this4.canceled = false;
+        if (Array.isArray(res)) {
+          if (_this4.parseData) {
+            _this4.options = _this4.parseData(JSON.parse(JSON.stringify(res)));
+          } else {
+            _this4.options = JSON.parse(JSON.stringify(res));
+          }
+          return;
+        }
         if (res.rCode === 0) {
           if (_this4.parseData) {
             _this4.options = _this4.parseData(JSON.parse(JSON.stringify(res.results)));
@@ -113140,7 +113156,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.8.50',
+  version: '0.8.52',
   install: install,
   Archives: archives,
   Button: packages_button,

package/lib/flow-group.js

@@ -4661,7 +4661,7 @@ module.exports = require("qs");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=template&id=1aa747e6&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=template&id=56bceb54&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5940,7 +5940,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-group/src/main.vue?vue&type=template&id=1aa747e6&
+// CONCATENATED MODULE: ./packages/flow-group/src/main.vue?vue&type=template&id=56bceb54&
 
 // EXTERNAL MODULE: ./src/utils/util.js + 1 modules
 var util = __webpack_require__(0);
@@ -6447,6 +6447,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     isSubmit: {
       type: Boolean,
       default: true
+    },
+    saveValidate: {
+      // 暂存时是否验证必填项
+      type: Boolean,
+      default: true
     }
   },
   data: function data() {
@@ -6557,7 +6562,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }
       });
     },
-    handleSubmit: function handleSubmit(res) {
+    handleSubmit: function handleSubmit(res, event) {
       var _this2 = this;
 
       if (this.submit) {
@@ -6593,10 +6598,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       }
       esFlowForm;
       this.showMsg = res == 1 ? false : true;
+      // 暂存（event === 'save'）时由 saveValidate 控制是否验证必填，其余操作保持原逻辑（res === 1 才验证）
+      var validate = event === 'save' || res === 2 ? this.saveValidate : res === 1;
 
       if (this.otherValidate) {
         return new Promise(function (resolve, reject) {
-          esFlowForm.submitData(undefined, false, res, res === 1).then(function () {
+          esFlowForm.submitData({ validate: validate }, false, res, validate).then(function () {
             // 如果submitData验证通过，则执行otherValidate验证
             _this2.otherValidate(resolve, reject);
           }).catch(function (error) {
@@ -6605,7 +6612,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           });
         });
       }
-      return esFlowForm.submitData(undefined, false, res, res === 1);
+      return esFlowForm.submitData({ validate: validate }, false, res, validate);
     },
     handleTaskRead: function handleTaskRead(res) {
       if (res.data.taskExamine && res.data.taskExamine.appId) {