eoss-ui 0.5.63 → 0.5.65

package/lib/eoss-ui.common.js

@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;
@@ -3813,7 +3815,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     text: String,
     onClick: Function,
     badge: [Object, Number],
-    float: String
+    float: String,
+    selector: Boolean,
+    upload: Boolean
   },
   computed: {
     _type: function _type() {
@@ -3999,52 +4003,74 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     }
     var tag = 'el-button';
     var clas = ['es-button'];
-    var props = { type: this._type, size: this.size };
+    var props = {};
     var attrs = {};
-    if (this.link && !this.open) {
-      var link = this.param ? utils_util["a" /* default */].urlJoinParams({ url: this.link, param: this.param }) : this.link;
-      attrs = { href: link };
-      tag = 'a';
-      clas = clas.concat(['el-button', this._type ? 'el-button--' + this._type : 'el-button--default', this.size ? 'el-button--' + this.size : '', this.float ? 'es-button--' + this.float : '']);
-    }
-    if (this.badge) {
-      var config = {};
-      if (typeof this.badge === 'number') {
-        config = { class: 'es-button-badge', props: { value: this.badge } };
-      } else {
-        var _badge = this.badge,
-            value = _badge.value,
-            max = _badge.max,
-            isDot = _badge.isDot,
-            hidden = _badge.hidden,
-            type = _badge.type;
-
-        config = {
-          class: this.badge.class ? this.badge.class + ' es-button-badge' : 'es-button-badge',
-          props: { value: value, max: max, isDot: isDot, hidden: hidden, type: type }
-        };
+    var listeners = {};
+    var config = {};
+    if (this.selector) {
+      tag = 'es-selector';
+      props = _extends({}, this.$attrs, { button: { type: this._type, size: this.size } });
+      listeners = this.$listeners;
+    } else if (this.upload) {
+      tag = 'es-upload';
+      props = _extends({}, this.$attrs, { showFileList: false });
+      listeners = this.$listeners;
+      config = {
+        type: this._type,
+        size: this.size
+      };
+    } else {
+      props = _extends({}, this.$attrs, { type: this._type, size: this.size });
+      listeners = _extends({}, this.$listeners, { click: this.handleClick });
+      if (this.link && !this.open) {
+        var link = this.param ? utils_util["a" /* default */].urlJoinParams({ url: this.link, param: this.param }) : this.link;
+        attrs = { href: link };
+        tag = 'a';
+        clas = clas.concat(['el-button', this._type ? 'el-button--' + this._type : 'el-button--default', this.size ? 'el-button--' + this.size : '', this.float ? 'es-button--' + this.float : '']);
+      }
+      if (this.badge) {
+        var _config = {};
+        if (typeof this.badge === 'number') {
+          _config = { class: 'es-button-badge', props: { value: this.badge } };
+        } else {
+          var _badge = this.badge,
+              value = _badge.value,
+              max = _badge.max,
+              isDot = _badge.isDot,
+              hidden = _badge.hidden,
+              type = _badge.type;
+
+          _config = {
+            class: this.badge.class ? this.badge.class + ' es-button-badge' : 'es-button-badge',
+            props: { value: value, max: max, isDot: isDot, hidden: hidden, type: type }
+          };
+        }
+        return h('el-badge', _config, [h(tag, {
+          class: clas,
+          props: _extends({}, this.$attrs, props),
+          attrs: attrs,
+          on: _extends({}, this.$listeners, { click: this.handleClick }),
+          directives: [{
+            name: 'show',
+            value: !this.hide
+          }]
+        }, this.iconPlacement === 'start' ? [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default || this.text] : [this.$slots.default || this.text, this.icon ? h('i', { class: this.icon }) : ''])]);
       }
-      return h('el-badge', config, [h(tag, {
-        class: clas,
-        props: _extends({}, this.$attrs, props),
-        attrs: attrs,
-        on: _extends({}, this.$listeners, { click: this.handleClick }),
-        directives: [{
-          name: 'show',
-          value: !this.hide
-        }]
-      }, this.iconPlacement === 'start' ? [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default || this.text] : [this.$slots.default || this.text, this.icon ? h('i', { class: this.icon }) : ''])]);
     }
     return h(tag, {
       class: clas,
-      props: _extends({}, this.$attrs, props),
+      props: props,
       attrs: attrs,
-      on: _extends({}, this.$listeners, { click: this.handleClick }),
+      on: listeners,
       directives: [{
         name: 'show',
         value: !this.hide
       }]
-    }, this.iconPlacement === 'start' ? [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default || this.text] : [this.$slots.default || this.text, this.icon ? h('i', { class: this.icon }) : '']);
+    }, this.iconPlacement === 'start' ? [this.icon ? h('i', { class: this.icon }) : '', this.upload ? h('el-button', {
+      props: config
+    }, [this.$slots.default || this.text]) : this.$slots.default || this.text] : [this.upload ? h('el-button', {
+      props: config
+    }, [this.$slots.default || this.text]) : this.$slots.default || this.text, this.icon ? h('i', { class: this.icon }) : '']);
   }
 });
 // CONCATENATED MODULE: ./packages/button/src/main.vue?vue&type=script&lang=js&
@@ -4175,8 +4201,8 @@ main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_button = (main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=template&id=a336a590&
-var mainvue_type_template_id_a336a590_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=template&id=1080b7f0&
+var mainvue_type_template_id_1080b7f0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4207,27 +4233,33 @@ var mainvue_type_template_id_a336a590_render = function () {
                           )
                         : _c(
                             "es-button",
-                            _vm._b(
-                              {
-                                key: index,
-                                attrs: {
-                                  stop: _vm.stop,
-                                  size: _vm.size,
-                                  type: item.type,
-                                },
-                                on: {
-                                  click: function ($event) {
-                                    _vm.handleClick(
-                                      Object.assign({}, _vm.data, {
-                                        handle: item,
-                                      })
-                                    )
+                            _vm._g(
+                              _vm._b(
+                                {
+                                  key: index,
+                                  attrs: {
+                                    stop: _vm.stop,
+                                    size: _vm.size,
+                                    type: item.type,
+                                  },
+                                  on: {
+                                    click: function ($event) {
+                                      _vm.handleClick(
+                                        Object.assign({}, _vm.data, {
+                                          handle: item,
+                                        })
+                                      )
+                                    },
                                   },
                                 },
-                              },
-                              "es-button",
-                              item,
-                              false
+                                "es-button",
+                                _vm.exclAttribute({
+                                  data: item,
+                                  attrs: ["events"],
+                                }),
+                                false
+                              ),
+                              item.events
                             ),
                             [
                               _vm._v(
@@ -4313,11 +4345,11 @@ var mainvue_type_template_id_a336a590_render = function () {
     2
   )
 }
-var mainvue_type_template_id_a336a590_staticRenderFns = []
-mainvue_type_template_id_a336a590_render._withStripped = true
+var mainvue_type_template_id_1080b7f0_staticRenderFns = []
+mainvue_type_template_id_1080b7f0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=a336a590&
+// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=1080b7f0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=script&lang=js&
 var 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; };
@@ -4389,6 +4421,12 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var button_group_src_mainvue_type_script_lang_js_ = ({
@@ -4447,6 +4485,12 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
   },
 
   methods: {
+    exclAttribute: function exclAttribute(_ref) {
+      var data = _ref.data,
+          attrs = _ref.attrs;
+
+      return utils_util["a" /* default */].exclAttribute({ data: data, attrs: attrs });
+    },
     getBtns: function getBtns() {
       var _this = this;
 
@@ -4514,8 +4558,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 
 var src_main_component = normalizeComponent(
   packages_button_group_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_a336a590_render,
-  mainvue_type_template_id_a336a590_staticRenderFns,
+  mainvue_type_template_id_1080b7f0_render,
+  mainvue_type_template_id_1080b7f0_staticRenderFns,
   false,
   null,
   null,
@@ -4532,8 +4576,8 @@ src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var button_group = (src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calendar/src/main.vue?vue&type=template&id=31c0856e&
-var mainvue_type_template_id_31c0856e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calendar/src/main.vue?vue&type=template&id=aa9b4086&
+var mainvue_type_template_id_aa9b4086_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4625,6 +4669,7 @@ var mainvue_type_template_id_31c0856e_render = function () {
                   "es-disabled-day": item.type == 0,
                   "es-today": _vm.isSelect(item, _vm.today) && _vm.mark,
                   "es-select": _vm.isSelect(item, _vm.select),
+                  "es-disabled": item.disabled,
                 },
               },
               [
@@ -4681,11 +4726,11 @@ var mainvue_type_template_id_31c0856e_render = function () {
     ),
   ])
 }
-var mainvue_type_template_id_31c0856e_staticRenderFns = []
-mainvue_type_template_id_31c0856e_render._withStripped = true
+var mainvue_type_template_id_aa9b4086_staticRenderFns = []
+mainvue_type_template_id_aa9b4086_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/calendar/src/main.vue?vue&type=template&id=31c0856e&
+// CONCATENATED MODULE: ./packages/calendar/src/main.vue?vue&type=template&id=aa9b4086&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/calendar/src/main.vue?vue&type=script&lang=js&
 //
@@ -4748,6 +4793,7 @@ mainvue_type_template_id_31c0856e_render._withStripped = true
 //
 //
 //
+//
 
 /* harmony default export */ var calendar_src_mainvue_type_script_lang_js_ = ({
   name: 'EsCalendar',
@@ -4768,7 +4814,8 @@ mainvue_type_template_id_31c0856e_render._withStripped = true
       type: Boolean,
       default: true
     },
-    mark: Boolean
+    mark: Boolean,
+    disabled: Boolean
   },
   watch: {
     date: {
@@ -4878,6 +4925,9 @@ mainvue_type_template_id_31c0856e_render._withStripped = true
       return target == year + '/' + month + '/' + date;
     },
     handleClick: function handleClick(res) {
+      if (res.disabled) {
+        return false;
+      }
       var year = res.year,
           month = res.month,
           date = res.date;
@@ -5006,7 +5056,8 @@ mainvue_type_template_id_31c0856e_render._withStripped = true
             date: _i3,
             type: 0,
             year: month == 0 ? year - 1 : year,
-            month: month == 0 ? 12 : month
+            month: month == 0 ? 12 : month,
+            disabled: this.disabled
           });
         }
       }
@@ -5027,7 +5078,8 @@ mainvue_type_template_id_31c0856e_render._withStripped = true
             date: i,
             type: 0,
             year: month == 11 ? year + 1 : year,
-            month: month == 11 ? 1 : month + 2
+            month: month == 11 ? 1 : month + 2,
+            disabled: this.disabled
           });
         }
       }
@@ -5103,8 +5155,8 @@ mainvue_type_template_id_31c0856e_render._withStripped = true
 
 var calendar_src_main_component = normalizeComponent(
   packages_calendar_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_31c0856e_render,
-  mainvue_type_template_id_31c0856e_staticRenderFns,
+  mainvue_type_template_id_aa9b4086_render,
+  mainvue_type_template_id_aa9b4086_staticRenderFns,
   false,
   null,
   null,
@@ -6453,8 +6505,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=c40e40b8&
-var mainvue_type_template_id_c40e40b8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=5d38af04&
+var mainvue_type_template_id_5d38af04_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6541,10 +6593,15 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                         (_vm.theadBorder && _vm.border != "none"
                           ? " es-thead-border"
                           : ""),
+                      attrs: { data: _vm.datas },
+                      on: {
+                        "update:data": function ($event) {
+                          _vm.datas = $event
+                        },
+                      },
                     },
                     "el-table",
                     Object.assign({}, _vm.$attrs, {
-                      data: _vm.datas,
                       emptyText: _vm.emptyText,
                       showSummary: _vm.showTotal,
                       sumText: _vm.sumText || _vm.totalText,
@@ -6556,6 +6613,8 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                       border: _vm._border,
                       infiniteScroll: _vm.getTableData,
                       infiniteScrollDisabled: _vm.infiniteDisabled,
+                      dragSort: _vm.dragSort,
+                      dragSortClass: _vm.dragSortIcon,
                     }),
                     false
                   ),
@@ -6564,6 +6623,7 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                     "selection-change": _vm.selectionChange,
                     "filter-column": _vm.handleFilterColumn,
                     "sort-change": _vm.handleSortChange,
+                    "update-drag-sort": _vm.handleUpdateDragSort,
                   })
                 ),
                 [
@@ -6573,13 +6633,38 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                     return [
                       item.hide !== true
                         ? [
-                            item.type === "index" || item.type === "selection"
+                            item.type === "sort"
+                              ? _c("el-table-column", {
+                                  key: index,
+                                  attrs: { width: "32" },
+                                  scopedSlots: _vm._u([
+                                    {
+                                      key: "default",
+                                      fn: function (scope) {
+                                        return [
+                                          _c("es-icon", {
+                                            staticClass: "es-move",
+                                            attrs: {
+                                              contents: _vm.dragSortIcon,
+                                            },
+                                          }),
+                                        ]
+                                      },
+                                    },
+                                  ]),
+                                })
+                              : item.type === "index" ||
+                                item.type === "selection"
                               ? _c(
                                   "el-table-column",
                                   _vm._b(
                                     { key: index },
                                     "el-table-column",
-                                    item,
+                                    _vm.dragSort
+                                      ? Object.assign({}, item, {
+                                          fixed: false,
+                                        })
+                                      : item,
                                     false
                                   )
                                 )
@@ -6597,8 +6682,13 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                                           form: _vm.form,
                                           readonly: _vm.readonly,
                                           optionData: _vm.optionDatas,
+                                          dragSort: _vm.dragSort,
                                         },
-                                        item
+                                        _vm.dragSort
+                                          ? Object.assign({}, item, {
+                                              fixed: false,
+                                            })
+                                          : item
                                       ),
                                       false
                                     ),
@@ -6722,17 +6812,17 @@ var mainvue_type_template_id_c40e40b8_render = function () {
     1
   )
 }
-var mainvue_type_template_id_c40e40b8_staticRenderFns = []
-mainvue_type_template_id_c40e40b8_render._withStripped = true
+var mainvue_type_template_id_5d38af04_staticRenderFns = []
+mainvue_type_template_id_5d38af04_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=c40e40b8&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=5d38af04&
 
 // EXTERNAL MODULE: external "throttle-debounce"
 var external_throttle_debounce_ = __webpack_require__(13);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
-var childrenvue_type_template_id_29bcbc72_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
+var childrenvue_type_template_id_44b7ff61_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6751,9 +6841,15 @@ var childrenvue_type_template_id_29bcbc72_render = function () {
                         _vm._b(
                           { key: index },
                           "children",
-                          Object.assign({}, _vm.$attrs, item, {
-                            indexs: index,
-                          }),
+                          Object.assign(
+                            {},
+                            _vm.$attrs,
+                            item,
+                            { indexs: index },
+                            _vm.dragSort
+                              ? Object.assign({}, item, { fixed: false })
+                              : item
+                          ),
                           false
                         ),
                         _vm.$listeners
@@ -6768,11 +6864,11 @@ var childrenvue_type_template_id_29bcbc72_render = function () {
     2
   )
 }
-var childrenvue_type_template_id_29bcbc72_staticRenderFns = []
-childrenvue_type_template_id_29bcbc72_render._withStripped = true
+var childrenvue_type_template_id_44b7ff61_staticRenderFns = []
+childrenvue_type_template_id_44b7ff61_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
+// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=449ae3d7&
 var columnvue_type_template_id_449ae3d7_render = function () {
@@ -8392,12 +8488,14 @@ var _components;
 //
 //
 //
+//
 
 
 /* harmony default export */ var childrenvue_type_script_lang_js_ = ({
   name: 'Children',
   components: (_components = {}, _components[column.name] = column, _components),
   props: {
+    dragSort: Boolean,
     children: Array,
     childHead: Array
   },
@@ -8419,8 +8517,8 @@ var _components;
 
 var children_component = normalizeComponent(
   src_childrenvue_type_script_lang_js_,
-  childrenvue_type_template_id_29bcbc72_render,
-  childrenvue_type_template_id_29bcbc72_staticRenderFns,
+  childrenvue_type_template_id_44b7ff61_render,
+  childrenvue_type_template_id_44b7ff61_staticRenderFns,
   false,
   null,
   null,
@@ -8827,6 +8925,24 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -9078,6 +9194,11 @@ var mainvue_type_script_lang_js_components, _watch;
       default: function _default() {
         return {};
       }
+    },
+    dragSort: Boolean,
+    dragSortIcon: {
+      type: String,
+      default: 'es-icon-caidan'
     }
   },
   data: function data() {
@@ -9106,7 +9227,8 @@ var mainvue_type_script_lang_js_components, _watch;
       icon: true,
       show: true,
       sysCodes: [],
-      infiniteDisabled: this.infiniteScroll
+      infiniteDisabled: this.infiniteScroll,
+      isUpadeData: false
     };
   },
 
@@ -9124,7 +9246,17 @@ var mainvue_type_script_lang_js_components, _watch;
     theads: {
       get: function get() {
         var thead = [];
-        if (this.checkbox) {
+        var types = this.theadData.filter(function (item) {
+          return item.type == 'selection' || item.type == 'index' || item.type == 'sort';
+        }).map(function (item) {
+          return item.type;
+        });
+        if (this.dragSort && !types.includes('sort')) {
+          thead.push({
+            type: 'sort'
+          });
+        }
+        if (this.checkbox && !types.includes('selection')) {
           thead.push({
             type: 'selection',
             width: '55',
@@ -9134,7 +9266,7 @@ var mainvue_type_script_lang_js_components, _watch;
             reserveSelection: this.reserveSelection
           });
         }
-        if (this.numbers) {
+        if (this.numbers && !types.includes('index')) {
           var index = 1;
           if (this.infiniteScroll) {
             index = typeof this.index == 'boolean' ? 1 : this.index;
@@ -9147,7 +9279,8 @@ var mainvue_type_script_lang_js_components, _watch;
             width: '70',
             align: 'center',
             fixed: 'left',
-            index: index
+            index: index,
+            filterIcon: this.filter ? 'es-icon-biao' : undefined
           });
         }
         if (this.theadData.length) {
@@ -9177,6 +9310,7 @@ var mainvue_type_script_lang_js_components, _watch;
         return this.data;
       },
       set: function set(val) {
+        this.$emit('update:data', val);
         return val;
       }
     },
@@ -10048,6 +10182,9 @@ var mainvue_type_script_lang_js_components, _watch;
       }
       this.$emit('sort-change', res);
     },
+    handleUpdateDragSort: function handleUpdateDragSort(data, event) {
+      this.$emit('update-drag-sort', data, event);
+    },
     mergeThead: function mergeThead(res) {
       var _this12 = this;
 
@@ -10093,8 +10230,8 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_c40e40b8_render,
-  mainvue_type_template_id_c40e40b8_staticRenderFns,
+  mainvue_type_template_id_5d38af04_render,
+  mainvue_type_template_id_5d38af04_staticRenderFns,
   false,
   null,
   null,
@@ -13569,8 +13706,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=6983cacd&
-var mainvue_type_template_id_6983cacd_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=55faec94&
+var mainvue_type_template_id_55faec94_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -25026,11 +25163,11 @@ var mainvue_type_template_id_6983cacd_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_6983cacd_staticRenderFns = []
-mainvue_type_template_id_6983cacd_render._withStripped = true
+var mainvue_type_template_id_55faec94_staticRenderFns = []
+mainvue_type_template_id_55faec94_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=6983cacd&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=55faec94&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -29985,6 +30122,9 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
       var type = arguments[2];
       var validate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
 
+      if (this.readonly) {
+        return Promise.resolve();
+      }
       if (!handle) {
         handle = this.handles || {};
       }
@@ -30325,8 +30465,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6983cacd_render,
-  mainvue_type_template_id_6983cacd_staticRenderFns,
+  mainvue_type_template_id_55faec94_render,
+  mainvue_type_template_id_55faec94_staticRenderFns,
   false,
   null,
   null,
@@ -33060,8 +33200,8 @@ var CommonOpinions_component = normalizeComponent(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_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/processForm.vue?vue&type=template&id=aaac09fe&
-var processFormvue_type_template_id_aaac09fe_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/processForm.vue?vue&type=template&id=38d27a4e&
+var processFormvue_type_template_id_38d27a4e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -33527,11 +33667,11 @@ var processFormvue_type_template_id_aaac09fe_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_aaac09fe_staticRenderFns = []
-processFormvue_type_template_id_aaac09fe_render._withStripped = true
+var processFormvue_type_template_id_38d27a4e_staticRenderFns = []
+processFormvue_type_template_id_38d27a4e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=aaac09fe&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=38d27a4e&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=db651118&
 var selectUservue_type_template_id_db651118_render = function () {
@@ -35314,6 +35454,7 @@ var processFormvue_type_script_lang_js_components;
           }
         }
       },
+      userModel: {},
       nextUserTabs: {},
       selectPresetUserList: [],
       presetOptions: [],
@@ -35358,12 +35499,39 @@ var processFormvue_type_script_lang_js_components;
       }
     }
   },
+  created: function created() {
+    this.getUserInfo();
+  },
   mounted: function mounted() {
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
   },
 
   methods: {
+    getUserInfo: function getUserInfo() {
+      var _this = this;
+
+      var mainConfig = utils_util["a" /* default */].getStorage('mainConfig');
+      if (mainConfig) {
+        this.userModel = JSON.parse(mainConfig).userModel;
+      } else {
+        utils_util["a" /* default */].ajax({ url: api["cb" /* loginUserInfo */] }).then(function (res) {
+          var status = res.status,
+              data = res.data;
+
+          if (status == 'success') {
+            _this.userModel = data;
+          } else {
+            var msg = res.msg || '系统错误，请联系管理员！';
+            _this.$message.error(msg);
+          }
+        }).catch(function (err) {
+          if (err.message && err.message !== 'canceled') {
+            _this.$message.error(err.message);
+          }
+        });
+      }
+    },
     getIsShowNextUser: function getIsShowNextUser(val) {
       if (val == 7 || val == 8 || val == 9 || val == 10 || val == 11 || val == 12) {
         this.isShowNextUser = false;
@@ -35449,7 +35617,7 @@ var processFormvue_type_script_lang_js_components;
       this.mixOrgIdList = mixList;
     },
     getNodeType: function getNodeType() {
-      var _this = this;
+      var _this2 = this;
 
       utils_util["a" /* default */].ajax({
         url: api["u" /* findCodeValues */],
@@ -35462,19 +35630,19 @@ var processFormvue_type_script_lang_js_components;
             data = res.data;
 
         if (status === 'success') {
-          _this.nextNode.noticeList = data;
+          _this2.nextNode.noticeList = data;
         }
       }).catch(function (err) {
-        _this.loading = false;
+        _this2.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this.$message.error(err.message);
+          _this2.$message.error(err.message);
         }
       });
     },
 
     //获取通知信息
     getMessage: function getMessage() {
-      var _this2 = this;
+      var _this3 = this;
 
       var params = {
         processDefinitionId: this.processDefinitionId,
@@ -35483,12 +35651,12 @@ var processFormvue_type_script_lang_js_components;
       };
       utils_util["a" /* default */].ajax({ url: api["I" /* getNotificationMsg */], params: params, methods: 'post' }).then(function (res) {
         if (res.status === 'success') {
-          _this2.nextNode.noticeInfo = res.message;
+          _this3.nextNode.noticeInfo = res.message;
         }
       }).catch(function (err) {
-        _this2.loading = false;
+        _this3.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this2.$message.error(err.message);
+          _this3.$message.error(err.message);
         }
       });
     },
@@ -35498,11 +35666,11 @@ var processFormvue_type_script_lang_js_components;
       this.saveProcess(formName);
     },
     saveProcess: function saveProcess(formName) {
-      var _this3 = this;
+      var _this4 = this;
 
       this.$refs[formName].validate(function (valid) {
         if (valid) {
-          var _nextNode = _this3.nextNode,
+          var _nextNode = _this4.nextNode,
               nextNode = _nextNode.nextNode,
               nextUser = _nextNode.nextUser,
               noticeInfo = _nextNode.noticeInfo,
@@ -35514,20 +35682,20 @@ var processFormvue_type_script_lang_js_components;
               newOpinion = _nextNode.newOpinion;
 
           if (noticeType.length === 0) {
-            return _this3.$message.warning('请选择通知方式');
+            return _this4.$message.warning('请选择通知方式');
           }
-          if (_this3.isShowNextUser) {
-            if (nextUser == '' || _this3.multiple && nextUser.length == 0) {
-              return _this3.$message.warning('请选择下步办理人');
+          if (_this4.isShowNextUser) {
+            if (nextUser == '' || _this4.multiple && nextUser.length == 0) {
+              return _this4.$message.warning('请选择下步办理人');
             }
           } else {
-            if (nextOrgId == '' || _this3.multiple && nextOrgId.length == 0) {
-              return _this3.$message.warning('请选择办理对象');
+            if (nextOrgId == '' || _this4.multiple && nextOrgId.length == 0) {
+              return _this4.$message.warning('请选择办理对象');
             }
           }
-          _this3.loading = true;
+          _this4.loading = true;
           var newNextUser = [];
-          if (_this3.multiple) {
+          if (_this4.multiple) {
             nextUser && nextUser.map(function (item) {
               return newNextUser.push(item);
             });
@@ -35537,37 +35705,37 @@ var processFormvue_type_script_lang_js_components;
             newNoticeType = noticeType.join(',');
           }
           var params = {
-            processDefinitionId: _this3.processDefinitionId,
-            nextUserId: _this3.multiple ? newNextUser.join(',') : nextUser,
+            processDefinitionId: _this4.processDefinitionId,
+            nextUserId: _this4.multiple ? newNextUser.join(',') : nextUser,
             nextNodeId: nextNode,
-            businessId: _this3.businessId,
+            businessId: _this4.businessId,
             notificationType: newNoticeType,
             userId: utils_util["a" /* default */].getStorage('userId'),
             notificationMsg: noticeInfo,
-            customPresetUserJson: JSON.stringify(_this3.presetList),
-            presetUserJson: JSON.stringify(_this3.presetUserJson),
-            nextReadUserId: _this3.readMultiple ? _this3.mixReadList && _this3.mixReadList.join('|') : nextReadUserId,
-            nextOrgId: !_this3.isShowNextUser ? _this3.multiple ? _this3.mixOrgIdList && _this3.mixOrgIdList.join('|') : nextOrgId : '',
+            customPresetUserJson: JSON.stringify(_this4.presetList),
+            presetUserJson: JSON.stringify(_this4.presetUserJson),
+            nextReadUserId: _this4.readMultiple ? _this4.mixReadList && _this4.mixReadList.join('|') : nextReadUserId,
+            nextOrgId: !_this4.isShowNextUser ? _this4.multiple ? _this4.mixOrgIdList && _this4.mixOrgIdList.join('|') : nextOrgId : '',
             handleExplain: handleExplain,
-            presetReadUserId: _this3.mixPresetList && _this3.mixPresetList.length > 0 ? _this3.mixPresetList.join('|') : presetReadUserId.join(','),
-            opinion: _this3.newOpinion || newOpinion
+            presetReadUserId: _this4.mixPresetList && _this4.mixPresetList.length > 0 ? _this4.mixPresetList.join('|') : presetReadUserId.join(','),
+            opinion: _this4.newOpinion || newOpinion
           };
-          if (_this3.activeNames != '1') delete params.customPresetUserJson;
+          if (_this4.activeNames != '1') delete params.customPresetUserJson;
           utils_util["a" /* default */].ajax({ url: api["mb" /* register */], method: 'post', data: params }).then(function (res) {
             var status = res.status,
                 message = res.message;
 
-            _this3.loading = false;
+            _this4.loading = false;
             if (status === 'success') {
-              _this3.quit(true);
-              _this3.$message.success('操作成功');
+              _this4.quit(true);
+              _this4.$message.success('操作成功');
             } else {
-              _this3.$message.error(message || '系统错误，请联系管理员！');
+              _this4.$message.error(message || '系统错误，请联系管理员！');
             }
           }).catch(function (err) {
-            _this3.loading = false;
+            _this4.loading = false;
             if (err.message && err.message !== 'canceled') {
-              _this3.$message.error(err.message);
+              _this4.$message.error(err.message);
             }
           });
         } else {
@@ -35576,7 +35744,7 @@ var processFormvue_type_script_lang_js_components;
       });
     },
     getNodeInfos: function getNodeInfos(nodeId, index) {
-      var _this4 = this;
+      var _this5 = this;
 
       var params = {
         processDefinitionId: this.processDefinitionId,
@@ -35592,63 +35760,63 @@ var processFormvue_type_script_lang_js_components;
             countersignaturetypeText = _res$data.countersignaturetypeText,
             countersignaturetypeCode = _res$data.countersignaturetypeCode;
 
-        _this4.loading = false;
+        _this5.loading = false;
         if (status === 'success') {
-          _this4.nextNode.userInfo = nextUserList;
-          _this4.countersignaturetypeCode = countersignaturetypeCode;
-          _this4.nextNode.countersignaturetypeText = countersignaturetypeText;
-          _this4.isTaskread = nodeExtAttr.isTaskread;
-          _this4.isHandleExplain = nodeExtAttr.isHandleExplain;
-          _this4.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮
-          _this4.presetEdit = nodeExtAttr.presetEdit; //是否展示备选人
-          _this4.isDefSelectedObj = nodeExtAttr.isDefSelectedObj; //是否默认选中
+          _this5.nextNode.userInfo = nextUserList;
+          _this5.countersignaturetypeCode = countersignaturetypeCode;
+          _this5.nextNode.countersignaturetypeText = countersignaturetypeText;
+          _this5.isTaskread = nodeExtAttr.isTaskread;
+          _this5.isHandleExplain = nodeExtAttr.isHandleExplain;
+          _this5.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮
+          _this5.presetEdit = nodeExtAttr.presetEdit; //是否展示备选人
+          _this5.isDefSelectedObj = nodeExtAttr.isDefSelectedObj; //是否默认选中
           if (nodeExtAttr.userSelectionType == 7 || nodeExtAttr.userSelectionType == 8 || nodeExtAttr.userSelectionType == 9 || nodeExtAttr.userSelectionType == 10 || nodeExtAttr.userSelectionType == 11 || nodeExtAttr.userSelectionType == 12) {
-            _this4.getIsShowNextUser(nodeExtAttr && nodeExtAttr.userSelectionType);
+            _this5.getIsShowNextUser(nodeExtAttr && nodeExtAttr.userSelectionType);
           } else {
-            var _isMultiple = _this4.isMultiple(nodeExtAttr.userSelectionType),
+            var _isMultiple = _this5.isMultiple(nodeExtAttr.userSelectionType),
                 multiple = _isMultiple.multiple,
                 _params = _isMultiple.params;
 
-            _this4.multiple = multiple;
-            _this4.params = _params;
+            _this5.multiple = multiple;
+            _this5.params = _params;
           }
           // this.isReadMultiple(nodeExtAttr.userSelectionType);
 
           nextUserList.map(function (item) {
-            if (_this4.multiple && nodeExtAttr.isDefSelectedObj == 1 && nextUserList !== undefined) {
-              _this4.nextNode.nextUser.push(item.userId);
-              _this4.selectUserList.push({
+            if (_this5.multiple && nodeExtAttr.isDefSelectedObj == 1 && nextUserList !== undefined) {
+              _this5.nextNode.nextUser.push(item.userId);
+              _this5.selectUserList.push({
                 showname: item.username,
                 showid: item.userId
               });
             }
 
-            _this4.options.push({
+            _this5.options.push({
               showname: item.username,
               showid: item.userId
             });
           });
-          if (_this4.multiple) {
-            _this4.nextNode.nextReadUserId = [];
+          if (_this5.multiple) {
+            _this5.nextNode.nextReadUserId = [];
           } else {
-            _this4.nextNode.nextReadUserId = '';
+            _this5.nextNode.nextReadUserId = '';
           }
-          if (nextUserList.length > 0 && nodeExtAttr.isDefSelectedObj == 1 && !_this4.multiple) {
-            _this4.nextNode.nextUser = nextUserList[0].userId;
-            _this4.selectUserList.push({
+          if (nextUserList.length > 0 && nodeExtAttr.isDefSelectedObj == 1 && !_this5.multiple) {
+            _this5.nextNode.nextUser = nextUserList[0].userId;
+            _this5.selectUserList.push({
               showname: nextUserList[0].username,
               showid: nextUserList[0].userId
             });
           }
-          _this4.radioList = _this4.options;
+          _this5.radioList = _this5.options;
         } else {
-          _this4.$message.error(message || '系统错误，请联系管理员！');
+          _this5.$message.error(message || '系统错误，请联系管理员！');
         }
-        nodeId && _this4.$refs.selectUser[index].changeInfo();
+        nodeId && _this5.$refs.selectUser[index].changeInfo();
       }).catch(function (err) {
-        _this4.loading = false;
+        _this5.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
@@ -35667,7 +35835,7 @@ var processFormvue_type_script_lang_js_components;
       this.$emit('cancel', false);
     },
     getFind: function getFind() {
-      var _this5 = this;
+      var _this6 = this;
 
       utils_util["a" /* default */].ajax({
         url: api["w" /* findSysCodes */]
@@ -35676,14 +35844,14 @@ var processFormvue_type_script_lang_js_components;
             message = res.message;
 
         if (status === 'success') {
-          _this5.nextNode.noticeType = message.split(',');
+          _this6.nextNode.noticeType = message.split(',');
         } else {
-          _this5.$message.error(message || '系统错误，请联系管理员！');
+          _this6.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this5.loading = false;
+        _this6.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this6.$message.error(err.message);
         }
       });
     },
@@ -35701,15 +35869,15 @@ var processFormvue_type_script_lang_js_components;
         multiple = true;
       }
       if (val == 1 || val == 2 || val == 5) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
         params.only_filid = true;
         if (choiceOrgId) {
           params.filid = choiceOrgId;
         }
       }
       if (val == 5 || val == 6) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
-        params.deptid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
+        params.deptid = this.userModel.orgId;
         if (choiceDeptId) {
           params.deptid = choiceDeptId;
         }
@@ -35718,7 +35886,7 @@ var processFormvue_type_script_lang_js_components;
         }
       }
       if (val == 15 || val == 16) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
         if (pOrgId) {
           params.filid = pOrgId;
         }
@@ -35726,7 +35894,7 @@ var processFormvue_type_script_lang_js_components;
       return { multiple: multiple, params: params };
     },
     getStartFlow: function getStartFlow(processId) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (!processId) {
         return false;
@@ -35746,80 +35914,80 @@ var processFormvue_type_script_lang_js_components;
             data = res.data;
 
         if (status == 'success') {
-          data.nodeInfoMap.nodeExtAttr.submitTipsMsg && _this6.$confirm(data.nodeInfoMap.nodeExtAttr.submitTipsMsg, '提示', {
+          data.nodeInfoMap.nodeExtAttr.submitTipsMsg && _this7.$confirm(data.nodeInfoMap.nodeExtAttr.submitTipsMsg, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {}).catch(function () {
-            _this6.quit();
+            _this7.quit();
           });
-          _this6.customPresetHintMessage = data.customPresetHintMessage;
-          _this6.nextNode.nodeInfo = data.nextNodeList;
-          _this6.nextNode.nextNode = data.nextNodeList[0].nodeId;
-          _this6.isPreset = data.isPreset;
-          _this6.isHideDefaultOperation = data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation;
-          _this6.defaultNextNode = data.nodeInfoMap.nodeExtAttr.defaultNextNode;
-          _this6.isChooseNextNode = data.nodeInfoMap.nodeExtAttr.isChooseNextNode;
-          _this6.isCdjxjTaskHandle = data.isCdjxjTaskHandle;
-          if (_this6.isChooseNextNode == 1) {
-            _this6.operationList = [{ key: 0, value: '默认', list: [] }, { key: 1, value: '自定义', list: [] }];
+          _this7.customPresetHintMessage = data.customPresetHintMessage;
+          _this7.nextNode.nodeInfo = data.nextNodeList;
+          _this7.nextNode.nextNode = data.nextNodeList[0].nodeId;
+          _this7.isPreset = data.isPreset;
+          _this7.isHideDefaultOperation = data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation;
+          _this7.defaultNextNode = data.nodeInfoMap.nodeExtAttr.defaultNextNode;
+          _this7.isChooseNextNode = data.nodeInfoMap.nodeExtAttr.isChooseNextNode;
+          _this7.isCdjxjTaskHandle = data.isCdjxjTaskHandle;
+          if (_this7.isChooseNextNode == 1) {
+            _this7.operationList = [{ key: 0, value: '默认', list: [] }, { key: 1, value: '自定义', list: [] }];
             var arr = [];
             for (var key in data.taskNodeMap) {
               arr.push({ nodeName: data.taskNodeMap[key], nodeId: key });
             }
-            _this6.operationList[0].list = data.nextNodeList;
-            _this6.operationList[1].list = arr;
-            if (_this6.isHideDefaultOperation != 1) {
-              _this6.nextNode.nextOperate = 0;
-              _this6.nextNode.nodeInfo = _this6.operationList[0].list;
-              if (_this6.nextNode.nodeInfo.length > 0) {
-                _this6.nextNode.nextNode = _this6.defaultNextNode || data.nextNodeList[0].nodeId;
+            _this7.operationList[0].list = data.nextNodeList;
+            _this7.operationList[1].list = arr;
+            if (_this7.isHideDefaultOperation != 1) {
+              _this7.nextNode.nextOperate = 0;
+              _this7.nextNode.nodeInfo = _this7.operationList[0].list;
+              if (_this7.nextNode.nodeInfo.length > 0) {
+                _this7.nextNode.nextNode = _this7.defaultNextNode || data.nextNodeList[0].nodeId;
               }
             } else if (data.nodeInfoMap.nodeExtAttr.defaultNextOperate == 1 || data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation == 1) {
               //  this.nextNode.nodeInfo = data.nextNodeList
-              _this6.nextNode.nextOperate = 1;
-              _this6.nextNode.nodeInfo = _this6.operationList[1].list;
-              if (_this6.nextNode.nodeInfo.length > 0) {
-                _this6.nextNode.nextNode = _this6.defaultNextNode || data.nextNodeList[0].nodeId;
+              _this7.nextNode.nextOperate = 1;
+              _this7.nextNode.nodeInfo = _this7.operationList[1].list;
+              if (_this7.nextNode.nodeInfo.length > 0) {
+                _this7.nextNode.nextNode = _this7.defaultNextNode || data.nextNodeList[0].nodeId;
               }
             }
           }
-          _this6.isCustomPreset = data.isCustomPreset;
-          _this6.presetTaskNodeKeyStr = data.presetTaskNodeKeyStr;
-          _this6.presetTaskNodeMap = data.presetTaskNodeMap;
-          _this6.isSinglePage = data.taskExamine.isSinglePage;
-          _this6.isSinglePage && (_this6.nextNode.opinion = data.taskExamine.opinion);
+          _this7.isCustomPreset = data.isCustomPreset;
+          _this7.presetTaskNodeKeyStr = data.presetTaskNodeKeyStr;
+          _this7.presetTaskNodeMap = data.presetTaskNodeMap;
+          _this7.isSinglePage = data.taskExamine.isSinglePage;
+          _this7.isSinglePage && (_this7.nextNode.opinion = data.taskExamine.opinion);
           // this.nextNode.noticeInfo = data.taskExamine.notificationMsg;
-          _this6.nextNode.nodeName = data.taskExamine.nodeName;
-          _this6.canPresetRead = data.canPresetRead;
+          _this7.nextNode.nodeName = data.taskExamine.nodeName;
+          _this7.canPresetRead = data.canPresetRead;
           if (data.canPresetRead) {
             var ids = data.nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
             var names = data.nodeInfoMap.nodeExtAttr.presetReadCandinateNames.split(',');
             ids.map(function (item, index) {
-              _this6.presetReadUserId.push({
+              _this7.presetReadUserId.push({
                 showid: item,
                 showname: names[index]
               });
-              _this6.selectPresetUserList.push({
+              _this7.selectPresetUserList.push({
                 showid: item,
                 showname: names[index]
               });
-              _this6.nextNode.presetReadUserId.push(item);
+              _this7.nextNode.presetReadUserId.push(item);
             });
           }
-          _this6.getNodeInfos();
+          _this7.getNodeInfos();
           // this.getPresetFlowInfo();
-          _this6.isCustomPreset && _this6.$refs.customPreset.getPresetFlowInfo(_this6.nextNode.nextNode);
-          _this6.getFind();
-          _this6.getMessage();
-          _this6.getNodeType();
+          _this7.isCustomPreset && _this7.$refs.customPreset.getPresetFlowInfo(_this7.nextNode.nextNode);
+          _this7.getFind();
+          _this7.getMessage();
+          _this7.getNodeType();
         } else {
-          _this6.$message.error(message || '系统错误，请联系管理员！');
+          _this7.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this6.loading = false;
+        _this7.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this7.$message.error(err.message);
         }
       });
     }
@@ -35837,8 +36005,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = normalizeComponent(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_aaac09fe_render,
-  processFormvue_type_template_id_aaac09fe_staticRenderFns,
+  processFormvue_type_template_id_38d27a4e_render,
+  processFormvue_type_template_id_38d27a4e_staticRenderFns,
   false,
   null,
   null,
@@ -47039,8 +47207,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=e5e62fc8&
-var mainvue_type_template_id_e5e62fc8_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=b795be2e&
+var mainvue_type_template_id_b795be2e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47557,7 +47725,10 @@ var mainvue_type_template_id_e5e62fc8_render = function () {
                                 ),
                                 _vm.active == 3 && _vm.identifyingId
                                   ? _c("es-qr-code", {
-                                      attrs: { content: _vm.identifyingId },
+                                      attrs: {
+                                        content: _vm.identifyingId,
+                                        logo: _vm.qrimg,
+                                      },
                                     })
                                   : _vm._e(),
                                 _vm.active == 9
@@ -47956,11 +48127,11 @@ var mainvue_type_template_id_e5e62fc8_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_e5e62fc8_staticRenderFns = []
-mainvue_type_template_id_e5e62fc8_render._withStripped = true
+var mainvue_type_template_id_b795be2e_staticRenderFns = []
+mainvue_type_template_id_b795be2e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=e5e62fc8&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=b795be2e&
 
 // 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=28f463b9&
 var resetPasswordvue_type_template_id_28f463b9_render = function () {
@@ -48866,6 +49037,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 //
 //
 //
+//
 
 
 
@@ -49182,6 +49354,12 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         this.loginInfo(val == 3);
       }
     },
+    identifyingId: function identifyingId(val) {
+      if (val) {
+        this.loginInfo(this.active == 3);
+      }
+    },
+
     appName: {
       immediate: true,
       handler: function handler(val) {
@@ -49487,7 +49665,9 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.downloadSetup = res.downloadSetup;
       document.title = res.subsystemName;
       this.app = res.appName || res.subsystemName;
-      this.qrimg = res.qrimg || res.qrImg;
+      if (res.qrimg || res.qrImg) {
+        this.qrimg = res.qrimg || res.qrImg;
+      }
       if (res.loginModel) {
         this.loginModel = res.loginModel;
       }
@@ -49783,6 +49963,9 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     initRequestLoginInfo: function initRequestLoginInfo() {
       var _this9 = this;
 
+      if (this.identifyingId == '') {
+        return false;
+      }
       utils_util["a" /* default */].ajax({
         method: 'post',
         url: this.scanAction,
@@ -49972,8 +50155,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_e5e62fc8_render,
-  mainvue_type_template_id_e5e62fc8_staticRenderFns,
+  mainvue_type_template_id_b795be2e_render,
+  mainvue_type_template_id_b795be2e_staticRenderFns,
   false,
   null,
   null,
@@ -49990,8 +50173,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=8fa53c9e&
-var mainvue_type_template_id_8fa53c9e_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=3910f883&
+var mainvue_type_template_id_3910f883_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -50418,11 +50601,11 @@ var mainvue_type_template_id_8fa53c9e_render = function () {
     1
   )
 }
-var mainvue_type_template_id_8fa53c9e_staticRenderFns = []
-mainvue_type_template_id_8fa53c9e_render._withStripped = true
+var mainvue_type_template_id_3910f883_staticRenderFns = []
+mainvue_type_template_id_3910f883_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=8fa53c9e&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=3910f883&
 
 // 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=75d533de&
 var userinfovue_type_template_id_75d533de_render = function () {
@@ -52530,10 +52713,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
     //菜单展开关闭
     icons: Object,
     //logo
-    logo: {
-      type: String,
-      default: 'errorlogo'
-    },
+    logo: String,
     //菜单显示类型
     scene: {
       type: String,
@@ -52896,7 +53076,9 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
   },
   created: function created() {
     var params = utils_util["a" /* default */].getParams() || {};
-    this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
+    if (typeof this.loadHomePage === 'string') {
+      this.homePage = this.loadHomePage;
+    }
     this.isHeader = params.header;
     var sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && utils_util["a" /* default */].setFavicon(sysLogoIco);
@@ -53016,7 +53198,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             this.setTitle(ids[0]);
           }
         } else if (sessionStorage.getItem('jump') && this.isHistory) {
-          var _ids = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+          var _ids = this.getId(this.menus, sessionStorage.getItem('jump'));
           if (_ids) {
             this.defaultActive = _ids;
             this.navIds = _ids;
@@ -53028,14 +53210,14 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             hash = hash.split('?')[0];
           }
           if (hash !== '#/' && hash !== '#/main') {
-            var _ids2 = this.getId(this.menus, utils_util["a" /* default */].win.location.hash, true);
+            var _ids2 = this.getId(this.menus, utils_util["a" /* default */].win.location.hash);
             if (_ids2) {
               this.defaultActive = _ids2;
               this.navIds = _ids2;
               this.setTitle(_ids2[0]);
             }
           } else if (sessionStorage.getItem('jump') && this.isHistory) {
-            var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'), true);
+            var _ids3 = this.getId(this.menus, sessionStorage.getItem('jump'));
             if (_ids3) {
               this.defaultActive = _ids3;
               this.navIds = _ids3;
@@ -53118,7 +53300,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             hash = hash.split('?')[0];
           }
           var jump = sessionStorage.getItem('jump');
-          if (!applicationid && (!jump || !this.isHistory) && hash === '#/' && hash === '#/main') {
+          if (!applicationid && (!jump || !this.isHistory) && (hash === '#/' || hash === '#/main') || jump == results[i]) {
             this.homePage = typeof this.loadHomePage === 'string' ? this.loadHomePage : results[i];
             if (this.isHomePage && this.homePage) {
               if (this.menus && this.menus.length) {
@@ -53230,17 +53412,65 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         }
       });
     },
-    jumpMenu: function jumpMenu(res, flag, param) {
-      var option = { url: res, flag: flag, param: param };
+
+    /**
+     * @desc 跳转菜单
+     * @param {Object/String} [res]    - 菜单id（多个用,隔开）或url地址或系统菜单数据对象
+     * @param {Boolean} [isUrl] - res是否是url地址
+     * @param {Object} [param] - 拼接地址后的参数
+     */
+    jumpMenu: function jumpMenu(res, isUrl, path) {
+      var _this5 = this;
+
+      var option = { url: res, isUrl: isUrl, path: path };
       if (utils_util["a" /* default */].isObject(res)) {
-        option = main_src_mainvue_type_script_lang_js_extends({}, option, res);
+        if (res.urlopenmode == 1) {
+          utils_util["a" /* default */].win.open(res.url);
+          return;
+        } else if (res.urlopenmode == 2) {
+          location.href = res.url;
+          return;
+        } else {
+          option = main_src_mainvue_type_script_lang_js_extends({}, option, res);
+        }
       }
       var ids = void 0;
       if (typeof option.url === 'string') {
-        if (option.flag) {
-          ids = this.getId(this.menus, option.url, true);
+        if (option.isUrl || option.url.indexOf('.html') > -1 || option.url.indexOf('.dhtml') > -1 || option.url.indexOf('/#/') > -1 || option.url.indexOf('#/') > -1) {
+          option.isUrlc = true;
+          ids = this.getId(this.menus, option.url);
           if (!ids) {
-            this.$message.error('未在菜单栏中找到此地址');
+            if (option.url.indexOf('.html') === -1 && option.url.indexOf('#/') === -1) {
+              this.method = 'iframe';
+              this.refresh = false;
+              this.page = option.url;
+            } else {
+              this.method = 'router';
+              var routes = this.$router.options.routes;
+              if (routes) {
+                var _path = this.hasRouter(routes, option.url);
+                if (_path) {
+                  var params = utils_util["a" /* default */].getParams({ url: option.url });
+                  this.$router.push({
+                    path: _path,
+                    query: params
+                  });
+                } else {
+                  if (this.loadWujie === false || this.downgrade && isIE) {
+                    this.method = 'iframe';
+                    this.refresh = false;
+                    this.page = option.url;
+                  } else {
+                    this.method = 'wujie';
+                    this.wjName = 'application' + Date.now();
+                    this.page = this.host + option.url;
+                  }
+                }
+              }
+            }
+            this.$nextTick(function () {
+              _this5.refresh = true;
+            });
             return;
           }
         } else {
@@ -53251,14 +53481,20 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       }
       this.setDefault(this.menus, ids, option.param);
     },
-    getId: function getId(arry, res, path) {
-      if (!res) {
+
+    /**
+     * @desc 获取菜单层级id
+     * @param {Array} [menus]    - 系统菜单数据对象
+     * @param {String} [url] - 菜单id或url地址
+     */
+    getId: function getId(menus, url) {
+      if (!url) {
         return false;
       }
-      for (var i = 0; i < arry.length; i++) {
-        var item = arry[i];
+      for (var i = 0; i < menus.length; i++) {
+        var item = menus[i];
         if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
-          var id = this.getId(item.children, res, path);
+          var id = this.getId(item.children, url);
           if (id) {
             if (typeof id === 'string') {
               this.isTabs = false;
@@ -53271,7 +53507,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             return id;
           }
         } else if (Object.prototype.hasOwnProperty.call(item, 'fourthTabs') && item.fourthTabs.length) {
-          var _id = this.getId(item.fourthTabs, res, path);
+          var _id = this.getId(item.fourthTabs, url);
           if (_id) {
             if (typeof _id === 'string') {
               this.isTabs = true;
@@ -53283,12 +53519,12 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             }
             return _id;
           }
-        } else if (item.id === res || item.url == res) {
+        } else if (item.id === url || item.url == url) {
           return item.id;
         } else {
-          if (path && item.url) {
-            var url = new URL(item.url, window.location.origin);
-            if (url.hash == res) {
+          if (item.url) {
+            var _url2 = new URL(item.url, window.location.origin);
+            if (_url2.hash == _url2) {
               return item.id;
             }
           }
@@ -53299,67 +53535,60 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
     //获取应用导航菜单
     getMenu: function getMenu() {
-      var _this5 = this;
+      var _this6 = this;
 
       var param = this.menuCode ? { menuCode: this.menuCode } : {};
       var params = main_src_mainvue_type_script_lang_js_extends({}, this.param, param);
       utils_util["a" /* default */].ajax({ url: this.action, params: params }).then(function (res) {
         if (res.rCode === 0) {
           if (res.results && res.results.length) {
-            _this5.menus = JSON.parse(JSON.stringify(res.results));
-            var applicationid = utils_util["a" /* default */].getParams('applicationid') || utils_util["a" /* default */].getParams('applicationId');
-            if (applicationid) {
-              var ids = _this5.getId(_this5.menus, applicationid);
-              if (ids) {
-                _this5.defaultActive = ids;
-              }
-            } else if (sessionStorage.getItem('jump') && _this5.isHistory) {
-              var _ids4 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
-              if (_ids4) {
-                _this5.defaultActive = _ids4;
-                _this5.navIds = _ids4;
-                _this5.setTitle(_ids4[0]);
-              }
-            } else if (utils_util["a" /* default */].win.location.hash) {
-              var hash = utils_util["a" /* default */].win.location.hash;
-              if (hash) {
-                hash = hash.split('?')[0];
-              }
-              if (hash !== '#/' && hash !== '#/main') {
-                var _ids5 = _this5.getId(_this5.menus, utils_util["a" /* default */].win.location.hash, true);
-                if (_ids5) {
-                  _this5.defaultActive = _ids5;
-                  _this5.navIds = _ids5;
-                  _this5.setTitle(_ids5[0]);
-                }
-              } else if (sessionStorage.getItem('jump') && _this5.isHistory) {
-                var _ids6 = _this5.getId(_this5.menus, sessionStorage.getItem('jump'), true);
-                if (_ids6) {
-                  _this5.defaultActive = _ids6;
-                  _this5.navIds = _ids6;
-                  _this5.setTitle(_ids6[0]);
-                }
-              }
-            }
-            _this5.setTips(_this5.menus);
-            utils_store.set('nav', _this5.menus);
-            _this5.setMenu(_this5.menus);
+            _this6.menus = JSON.parse(JSON.stringify(res.results));
+            _this6.setTips(_this6.menus);
+            utils_store.set('nav', _this6.menus);
+            _this6.setMenu(_this6.menus);
           } else {
-            _this5.$message.error('未分配菜单权限，请联系管理员！');
+            _this6.$message.error('未分配菜单权限，请联系管理员！');
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this5.$message.error(msg);
+          _this6.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this6.$message.error(err.message);
         }
       });
     },
 
     //设置默认左侧导航
     setMenu: function setMenu(res) {
+      var applicationid = utils_util["a" /* default */].getParams('applicationid') || utils_util["a" /* default */].getParams('applicationId');
+      if (applicationid) {
+        var ids = this.getId(this.menus, applicationid);
+        if (ids) {
+          this.defaultActive = ids;
+        }
+      } else if (utils_util["a" /* default */].win.location.hash) {
+        var hash = utils_util["a" /* default */].win.location.hash;
+        if (hash) {
+          hash = hash.split('?')[0];
+        }
+        if (hash !== '#/' && hash !== '#/main') {
+          var _ids4 = this.getId(this.menus, utils_util["a" /* default */].win.location.hash);
+          if (_ids4) {
+            this.defaultActive = _ids4;
+            this.navIds = _ids4;
+            this.setTitle(_ids4[0]);
+          }
+        }
+      } else if (sessionStorage.getItem('jump') && this.isHistory) {
+        var _ids5 = this.getId(this.menus, sessionStorage.getItem('jump'));
+        if (_ids5) {
+          this.defaultActive = _ids5;
+          this.navIds = _ids5;
+          this.setTitle(_ids5[0]);
+        }
+      }
       if (this.defaultActive && this.defaultActive.length) {
         this.isDefault = false;
         this.setDefault(res, this.defaultActive);
@@ -53367,9 +53596,9 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         if (this.homePage || !utils_util["a" /* default */].getStorage('mainConfig')) {
           this.isDefault = true;
           if (this.homePage && (!this.defaultActive || !this.defaultActive.length)) {
-            var ids = this.getId(this.menus, this.homePage);
-            if (ids) {
-              this.defaultActive = ids;
+            var _ids6 = this.getId(this.menus, this.homePage);
+            if (_ids6) {
+              this.defaultActive = _ids6;
               this.isDefault = false;
               this.setDefault(res, this.defaultActive);
               return false;
@@ -53431,7 +53660,20 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             if (id && this.menu[0].id !== id) {
               this.active.push(id);
             } else {
-              this.handleJump(this.menu[0].url, this.menu[0].urlopenmode, this.menu[0]);
+              var _hash = utils_util["a" /* default */].win.location.hash;
+              if (_hash) {
+                _hash = _hash.split('?')[0];
+                if (_hash !== '#/' && _hash !== '#/main') {
+                  this.handleJump(_hash);
+                  return;
+                }
+              }
+              var jump = sessionStorage.getItem('jump');
+              if (jump) {
+                this.handleJump(jump);
+              } else {
+                this.handleJump(this.menu[0].url, this.menu[0].urlopenmode, this.menu[0]);
+              }
             }
           }
         }
@@ -53475,11 +53717,11 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
     //遍历设置菜单气泡提醒
     setTips: function setTips(obj) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (Array.isArray(obj)) {
         obj.forEach(function (item) {
-          _this6.setTips(item);
+          _this7.setTips(item);
         });
       } else {
         if (obj && Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
@@ -53489,7 +53731,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         var flag = false;
         if (obj.children && obj.children.length) {
           obj.children.forEach(function (item) {
-            if (_this6.setTips(item)) {
+            if (_this7.setTips(item)) {
               flag = true;
             }
           });
@@ -53499,7 +53741,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
           obj.fourthTabs.forEach(function (item) {
-            if (_this6.setTips(item)) {
+            if (_this7.setTips(item)) {
               flag = true;
             }
           });
@@ -53557,7 +53799,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             break;
           }
         }
-      } else {
+      } else if (active && active.length) {
         this.navs = [];
         this.subsystem = [];
         this.menu = res;
@@ -53591,11 +53833,11 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             }
             if (item.fourthTabs && item.fourthTabs.length) {
               index++;
-              var _url2 = this.getUrl(item.fourthTabs, active, index, param);
-              if (_url2) {
+              var _url3 = this.getUrl(item.fourthTabs, active, index, param);
+              if (_url3) {
                 this.$set(this, 'tabs', item.fourthTabs);
               }
-              return _url2;
+              return _url3;
             }
           }
         } else if (item.children && item.children.length) {
@@ -53646,11 +53888,11 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
               var subNode = this.getFirst(node);
               if (subNode) {
                 this.active = subNode.id;
-                this.navIds = [node.id].concat(this.getId(node.children, subNode.url, true));
+                this.navIds = [node.id].concat(this.getId(node.children, subNode.url));
               }
             }
           } else {
-            this.navIds = this.getId(this.menus, node.url, true);
+            this.navIds = this.getId(this.menus, node.url);
             this.setTitle(this.navIds[0]);
             this.tabsId = fourthTabs ? node.id : '';
           }
@@ -53668,7 +53910,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
               var _subNode = this.getFirst(node);
               if (_subNode) {
                 this.active = _subNode.id;
-                this.navIds = [node.id].concat(this.getId(node.children, _subNode.url, true));
+                this.navIds = [node.id].concat(this.getId(node.children, _subNode.url));
               }
             }
             this.isSide = true;
@@ -53687,7 +53929,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             var _subNode2 = this.getFirst(node);
             this.active = [node.id];
             if (_subNode2 && node.id !== _subNode2.id) {
-              this.navIds = this.getId(this.menus, _subNode2.url, true);
+              this.navIds = this.getId(this.menus, _subNode2.url);
               this.$set(this.active, 1, _subNode2.id);
             }
           }
@@ -53711,7 +53953,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
                   } else {
                     this.active = tab.id;
                   }
-                  this.navIds = this.getId(this.menus, tab.url, true);
+                  this.navIds = this.getId(this.menus, tab.url);
                 }
               } else {
                 var _tab = (node.fourthTabs || []).filter(function (item) {
@@ -53720,9 +53962,9 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
                 if (_tab) {
                   this.tabs = node.fourthTabs;
                   this.tabsId = _tab.id;
-                  this.navIds = this.getId(this.menus, _tab.url, true);
+                  this.navIds = this.getId(this.menus, _tab.url);
                 } else {
-                  this.navIds = this.getId(this.menus, node.url, true);
+                  this.navIds = this.getId(this.menus, node.url);
                 }
               }
             } else {
@@ -53730,7 +53972,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
                 this.tabs = node.fourthTabs;
                 this.tabsId = this.tabs[0].id;
                 this.handleJump(this.tabs[0].url, this.tabs[0].urlopenmode, this.tabs[0]);
-                this.navIds = this.getId(this.menus, this.tabs[0].url, true);
+                this.navIds = this.getId(this.menus, this.tabs[0].url);
               }
             }
           } else {
@@ -53743,14 +53985,14 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
                 } else {
                   this.active = _subNode3.id;
                 }
-                this.navIds = this.getId(this.menus, _subNode3.url, true);
+                this.navIds = this.getId(this.menus, _subNode3.url);
               }
             }
           }
           break;
         case 'tabs':
           this.tabsId = node.id;
-          this.navIds = this.getId(this.menus, node.url, true);
+          this.navIds = this.getId(this.menus, node.url);
           break;
       }
       if (node.url) {
@@ -53771,19 +54013,19 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           }
         }
       } else {
-        var _path = res.path;
-        if (_path !== '/' && _path !== '/404') {
-          _path = _path.replace(_path[1], _path[1].toLowerCase());
+        var _path2 = res.path;
+        if (_path2 !== '/' && _path2 !== '/404') {
+          _path2 = _path2.replace(_path2[1], _path2[1].toLowerCase());
         }
         var pathname = url.substring(url.indexOf('#/') + 1);
         pathname = pathname.replace(pathname[1], pathname[1].toLowerCase()).split('?')[0];
-        if (res.path !== '/' && pathname == _path) {
+        if (res.path !== '/' && pathname == _path2) {
           return pathname;
         }
         if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
-          var _path2 = this.hasRouter(res.children, url);
-          if (_path2) {
-            return _path2;
+          var _path3 = this.hasRouter(res.children, url);
+          if (_path3) {
+            return _path3;
           }
         }
       }
@@ -53793,7 +54035,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
     //头部工具交互事件
     handleClick: function handleClick(res) {
-      var _this7 = this;
+      var _this8 = this;
 
       var type = res.type;
 
@@ -53814,7 +54056,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             this.setMenu(this.menus);
           }
           this.$nextTick(function () {
-            _this7.reset = true;
+            _this8.reset = true;
           });
           break;
         case 'user':
@@ -53842,21 +54084,21 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
     //刷新子页面、子路由
     handleRefresh: function handleRefresh() {
-      var _this8 = this;
+      var _this9 = this;
 
       if (this.method === 'iframe') {
         this.page = utils_util["a" /* default */].handlerUrl(this.page);
       } else {
         this.refresh = false;
         this.$nextTick(function () {
-          _this8.refresh = true;
+          _this9.refresh = true;
         });
       }
     },
 
     //跳转页面
     handleJump: function handleJump(page, type, res, param) {
-      var _this9 = this;
+      var _this10 = this;
 
       console.log(page);
       var prevPage = sessionStorage.getItem('jump');
@@ -53876,7 +54118,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         utils_util["a" /* default */].win.open(page);
       } else if (type == 2) {
         location.href = page;
-      } else if (type == 3) {
+      } else if (type == 3 || this.loadWujie === false || this.downgrade && isIE) {
         this.method = 'iframe';
         this.refresh = false;
         this.page = utils_util["a" /* default */].handlerUrl(page, param);
@@ -53887,7 +54129,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           this.wjName = 'singlespa';
           this.page = this.host + page;
           this.$nextTick(function () {
-            _this9.refresh = true;
+            _this10.refresh = true;
           });
         } else if (urls[0].indexOf('.dhtml') > 0 || urls[0].indexOf('.html') > 0 && urls[0].indexOf('.html#') === -1) {
           this.method = 'iframe';
@@ -53919,7 +54161,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
                   query: params
                 });
                 this.$nextTick(function () {
-                  _this9.refresh = true;
+                  _this10.refresh = true;
                 });
               } else {
                 var urlopenmode = utils_util["a" /* default */].getParams({
@@ -53935,7 +54177,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
                   this.wjName = res && res.appCode ? res.appCode : 'application';
                   this.page = this.host + page;
                   this.$nextTick(function () {
-                    _this9.refresh = true;
+                    _this10.refresh = true;
                   });
                 }
               }
@@ -53947,7 +54189,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         }
       }
       this.$nextTick(function () {
-        _this9.showPage = true;
+        _this10.showPage = true;
       });
     },
 
@@ -54059,7 +54301,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
     //监听改变菜单
     handleListener: function handleListener() {
-      var _this10 = this;
+      var _this11 = this;
 
       utils_util["a" /* default */].win.addEventListener('message', function (e) {
         var msg = e.data;
@@ -54068,14 +54310,14 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           if (typeof res === 'string') {
             res = res.split(',');
           }
-          _this10.setDefault(_this10.menus, res);
+          _this11.setDefault(_this11.menus, res);
         }
       }, false);
     },
 
     //开启weosocket
     initWebSocket: function initWebSocket() {
-      var _this11 = this;
+      var _this12 = this;
 
       this.webSocket = utils_util["a" /* default */].socket({
         url: api["cc" /* wss */],
@@ -54085,32 +54327,32 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
           for (var i in data) {
             if (data[i] !== null && data[i] !== undefined) {
               if (i === 'onlineUserNums' && data[i] > 0) {
-                _this11.online = data[i];
+                _this12.online = data[i];
               }
               if (i === 'sysMsgNums') {
-                _this11.notice = data[i];
-                if (_this11.showMsg) {
-                  _this11.$refs.message.getMsg(true);
+                _this12.notice = data[i];
+                if (_this12.showMsg) {
+                  _this12.$refs.message.getMsg(true);
                 }
               }
               if (i === 'menuTipsMap') {
-                _this11.menuTips = data[i];
+                _this12.menuTips = data[i];
               }
               if (i === 'sysMsgList') {
-                _this11.sysMsg = data[i];
+                _this12.sysMsg = data[i];
               }
               if (i === 'extraData') {
-                _this11.extraData = data[i];
+                _this12.extraData = data[i];
               }
             }
           }
-          if (_this11.$store) {
+          if (_this12.$store) {
             try {
-              _this11.$store.commit('websocket', data);
+              _this12.$store.commit('websocket', data);
             } catch (error) {}
           }
-          if (_this11.$eventBus) {
-            _this11.$eventBus.$emit('websocket', data);
+          if (_this12.$eventBus) {
+            _this12.$eventBus.$emit('websocket', data);
           }
           if (utils_util["a" /* default */].win.eventBus) {
             utils_util["a" /* default */].win.eventBus.$emit('websocket', data);
@@ -54119,13 +54361,13 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       });
     },
     handleOpened: function handleOpened(res) {
-      var _this12 = this;
+      var _this13 = this;
 
       if (res === undefined) {
         this.sysMsg = [];
       } else if (res == false && this.sysMsg.length) {
         this.sysMsgOut = setTimeout(function () {
-          _this12.sysMsg = [];
+          _this13.sysMsg = [];
         }, 3000);
       } else if (this.sysMsgOut) {
         clearTimeout(this.sysMsgOut);
@@ -54147,7 +54389,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       }
     },
     handleReLogin: function handleReLogin(res) {
-      var _this13 = this;
+      var _this14 = this;
 
       if (res && typeof res == 'string') {
         res = JSON.parse(res);
@@ -54178,7 +54420,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         this.timer = setTimeout(function () {
           console.log('handleReLogin');
           sessionStorage.setItem('remind', 1);
-          _this13.$confirm(msg, btn).then(function () {
+          _this14.$confirm(msg, btn).then(function () {
             utils_util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
             var loginPage = utils_util["a" /* default */].getStorage('login') || utils_util["a" /* default */].getStorage('loginPage');
             try {
@@ -54265,8 +54507,8 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_8fa53c9e_render,
-  mainvue_type_template_id_8fa53c9e_staticRenderFns,
+  mainvue_type_template_id_3910f883_render,
+  mainvue_type_template_id_3910f883_staticRenderFns,
   false,
   null,
   null,
@@ -56459,8 +56701,8 @@ player_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var player = (player_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=31151606&
-var mainvue_type_template_id_31151606_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
+var mainvue_type_template_id_28375a46_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -56473,13 +56715,6 @@ var mainvue_type_template_id_31151606_render = function () {
         staticClass: "es-qrcode-img",
         attrs: { width: _vm._width, height: _vm._height, alt: "二维码图片" },
       }),
-      _vm.logo
-        ? _c("img", {
-            ref: "qrcodeLogo",
-            staticClass: "es-qrcode-logo",
-            attrs: { src: _vm.logo, alt: "二维码logo" },
-          })
-        : _vm._e(),
       _c("canvas", {
         ref: "canvas",
         staticClass: "canvas",
@@ -56488,11 +56723,11 @@ var mainvue_type_template_id_31151606_render = function () {
     ]
   )
 }
-var mainvue_type_template_id_31151606_staticRenderFns = []
-mainvue_type_template_id_31151606_render._withStripped = true
+var mainvue_type_template_id_28375a46_staticRenderFns = []
+mainvue_type_template_id_28375a46_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=31151606&
+// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=script&lang=js&
 //
@@ -56597,7 +56832,7 @@ var QRCode = __webpack_require__(24);
       var _this3 = this;
 
       var qrcodeImg = this.$refs.qrcodeImg;
-      var qrcodeLogo = this.$refs.qrcodeLogo;
+      //let qrcodeLogo = this.$refs.qrcodeLogo;
       var canvas = this.$refs.canvas;
       var option = utils_util["a" /* default */].extend({}, this.option, {
         width: this._width,
@@ -56615,6 +56850,8 @@ var QRCode = __webpack_require__(24);
             //获取图片
             ctx.drawImage(qrcodeImg, 0, 0, _this3._width, _this3._height);
             if (_this3.logo && _this3.logo.indexOf('.') > -1) {
+              var logo = new Image();
+              logo.src = _this3.logo;
               //设置logo大小
               var logoPosition = (_this3._width - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
@@ -56632,7 +56869,10 @@ var QRCode = __webpack_require__(24);
               ctx.arcTo(x, y, x + w, y, r);
               ctx.closePath();
               ctx.fill(); */
-              ctx.drawImage(qrcodeLogo, logoPosition, logoPosition, 46, 46);
+              logo.onload = function () {
+                ctx.drawImage(logo, logoPosition, logoPosition, 46, 46);
+                qrcodeImg.src = canvas.toDataURL();
+              };
             } else if (_this3.text) {
               //设置字体
               var fpadd = 10; //规定内间距
@@ -56668,8 +56908,8 @@ var QRCode = __webpack_require__(24);
 
 var qr_code_src_main_component = normalizeComponent(
   packages_qr_code_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_31151606_render,
-  mainvue_type_template_id_31151606_staticRenderFns,
+  mainvue_type_template_id_28375a46_render,
+  mainvue_type_template_id_28375a46_staticRenderFns,
   false,
   null,
   null,
@@ -72081,8 +72321,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=789e2154&
-var mainvue_type_template_id_789e2154_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=031cebad&
+var mainvue_type_template_id_031cebad_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -72462,11 +72702,11 @@ var mainvue_type_template_id_789e2154_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_789e2154_staticRenderFns = []
-mainvue_type_template_id_789e2154_render._withStripped = true
+var mainvue_type_template_id_031cebad_staticRenderFns = []
+mainvue_type_template_id_031cebad_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=789e2154&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=031cebad&
 
 // CONCATENATED MODULE: ./packages/upload/src/picture.js
 /* harmony default export */ var picture = ({
@@ -73204,7 +73444,9 @@ var mainvue_type_script_lang_js_props;
               }
             });
             _this3.filesTotalSize = filesTotalSize;
-            _this3.$emit('input', _this3.lists.length ? _this3.lists : '');
+            if (_this3.lists.length) {
+              _this3.$emit('input', _this3.lists);
+            }
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
@@ -73554,8 +73796,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_789e2154_render,
-  mainvue_type_template_id_789e2154_staticRenderFns,
+  mainvue_type_template_id_031cebad_render,
+  mainvue_type_template_id_031cebad_staticRenderFns,
   false,
   null,
   null,
@@ -74032,7 +74274,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.63',
+  version: '0.5.65',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,