eoss-ui 0.8.49 → 0.8.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/eoss-ui.common.js +27 -19
- package/lib/flow-group.js +12 -5
- package/lib/index.js +1 -1
- package/lib/main.js +9 -8
- package/package.json +1 -1
- package/packages/flow-group/src/main.vue +11 -3
- package/packages/main/src/simplicityTop/index.vue +1 -0
- package/src/index.js +1 -1
package/lib/main.js
CHANGED
|
@@ -14263,8 +14263,8 @@ var simplicity_component = Object(componentNormalizer["a" /* default */])(
|
|
|
14263
14263
|
)
|
|
14264
14264
|
|
|
14265
14265
|
/* harmony default export */ var simplicity = (simplicity_component.exports);
|
|
14266
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicityTop/index.vue?vue&type=template&id=
|
|
14267
|
-
var
|
|
14266
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicityTop/index.vue?vue&type=template&id=1703c788&scoped=true&
|
|
14267
|
+
var simplicityTopvue_type_template_id_1703c788_scoped_true_render = function () {
|
|
14268
14268
|
var _vm = this
|
|
14269
14269
|
var _h = _vm.$createElement
|
|
14270
14270
|
var _c = _vm._self._c || _h
|
|
@@ -14831,11 +14831,11 @@ var simplicityTopvue_type_template_id_c03e4732_scoped_true_render = function ()
|
|
|
14831
14831
|
1
|
|
14832
14832
|
)
|
|
14833
14833
|
}
|
|
14834
|
-
var
|
|
14835
|
-
|
|
14834
|
+
var simplicityTopvue_type_template_id_1703c788_scoped_true_staticRenderFns = []
|
|
14835
|
+
simplicityTopvue_type_template_id_1703c788_scoped_true_render._withStripped = true
|
|
14836
14836
|
|
|
14837
14837
|
|
|
14838
|
-
// CONCATENATED MODULE: ./packages/main/src/simplicityTop/index.vue?vue&type=template&id=
|
|
14838
|
+
// CONCATENATED MODULE: ./packages/main/src/simplicityTop/index.vue?vue&type=template&id=1703c788&scoped=true&
|
|
14839
14839
|
|
|
14840
14840
|
// EXTERNAL MODULE: external "babel-runtime/regenerator"
|
|
14841
14841
|
var regenerator_ = __webpack_require__(4);
|
|
@@ -17718,6 +17718,7 @@ var simplicityTopvue_type_script_lang_js_systemMode = util["a" /* default */].ge
|
|
|
17718
17718
|
data: function data() {
|
|
17719
17719
|
return {
|
|
17720
17720
|
winTop: util["a" /* default */].getWinTop(),
|
|
17721
|
+
wintop: util["a" /* default */].getWinTop(),
|
|
17721
17722
|
appCodes: 'indexUrl',
|
|
17722
17723
|
tabActiveName: '',
|
|
17723
17724
|
count: 0,
|
|
@@ -19780,11 +19781,11 @@ var simplicityTopvue_type_script_lang_js_systemMode = util["a" /* default */].ge
|
|
|
19780
19781
|
|
|
19781
19782
|
var simplicityTop_component = Object(componentNormalizer["a" /* default */])(
|
|
19782
19783
|
src_simplicityTopvue_type_script_lang_js_,
|
|
19783
|
-
|
|
19784
|
-
|
|
19784
|
+
simplicityTopvue_type_template_id_1703c788_scoped_true_render,
|
|
19785
|
+
simplicityTopvue_type_template_id_1703c788_scoped_true_staticRenderFns,
|
|
19785
19786
|
false,
|
|
19786
19787
|
null,
|
|
19787
|
-
"
|
|
19788
|
+
"1703c788",
|
|
19788
19789
|
null
|
|
19789
19790
|
|
|
19790
19791
|
)
|
package/package.json
CHANGED
|
@@ -497,6 +497,11 @@ export default {
|
|
|
497
497
|
isSubmit: {
|
|
498
498
|
type: Boolean,
|
|
499
499
|
default: true
|
|
500
|
+
},
|
|
501
|
+
saveValidate: {
|
|
502
|
+
// 暂存时是否验证必填项
|
|
503
|
+
type: Boolean,
|
|
504
|
+
default: true
|
|
500
505
|
}
|
|
501
506
|
},
|
|
502
507
|
data() {
|
|
@@ -619,7 +624,7 @@ export default {
|
|
|
619
624
|
}
|
|
620
625
|
});
|
|
621
626
|
},
|
|
622
|
-
handleSubmit(res) {
|
|
627
|
+
handleSubmit(res, event) {
|
|
623
628
|
if (this.submit) {
|
|
624
629
|
if (this.submit.id) {
|
|
625
630
|
let iframe = document.getElementById(this.submit.id); //先找到ifram
|
|
@@ -655,11 +660,14 @@ export default {
|
|
|
655
660
|
}
|
|
656
661
|
esFlowForm;
|
|
657
662
|
this.showMsg = res == 1 ? false : true;
|
|
663
|
+
// 暂存(event === 'save')时由 saveValidate 控制是否验证必填,其余操作保持原逻辑(res === 1 才验证)
|
|
664
|
+
const validate =
|
|
665
|
+
event === 'save' || res === 2 ? this.saveValidate : res === 1;
|
|
658
666
|
|
|
659
667
|
if (this.otherValidate) {
|
|
660
668
|
return new Promise((resolve, reject) => {
|
|
661
669
|
esFlowForm
|
|
662
|
-
.submitData(
|
|
670
|
+
.submitData({ validate }, false, res, validate)
|
|
663
671
|
.then(() => {
|
|
664
672
|
// 如果submitData验证通过,则执行otherValidate验证
|
|
665
673
|
this.otherValidate(resolve, reject);
|
|
@@ -670,7 +678,7 @@ export default {
|
|
|
670
678
|
});
|
|
671
679
|
});
|
|
672
680
|
}
|
|
673
|
-
return esFlowForm.submitData(
|
|
681
|
+
return esFlowForm.submitData({ validate }, false, res, validate);
|
|
674
682
|
},
|
|
675
683
|
handleTaskRead(res) {
|
|
676
684
|
if (res.data.taskExamine && res.data.taskExamine.appId) {
|