eoss-ui 0.4.97 → 0.4.99

package/lib/eoss-ui.common.js

@@ -1938,29 +1938,29 @@ var isLogined = function isLogined(_ref8) {
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
 
-  var logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  if (logined || cookie == true || cookie == 1) {
-    if (loginPage) {
-      sessionStorage.setItem('loginPage', loginPage);
-      if (!startWith(loginPage, ['http', '/'], true)) {
-        var pathname = win.top.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-          loginPage = pathname + '/' + loginPage.replace('./', '');
-        } else {
-          loginPage = pathname + loginPage.replace('./', '');
-        }
+  if (loginPage) {
+    sessionStorage.setItem('loginPage', loginPage);
+    if (!startWith(loginPage, ['http', '/'], true)) {
+      var pathname = win.top.location.pathname;
+      if (pathname !== '/') {
+        pathname = pathname.split('/');
+        pathname.splice(pathname.length - 1);
+        pathname = pathname.join('/');
+        loginPage = pathname + '/' + loginPage.replace('./', '');
+      } else {
+        loginPage = pathname + loginPage.replace('./', '');
       }
     }
-    next();
+  }
+  var token = getStorage('token') || getStorage('Authorization');
+  var logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
         method: 'post',
@@ -28676,8 +28676,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=6538259e&
-var mainvue_type_template_id_6538259e_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=fd749ad0&
+var mainvue_type_template_id_fd749ad0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -30004,7 +30004,16 @@ var mainvue_type_template_id_6538259e_render = function () {
                                                                 _vm.rejectBtn,
                                                             },
                                                           },
-                                                          [_vm._v("驳回")]
+                                                          [
+                                                            _vm._v(
+                                                              "\n                  " +
+                                                                _vm._s(
+                                                                  _vm.rejectObj
+                                                                    .value
+                                                                ) +
+                                                                "\n                "
+                                                            ),
+                                                          ]
                                                         ),
                                                       ])
                                                     : _vm._e(),
@@ -30298,11 +30307,11 @@ var mainvue_type_template_id_6538259e_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_6538259e_staticRenderFns = []
-mainvue_type_template_id_6538259e_render._withStripped = true
+var mainvue_type_template_id_fd749ad0_staticRenderFns = []
+mainvue_type_template_id_fd749ad0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=6538259e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fd749ad0&
 
 // 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=4e1f4030&
 var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
@@ -37849,6 +37858,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
+//
 
 
 
@@ -37910,6 +37921,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       flowDisabled: false,
       activeNames: '',
       isEndUserTask: true,
+      isForceDisplayDefaultOptionForPrefix: false,
       selectUserList: [],
       selectNextCurrentOrgObjList: [],
       flowMultiple: true,
@@ -39094,6 +39106,14 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             } else if (_this14.nodeInfos.length > 0) {
               _this14.nextNode.nextNodeId = _this14.nodeInfos[0].nodeId;
             }
+            _this14.isForceDisplayDefaultOptionForPrefix = nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix == 1;
+            if (nodeInfoMap.nodeExtAttr.submitText) {
+              _this14.btnList.map(function (x) {
+                if (x.event === 'sub') {
+                  x.text = nodeInfoMap.nodeExtAttr.submitText;
+                }
+              });
+            }
           }
           _this14.choiceOrgId = choiceOrgId;
           _this14.choiceDeptId = choiceDeptId;
@@ -39154,7 +39174,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           if (!_this14.isOpinionRequired) {
             _this14.isOpinionRequired = 0;
           }
-          opinion && (_this14.value = opinion);
+          // opinion && (this.value = opinion);
           _this14.nextNode.notificationMsg = defaultNotificationMessage;
           _this14.moreList = [];
           if (taskButtonList && taskButtonList.length != 0) {
@@ -39458,7 +39478,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                   removeSignUserId = removeSignUserId.join(',');
                   params = flow_src_mainvue_type_script_lang_js_extends({}, _this18.nextNode, {
                     pendingId: _this18.pendingId,
-                    opinion: _this18.value,
+                    opinion: _this18.isForceDisplayDefaultOptionForPrefix && !_this18.value.startsWith(_this18.nodeDefaultSubmitOpinion) ? _this18.nodeDefaultSubmitOpinion + _this18.value : _this18.value,
                     userId: utils_util["a" /* default */].getStorage('userId'),
                     nextUserId: _this18.multiple ? nextUserId.join(',') : _this18.nextNode.nextUserId,
                     addSignUserId: addSignUserId,
@@ -39573,8 +39593,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_6538259e_render,
-  mainvue_type_template_id_6538259e_staticRenderFns,
+  mainvue_type_template_id_fd749ad0_render,
+  mainvue_type_template_id_fd749ad0_staticRenderFns,
   false,
   null,
   null,
@@ -47398,8 +47418,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=67d8ca27&
-var mainvue_type_template_id_67d8ca27_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=6d42b802&
+var mainvue_type_template_id_6d42b802_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47824,11 +47844,11 @@ var mainvue_type_template_id_67d8ca27_render = function () {
     1
   )
 }
-var mainvue_type_template_id_67d8ca27_staticRenderFns = []
-mainvue_type_template_id_67d8ca27_render._withStripped = true
+var mainvue_type_template_id_6d42b802_staticRenderFns = []
+mainvue_type_template_id_6d42b802_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=67d8ca27&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6d42b802&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -50237,11 +50257,15 @@ var log = utils_util["a" /* default */].getParams('console');
     };
   },
   created: function created() {
+    var params = utils_util["a" /* default */].getParams() || {};
+    if (Object.prototype.hasOwnProperty.call(params, 'history')) {
+      this.history = params.history == true || params.history == 'true' || params.history == 1;
+    }
     this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
-    this.isHeader = utils_util["a" /* default */].getParams('header');
+    this.isHeader = params.header;
     var sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && utils_util["a" /* default */].setFavicon(sysLogoIco);
-    this.isLogin();
+    this.isLogin(params);
   },
   mounted: function mounted() {
     utils_util["a" /* default */].win.reLogin = this.handleReLogin;
@@ -50257,16 +50281,15 @@ var log = utils_util["a" /* default */].getParams('console');
   },
 
   methods: {
-    isLogin: function isLogin() {
+    isLogin: function isLogin(query) {
       var _this = this;
 
       return main_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
-        var query, token, loginPage, pathname;
+        var token, loginPage, pathname;
         return regenerator_default.a.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                query = utils_util["a" /* default */].getParams();
                 token = utils_util["a" /* default */].getStorage('token') || utils_util["a" /* default */].getStorage('Authorization');
                 loginPage = utils_util["a" /* default */].getStorage('login') || utils_util["a" /* default */].getStorage('loginPage');
 
@@ -50285,12 +50308,12 @@ var log = utils_util["a" /* default */].getParams('console');
                   }
                 }
 
-                if (!(!token && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
-                  _context.next = 9;
+                if (!(!token && query && Object.prototype.hasOwnProperty.call(query, 'serverId') && Object.prototype.hasOwnProperty.call(query, 'authType'))) {
+                  _context.next = 8;
                   break;
                 }
 
-                _context.next = 7;
+                _context.next = 6;
                 return utils_util["a" /* default */].ajax({
                   method: 'post',
                   url: api["b" /* authCenter */],
@@ -50393,14 +50416,14 @@ var log = utils_util["a" /* default */].getParams('console');
                   }
                 }).catch(function (e) {});
 
-              case 7:
-                _context.next = 10;
+              case 6:
+                _context.next = 9;
                 break;
 
-              case 9:
+              case 8:
                 _this.getConfig();
 
-              case 10:
+              case 9:
               case 'end':
                 return _context.stop();
             }
@@ -50940,7 +50963,7 @@ var log = utils_util["a" /* default */].getParams('console');
           _this7.setTips(item);
         });
       } else {
-        if (Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
+        if (obj && Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
           this.$set(obj, 'tips', false);
           delete obj.tips;
         }
@@ -51238,7 +51261,7 @@ var log = utils_util["a" /* default */].getParams('console');
         if (res.path !== '/' && pathname == _path) {
           return pathname;
         }
-        if (Object.prototype.hasOwnProperty.call(res, 'children')) {
+        if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
           var _path2 = this.hasRouter(res.children, url);
           if (_path2) {
             return _path2;
@@ -51711,8 +51734,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_67d8ca27_render,
-  mainvue_type_template_id_67d8ca27_staticRenderFns,
+  mainvue_type_template_id_6d42b802_render,
+  mainvue_type_template_id_6d42b802_staticRenderFns,
   false,
   null,
   null,
@@ -69015,8 +69038,8 @@ form_src_table.install = function (Vue) {
 };
 
 /* harmony default export */ var table_form = (form_src_table);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=74d3e866&
-var mainvue_type_template_id_74d3e866_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=079ba0f8&
+var mainvue_type_template_id_079ba0f8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -69395,11 +69418,11 @@ var mainvue_type_template_id_74d3e866_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_74d3e866_staticRenderFns = []
-mainvue_type_template_id_74d3e866_render._withStripped = true
+var mainvue_type_template_id_079ba0f8_staticRenderFns = []
+mainvue_type_template_id_079ba0f8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=74d3e866&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=079ba0f8&
 
 // CONCATENATED MODULE: ./packages/upload/src/picture.js
 /* harmony default export */ var picture = ({
@@ -70088,7 +70111,9 @@ var mainvue_type_script_lang_js_props;
                     return item;
                   }).join(',');
                 }
-                _this2.kkfileview = res.results.kkViewRootPath ? res.results.kkViewRootPath : null;
+                if (res.results.kkViewRootPath) {
+                  _this2.kkfileview = res.results.kkViewRootPath;
+                }
                 _this2.fileSize = res.results.limitFileSize ? res.results.limitFileSize : 0;
                 _this2.fileTotalSize = res.results.limitTotalSize;
                 utils_store.set(_this2.code, {
@@ -70149,7 +70174,16 @@ var mainvue_type_script_lang_js_props;
       this.$refs.upload.submit();
     },
     openKkfileview: function openKkfileview(file) {
-      var url = encodeURIComponent(external_js_base64_["Base64"].encode((typeof this.download === 'string' ? this.download : api["q" /* downloadByAdjunctId */]) + ('?adjunctId=' + (file.adjunctId || file.response.adjunctId) + '&fullfilename=' + file.originalName)));
+      var host = utils_util["a" /* default */].win.top.location.origin;
+      if (this.host) {
+        if (utils_util["a" /* default */].startWith(this.host, 'http')) {
+          host = this.host;
+        } else {
+          host += this.host;
+        }
+      }
+      console.log(host);
+      var url = encodeURIComponent(external_js_base64_["Base64"].encode(host + (typeof this.download === 'string' ? this.download : api["q" /* downloadByAdjunctId */]) + ('?adjunctId=' + (file.adjunctId || file.response.adjunctId) + '&fullfilename=' + file.originalName)));
       utils_util["a" /* default */].win.top.open(this.kkfileview + '?url=' + url);
     },
     handlePreview: function handlePreview(res) {
@@ -70475,8 +70509,8 @@ var mainvue_type_script_lang_js_props;
 
 var upload_src_main_component = normalizeComponent(
   packages_upload_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_74d3e866_render,
-  mainvue_type_template_id_74d3e866_staticRenderFns,
+  mainvue_type_template_id_079ba0f8_render,
+  mainvue_type_template_id_079ba0f8_staticRenderFns,
   false,
   null,
   null,
@@ -70951,7 +70985,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.97',
+  version: '0.4.99',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-group.js

@@ -1939,29 +1939,29 @@ var isLogined = function isLogined(_ref8) {
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
 
-  var logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  if (logined || cookie == true || cookie == 1) {
-    if (loginPage) {
-      sessionStorage.setItem('loginPage', loginPage);
-      if (!startWith(loginPage, ['http', '/'], true)) {
-        var pathname = win.top.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-          loginPage = pathname + '/' + loginPage.replace('./', '');
-        } else {
-          loginPage = pathname + loginPage.replace('./', '');
-        }
+  if (loginPage) {
+    sessionStorage.setItem('loginPage', loginPage);
+    if (!startWith(loginPage, ['http', '/'], true)) {
+      var pathname = win.top.location.pathname;
+      if (pathname !== '/') {
+        pathname = pathname.split('/');
+        pathname.splice(pathname.length - 1);
+        pathname = pathname.join('/');
+        loginPage = pathname + '/' + loginPage.replace('./', '');
+      } else {
+        loginPage = pathname + loginPage.replace('./', '');
       }
     }
-    next();
+  }
+  var token = getStorage('token') || getStorage('Authorization');
+  var logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
         method: 'post',

package/lib/flow-list.js

@@ -1939,29 +1939,29 @@ var isLogined = function isLogined(_ref8) {
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
 
-  var logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  if (logined || cookie == true || cookie == 1) {
-    if (loginPage) {
-      sessionStorage.setItem('loginPage', loginPage);
-      if (!startWith(loginPage, ['http', '/'], true)) {
-        var pathname = win.top.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-          loginPage = pathname + '/' + loginPage.replace('./', '');
-        } else {
-          loginPage = pathname + loginPage.replace('./', '');
-        }
+  if (loginPage) {
+    sessionStorage.setItem('loginPage', loginPage);
+    if (!startWith(loginPage, ['http', '/'], true)) {
+      var pathname = win.top.location.pathname;
+      if (pathname !== '/') {
+        pathname = pathname.split('/');
+        pathname.splice(pathname.length - 1);
+        pathname = pathname.join('/');
+        loginPage = pathname + '/' + loginPage.replace('./', '');
+      } else {
+        loginPage = pathname + loginPage.replace('./', '');
       }
     }
-    next();
+  }
+  var token = getStorage('token') || getStorage('Authorization');
+  var logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
         method: 'post',

package/lib/flow.js

@@ -1938,29 +1938,29 @@ var isLogined = function isLogined(_ref8) {
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
 
-  var logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  if (logined || cookie == true || cookie == 1) {
-    if (loginPage) {
-      sessionStorage.setItem('loginPage', loginPage);
-      if (!startWith(loginPage, ['http', '/'], true)) {
-        var pathname = win.top.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-          loginPage = pathname + '/' + loginPage.replace('./', '');
-        } else {
-          loginPage = pathname + loginPage.replace('./', '');
-        }
+  if (loginPage) {
+    sessionStorage.setItem('loginPage', loginPage);
+    if (!startWith(loginPage, ['http', '/'], true)) {
+      var pathname = win.top.location.pathname;
+      if (pathname !== '/') {
+        pathname = pathname.split('/');
+        pathname.splice(pathname.length - 1);
+        pathname = pathname.join('/');
+        loginPage = pathname + '/' + loginPage.replace('./', '');
+      } else {
+        loginPage = pathname + loginPage.replace('./', '');
       }
     }
-    next();
+  }
+  var token = getStorage('token') || getStorage('Authorization');
+  var logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
         method: 'post',
@@ -3640,7 +3640,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=6538259e&
+// 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=fd749ad0&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4968,7 +4968,16 @@ var render = function () {
                                                                 _vm.rejectBtn,
                                                             },
                                                           },
-                                                          [_vm._v("驳回")]
+                                                          [
+                                                            _vm._v(
+                                                              "\n                  " +
+                                                                _vm._s(
+                                                                  _vm.rejectObj
+                                                                    .value
+                                                                ) +
+                                                                "\n                "
+                                                            ),
+                                                          ]
                                                         ),
                                                       ])
                                                     : _vm._e(),
@@ -5266,7 +5275,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=6538259e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fd749ad0&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -12671,6 +12680,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
 
 
 
@@ -12732,6 +12743,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       flowDisabled: false,
       activeNames: '',
       isEndUserTask: true,
+      isForceDisplayDefaultOptionForPrefix: false,
       selectUserList: [],
       selectNextCurrentOrgObjList: [],
       flowMultiple: true,
@@ -13916,6 +13928,14 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             } else if (_this14.nodeInfos.length > 0) {
               _this14.nextNode.nextNodeId = _this14.nodeInfos[0].nodeId;
             }
+            _this14.isForceDisplayDefaultOptionForPrefix = nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix == 1;
+            if (nodeInfoMap.nodeExtAttr.submitText) {
+              _this14.btnList.map(function (x) {
+                if (x.event === 'sub') {
+                  x.text = nodeInfoMap.nodeExtAttr.submitText;
+                }
+              });
+            }
           }
           _this14.choiceOrgId = choiceOrgId;
           _this14.choiceDeptId = choiceDeptId;
@@ -13976,7 +13996,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           if (!_this14.isOpinionRequired) {
             _this14.isOpinionRequired = 0;
           }
-          opinion && (_this14.value = opinion);
+          // opinion && (this.value = opinion);
           _this14.nextNode.notificationMsg = defaultNotificationMessage;
           _this14.moreList = [];
           if (taskButtonList && taskButtonList.length != 0) {
@@ -14280,7 +14300,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   removeSignUserId = removeSignUserId.join(',');
                   params = mainvue_type_script_lang_js_extends({}, _this18.nextNode, {
                     pendingId: _this18.pendingId,
-                    opinion: _this18.value,
+                    opinion: _this18.isForceDisplayDefaultOptionForPrefix && !_this18.value.startsWith(_this18.nodeDefaultSubmitOpinion) ? _this18.nodeDefaultSubmitOpinion + _this18.value : _this18.value,
                     userId: util["a" /* default */].getStorage('userId'),
                     nextUserId: _this18.multiple ? nextUserId.join(',') : _this18.nextNode.nextUserId,
                     addSignUserId: addSignUserId,

package/lib/form.js

@@ -1939,29 +1939,29 @@ var isLogined = function isLogined(_ref8) {
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
 
-  var logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  if (logined || cookie == true || cookie == 1) {
-    if (loginPage) {
-      sessionStorage.setItem('loginPage', loginPage);
-      if (!startWith(loginPage, ['http', '/'], true)) {
-        var pathname = win.top.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-          loginPage = pathname + '/' + loginPage.replace('./', '');
-        } else {
-          loginPage = pathname + loginPage.replace('./', '');
-        }
+  if (loginPage) {
+    sessionStorage.setItem('loginPage', loginPage);
+    if (!startWith(loginPage, ['http', '/'], true)) {
+      var pathname = win.top.location.pathname;
+      if (pathname !== '/') {
+        pathname = pathname.split('/');
+        pathname.splice(pathname.length - 1);
+        pathname = pathname.join('/');
+        loginPage = pathname + '/' + loginPage.replace('./', '');
+      } else {
+        loginPage = pathname + loginPage.replace('./', '');
       }
     }
-    next();
+  }
+  var token = getStorage('token') || getStorage('Authorization');
+  var logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
         method: 'post',