eoss-ui 0.4.52 → 0.4.54

package/lib/button-group.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/button.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/checkbox-group.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/data-table-form.js

@@ -101,6 +101,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -204,6 +206,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/data-table.js

@@ -101,6 +101,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -204,6 +206,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/date-picker.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/dialog.js

@@ -101,6 +101,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -204,6 +206,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/eoss-ui.common.js

@@ -101,6 +101,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -204,6 +206,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);
@@ -28064,8 +28067,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=9783bc8c&
-var mainvue_type_template_id_9783bc8c_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=88cb49c6&
+var mainvue_type_template_id_88cb49c6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -28679,91 +28682,51 @@ var mainvue_type_template_id_9783bc8c_render = function () {
                                             1
                                           )
                                         : _vm._e(),
-                                      _c(
-                                        "el-form-item",
-                                        {
-                                          attrs: {
-                                            prop: _vm.isShowNextUser
-                                              ? "nextUserId"
-                                              : "nextOrgId",
-                                            label: _vm.isShowNextUser
-                                              ? "下步办理人"
-                                              : "办理对象",
-                                          },
-                                        },
-                                        [
-                                          _c("SelectUser", {
-                                            attrs: {
-                                              nextUser: _vm.isShowNextUser
-                                                ? _vm.nextNode.nextUserId
-                                                : _vm.nextNode.nextOrgId,
-                                              radioList: _vm.radioList,
-                                              multiple: _vm.multiple,
-                                              isCustomUser: !_vm.isShowNextUser
-                                                ? 1
-                                                : _vm.isCustomUser,
-                                              isCurrentNodeForbiddenChangeCandidate:
-                                                _vm.isCurrentNodeForbiddenChangeCandidate,
-                                              options: _vm.options,
-                                              mix: _vm.multiple,
-                                              presetEdit: _vm.presetEdit,
-                                              selectUserList:
-                                                _vm.selectUserList,
-                                              types: _vm.nextUserTypes,
-                                              params: _vm.isShowNextUser
-                                                ? _vm.params
-                                                : {},
-                                              tabs: _vm.nextUserTabs,
-                                            },
-                                            on: {
-                                              change: function ($event) {
-                                                _vm.changeSelectUser(
-                                                  $event,
-                                                  _vm.isShowNextUser
-                                                    ? "nextUserId"
-                                                    : "nextOrgId",
-                                                  true
-                                                )
-                                              },
-                                            },
-                                          }),
-                                        ],
-                                        1
-                                      ),
-                                      _vm.isHideCurrentOrg
+                                      _vm.isNextUser
                                         ? _c(
                                             "el-form-item",
                                             {
                                               attrs: {
-                                                prop: "nextCurrentOrgObj",
-                                                label: _vm.currentOrgName
-                                                  ? _vm.currentOrgName
-                                                  : "本单位",
+                                                prop: _vm.isShowNextUser
+                                                  ? "nextUserId"
+                                                  : "nextOrgId",
+                                                label: _vm.isShowNextUser
+                                                  ? "下步办理人"
+                                                  : "办理对象",
                                               },
                                             },
                                             [
                                               _c("SelectUser", {
                                                 attrs: {
-                                                  nextUser:
-                                                    _vm.nextNode
-                                                      .nextCurrentOrgObj,
-                                                  multiple: "",
-                                                  mix: "",
+                                                  nextUser: _vm.isShowNextUser
+                                                    ? _vm.nextNode.nextUserId
+                                                    : _vm.nextNode.nextOrgId,
+                                                  radioList: _vm.radioList,
+                                                  multiple: _vm.multiple,
+                                                  isCustomUser:
+                                                    !_vm.isShowNextUser
+                                                      ? 1
+                                                      : _vm.isCustomUser,
+                                                  isCurrentNodeForbiddenChangeCandidate:
+                                                    _vm.isCurrentNodeForbiddenChangeCandidate,
+                                                  options: _vm.options,
+                                                  mix: _vm.multiple,
+                                                  presetEdit: _vm.presetEdit,
                                                   selectUserList:
-                                                    _vm.selectNextCurrentOrgObjList,
-                                                  types: [
-                                                    "department",
-                                                    "employee",
-                                                  ],
-                                                  params: {
-                                                    filid: _vm.userModel.orgId,
-                                                  },
+                                                    _vm.selectUserList,
+                                                  types: _vm.nextUserTypes,
+                                                  params: _vm.isShowNextUser
+                                                    ? _vm.params
+                                                    : {},
+                                                  tabs: _vm.nextUserTabs,
                                                 },
                                                 on: {
                                                   change: function ($event) {
                                                     _vm.changeSelectUser(
                                                       $event,
-                                                      "nextCurrentOrgObj",
+                                                      _vm.isShowNextUser
+                                                        ? "nextUserId"
+                                                        : "nextOrgId",
                                                       true
                                                     )
                                                   },
@@ -29477,11 +29440,11 @@ var mainvue_type_template_id_9783bc8c_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_9783bc8c_staticRenderFns = []
-mainvue_type_template_id_9783bc8c_render._withStripped = true
+var mainvue_type_template_id_88cb49c6_staticRenderFns = []
+mainvue_type_template_id_88cb49c6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=9783bc8c&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=88cb49c6&
 
 // 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 () {
@@ -34682,8 +34645,8 @@ var processReject_component = normalizeComponent(
 )
 
 /* harmony default export */ var processReject = (processReject_component.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/startTaskRead.vue?vue&type=template&id=95f78930&
-var startTaskReadvue_type_template_id_95f78930_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/startTaskRead.vue?vue&type=template&id=31232218&
+var startTaskReadvue_type_template_id_31232218_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -35058,15 +35021,11 @@ var startTaskReadvue_type_template_id_95f78930_render = function () {
     1
   )
 }
-var startTaskReadvue_type_template_id_95f78930_staticRenderFns = []
-startTaskReadvue_type_template_id_95f78930_render._withStripped = true
-
+var startTaskReadvue_type_template_id_31232218_staticRenderFns = []
+startTaskReadvue_type_template_id_31232218_render._withStripped = true
 
-// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=95f78930&
 
-// EXTERNAL MODULE: external "qs"
-var external_qs_ = __webpack_require__(3);
-var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
+// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=31232218&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/startTaskRead.vue?vue&type=script&lang=js&
 var startTaskReadvue_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; };
@@ -35220,7 +35179,6 @@ var startTaskReadvue_type_script_lang_js_components;
 
 
 
-
 /* harmony default export */ var startTaskReadvue_type_script_lang_js_ = ({
   name: 'StartTaskRead',
   components: (startTaskReadvue_type_script_lang_js_components = {}, startTaskReadvue_type_script_lang_js_components[Option.name] = Option, startTaskReadvue_type_script_lang_js_components[selectUser.name] = selectUser, startTaskReadvue_type_script_lang_js_components),
@@ -35590,12 +35548,10 @@ var startTaskReadvue_type_script_lang_js_components;
               url: api["qb" /* taskReadHtml */],
               params: { taskAction: _this7.type },
               headers: {
-                Accept: 'application/json,text/plain',
-                'Content-Type': ' application/x-www-form-urlencoded; charset=UTF-8'
+                Accept: 'application/json,text/plain'
               },
               method: 'post',
-              format: false,
-              data: external_qs_default.a.stringify(params)
+              data: params
             }).then(function (res) {
               var message = res.message,
                   status = res.status;
@@ -35666,8 +35622,8 @@ var startTaskReadvue_type_script_lang_js_components;
 
 var startTaskRead_component = normalizeComponent(
   src_startTaskReadvue_type_script_lang_js_,
-  startTaskReadvue_type_template_id_95f78930_render,
-  startTaskReadvue_type_template_id_95f78930_staticRenderFns,
+  startTaskReadvue_type_template_id_31232218_render,
+  startTaskReadvue_type_template_id_31232218_staticRenderFns,
   false,
   null,
   null,
@@ -36964,7 +36920,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
-
+//
 
 
 
@@ -37309,12 +37265,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           url: api["qb" /* taskReadHtml */],
           params: { taskAction: 'complete' },
           headers: {
-            Accept: 'application/json,text/plain',
-            'Content-Type': ' application/x-www-form-urlencoded; charset=UTF-8'
+            Accept: 'application/json,text/plain'
           },
           method: 'post',
-          format: false,
-          data: external_qs_default.a.stringify(params)
+          data: params
         }).then(function (res) {
           var status = res.status,
               message = res.message;
@@ -38248,6 +38202,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           _this14.getNodeInfo();
         } else {
           if (res.status === 'taskCompleted') {
+            _this14.$emit('shrink', true);
             _this14.shrinkAbled = true;
             _this14.$message.warning(res.message || '系统错误，请联系管理员！');
           } else {
@@ -38441,7 +38396,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                   return _context.abrupt('return', _this18.handleVisible = true);
 
                 case 3:
-                  if (!(!_this18.endFlow && _this18.newTypeCode != 'fenyue' && !_this18.shrink && _this18.nextNode.isAddSign != '1' && _this18.nextNode.isRemoveSign != '1' && _this18.isSpecial && !_this18.isReject && _this18.nodeInfos.length != 0)) {
+                  if (!(!_this18.endFlow && _this18.newTypeCode != 'fenyue' && !_this18.shrink && _this18.nextNode.isAddSign != '1' && _this18.nextNode.isRemoveSign != '1' && _this18.isSpecial && !_this18.isReject && _this18.nodeInfos.length != 0 && _this18.isNextUser)) {
                     _context.next = 11;
                     break;
                   }
@@ -38633,8 +38588,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_9783bc8c_render,
-  mainvue_type_template_id_9783bc8c_staticRenderFns,
+  mainvue_type_template_id_88cb49c6_render,
+  mainvue_type_template_id_88cb49c6_staticRenderFns,
   false,
   null,
   null,
@@ -43351,8 +43306,8 @@ label_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_label = (label_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=23be641c&
-var mainvue_type_template_id_23be641c_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=9df7b90c&
+var mainvue_type_template_id_9df7b90c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -43453,7 +43408,7 @@ var mainvue_type_template_id_23be641c_render = function () {
                     { staticClass: "es-login-form-box" },
                     [
                       _vm.isShow(_vm.active) &&
-                      (_vm.active == 0 || _vm.active == 2)
+                      (_vm.active == 0 || _vm.active == 2 || _vm.active == 12)
                         ? [
                             _c(
                               "el-form",
@@ -43622,10 +43577,11 @@ var mainvue_type_template_id_23be641c_render = function () {
                                                         name: "show",
                                                         rawName: "v-show",
                                                         value:
-                                                          _vm.active == 2 &&
+                                                          (_vm.active == 2 ||
+                                                            _vm.active == 12) &&
                                                           _vm.showVerifyCode,
                                                         expression:
-                                                          "active == 2 && showVerifyCode",
+                                                          "(active == 2 || active == 12) && showVerifyCode",
                                                       },
                                                     ],
                                                     staticClass: "es-get-code",
@@ -44196,11 +44152,11 @@ var mainvue_type_template_id_23be641c_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_23be641c_staticRenderFns = []
-mainvue_type_template_id_23be641c_render._withStripped = true
+var mainvue_type_template_id_9df7b90c_staticRenderFns = []
+mainvue_type_template_id_9df7b90c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=23be641c&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=9df7b90c&
 
 // 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=4f5da52e&
 var resetPasswordvue_type_template_id_4f5da52e_render = function () {
@@ -45160,7 +45116,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
         7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
         9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-        11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' }
+        11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' },
+        12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
       } : {
         0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
         1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
@@ -45173,7 +45130,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
           type: '11',
           icon: 'es-icon-wodeyouxiang',
           name: '邮箱登录'
-        }
+        },
+        12: { type: '12', icon: 'es-icon-zhuanhuan', name: '双因素登录' }
       };
     },
     icons: function icons() {
@@ -45481,7 +45439,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.app = res.appName || res.subsystemName;
       this.qrimg = res.qrimg || res.qrImg;
       this.loginModel = res.loginModel;
-      // this.loginModel = '0,3,11,6,9,2';
+      // this.loginModel = '0,3,11,6,9,12';
       this.loginBackgroundImg = res.loginBackgroundUrl ? res.loginBackgroundUrl.split(',') : null;
       this.loginLogoImg = res.loginLogoUrl ? res.loginLogoUrl : null;
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
@@ -45532,7 +45490,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }
       var data = {};
       var flag = false;
-      if (this.active == 2) {
+      if (this.active == 2 || this.active == 12) {
         if (!this.formData.username) {
           this.$refs.login.validateField('username');
           return false;
@@ -45577,7 +45535,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       }, 1000);
       utils_util["a" /* default */].ajax({
         method: 'post',
-        url: this.active == 2 ? this.getTwoFactorLoginCode : this.getLoginCode,
+        url: this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
         data: data
       }).then(function (res) {
         _this4.$message({
@@ -45615,7 +45573,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
             }) : _this5.formData.password,
             identifyingCode: _this5.formData.identifyingCode,
             identifyingId: _this5.identifyingId
-          } : _this5.active == '2' ? {
+          } : _this5.active == '12' ? {
             username: _this5.formData.username,
             password: _this5.secret && _this5.isEncrypt ? utils_util["a" /* default */].esmEncrypt({
               data: _this5.formData.password,
@@ -45659,7 +45617,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       var extUserBindHandleId = sessionStorage.getItem('extUserBindHandleId');
       utils_util["a" /* default */].ajax({
         method: 'post',
-        url: this.active == '0' ? this.actionUrl : this.active == '2' ? this.doTwoFactorLogin : this.doCodeLogin,
+        url: this.active == '0' ? this.actionUrl : this.active == '12' ? this.doTwoFactorLogin : this.doCodeLogin,
         data: extUserBindHandleId ? login_src_mainvue_type_script_lang_js_extends({}, data, { extUserBindHandleId: extUserBindHandleId }) : data
       }).then(function (res) {
         _this6.submit = false;
@@ -45880,8 +45838,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_23be641c_render,
-  mainvue_type_template_id_23be641c_staticRenderFns,
+  mainvue_type_template_id_9df7b90c_render,
+  mainvue_type_template_id_9df7b90c_staticRenderFns,
   false,
   null,
   null,
@@ -71602,6 +71560,10 @@ mainvue_type_template_id_6da39de6_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/wxlogin/src/main.vue?vue&type=template&id=6da39de6&
 
+// EXTERNAL MODULE: external "qs"
+var external_qs_ = __webpack_require__(3);
+var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
+
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/wxlogin/src/main.vue?vue&type=script&lang=js&
 //
 //
@@ -71807,7 +71769,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.52',
+  version: '0.4.54',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-group.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);

package/lib/flow-list.js

@@ -102,6 +102,8 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
+var _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; };
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -205,6 +207,7 @@ var ajax = function ajax(_ref) {
   });
   // 请求拦截
   http.interceptors.request.use(function (config) {
+    config.header && (config.headers = _extends({}, config.headers, config.header));
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
     var requestKey = getRequestKey(config);