eoss-ui 0.5.88 → 0.5.90

package/lib/eoss-ui.common.js

@@ -24058,8 +24058,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_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/src/main.vue?vue&type=template&id=44d35e77&
-var mainvue_type_template_id_44d35e77_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/src/main.vue?vue&type=template&id=242d804b&
+var mainvue_type_template_id_242d804b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -24251,6 +24251,10 @@ var mainvue_type_template_id_44d35e77_render = function () {
                             "el-input",
                             {
                               staticClass: "input-with-select select-process",
+                              class: {
+                                "hide-flow-char":
+                                  _vm.isStartFlowChartView != "true",
+                              },
                               attrs: { placeholder: "请输入内容" },
                             },
                             [
@@ -24284,6 +24288,15 @@ var mainvue_type_template_id_44d35e77_render = function () {
                                 1
                               ),
                               _c("el-button", {
+                                directives: [
+                                  {
+                                    name: "show",
+                                    rawName: "v-show",
+                                    value: _vm.isStartFlowChartView == "true",
+                                    expression:
+                                      "isStartFlowChartView == 'true'",
+                                  },
+                                ],
                                 attrs: {
                                   slot: "append",
                                   icon: "el-icon-picture",
@@ -25838,11 +25851,11 @@ var mainvue_type_template_id_44d35e77_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_44d35e77_staticRenderFns = []
-mainvue_type_template_id_44d35e77_render._withStripped = true
+var mainvue_type_template_id_242d804b_staticRenderFns = []
+mainvue_type_template_id_242d804b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=44d35e77&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=242d804b&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=28c062bc&
 var CommonOpinionsvue_type_template_id_28c062bc_render = function () {
@@ -33531,6 +33544,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
+//
 
 
 
@@ -33585,6 +33600,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       styles: {},
       userModel: {},
       isCanPreAddSign: false,
+      isStartFlowChartView: undefined,
       nextOtherOrgObjSelect: [],
       subProcessColumns: [],
       nextCurrentOrgObjSelect: [],
@@ -33592,6 +33608,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       newTypeCode: '',
       NodeName: '', // 当前节点值
       radioList: [],
+      taskReadOpinionRequired: undefined,
       value: '',
       nodeFixedOpinionSelectList: [],
       customPresetHintMessage: '', //流程预设标题
@@ -33910,6 +33927,9 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     taskRead: function taskRead() {
       var _this2 = this;
 
+      if (this.taskReadOpinionRequired == 'true' && !this.value) {
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       this.$confirm('确认提交?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -33970,10 +33990,12 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             message = res.message,
             _res$data = res.data,
             isCanFenyue = _res$data.isCanFenyue,
-            taskExamine = _res$data.taskExamine;
+            taskExamine = _res$data.taskExamine,
+            taskReadOpinionRequired = _res$data.taskReadOpinionRequired;
 
         if (status === 'success') {
           _this3.taskExamineInfo = taskExamine;
+          _this3.taskReadOpinionRequired = taskReadOpinionRequired;
           _this3.isCanFenyue = isCanFenyue;
           if (_this3.nodeName) {
             _this3.NodeName = _this3.nodeName;
@@ -35064,6 +35086,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
         _this24.loading.close();
         if (status === 'success') {
+          _this24.isStartFlowChartView = data.isStartFlowChartView;
           if (!Object.keys(data).length || data.definitionList && !data.definitionList.length) {
             _this24.$message.error('流程不存在或未关联对应流程！');
           } else {
@@ -35386,8 +35409,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_44d35e77_render,
-  mainvue_type_template_id_44d35e77_staticRenderFns,
+  mainvue_type_template_id_242d804b_render,
+  mainvue_type_template_id_242d804b_staticRenderFns,
   false,
   null,
   null,
@@ -41016,8 +41039,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=049c9299&
-var mainvue_type_template_id_049c9299_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=a446828e&
+var mainvue_type_template_id_a446828e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -41973,11 +41996,11 @@ var mainvue_type_template_id_049c9299_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_049c9299_staticRenderFns = []
-mainvue_type_template_id_049c9299_render._withStripped = true
+var mainvue_type_template_id_a446828e_staticRenderFns = []
+mainvue_type_template_id_a446828e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=049c9299&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=a446828e&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=cab38660&
 var resetPasswordvue_type_template_id_cab38660_render = function () {
@@ -43961,7 +43984,7 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
               Authorization: results.token,
               deviceUnique: results.deviceUnique,
               userId: results.userId,
-              userName: results.username,
+              userName: results.userName,
               useCaseCodes: results.resourceCodes
             }
           });
@@ -44119,8 +44142,8 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_049c9299_render,
-  mainvue_type_template_id_049c9299_staticRenderFns,
+  mainvue_type_template_id_a446828e_render,
+  mainvue_type_template_id_a446828e_staticRenderFns,
   false,
   null,
   null,
@@ -76213,7 +76236,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.88',
+  version: '0.5.90',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -4108,7 +4108,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // 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/src/main.vue?vue&type=template&id=44d35e77&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=242d804b&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4301,6 +4301,10 @@ var render = function () {
                             "el-input",
                             {
                               staticClass: "input-with-select select-process",
+                              class: {
+                                "hide-flow-char":
+                                  _vm.isStartFlowChartView != "true",
+                              },
                               attrs: { placeholder: "请输入内容" },
                             },
                             [
@@ -4334,6 +4338,15 @@ var render = function () {
                                 1
                               ),
                               _c("el-button", {
+                                directives: [
+                                  {
+                                    name: "show",
+                                    rawName: "v-show",
+                                    value: _vm.isStartFlowChartView == "true",
+                                    expression:
+                                      "isStartFlowChartView == 'true'",
+                                  },
+                                ],
                                 attrs: {
                                   slot: "append",
                                   icon: "el-icon-picture",
@@ -5892,7 +5905,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=44d35e77&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=242d804b&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -13437,6 +13450,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
 
 
 
@@ -13491,6 +13506,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       styles: {},
       userModel: {},
       isCanPreAddSign: false,
+      isStartFlowChartView: undefined,
       nextOtherOrgObjSelect: [],
       subProcessColumns: [],
       nextCurrentOrgObjSelect: [],
@@ -13498,6 +13514,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       newTypeCode: '',
       NodeName: '', // 当前节点值
       radioList: [],
+      taskReadOpinionRequired: undefined,
       value: '',
       nodeFixedOpinionSelectList: [],
       customPresetHintMessage: '', //流程预设标题
@@ -13816,6 +13833,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     taskRead: function taskRead() {
       var _this2 = this;
 
+      if (this.taskReadOpinionRequired == 'true' && !this.value) {
+        if (!this.$refs.commonOpinions.validate()) return;
+      }
       this.$confirm('确认提交?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -13876,10 +13896,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             message = res.message,
             _res$data = res.data,
             isCanFenyue = _res$data.isCanFenyue,
-            taskExamine = _res$data.taskExamine;
+            taskExamine = _res$data.taskExamine,
+            taskReadOpinionRequired = _res$data.taskReadOpinionRequired;
 
         if (status === 'success') {
           _this3.taskExamineInfo = taskExamine;
+          _this3.taskReadOpinionRequired = taskReadOpinionRequired;
           _this3.isCanFenyue = isCanFenyue;
           if (_this3.nodeName) {
             _this3.NodeName = _this3.nodeName;
@@ -14970,6 +14992,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
         _this24.loading.close();
         if (status === 'success') {
+          _this24.isStartFlowChartView = data.isStartFlowChartView;
           if (!Object.keys(data).length || data.definitionList && !data.definitionList.length) {
             _this24.$message.error('流程不存在或未关联对应流程！');
           } else {