eoss-ui 0.5.81-beta6 → 0.5.81-beta7

package/lib/eoss-ui.common.js

@@ -6879,8 +6879,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=04c7a78c&
-var mainvue_type_template_id_04c7a78c_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=15de25d9&
+var mainvue_type_template_id_15de25d9_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6901,7 +6901,7 @@ var mainvue_type_template_id_04c7a78c_render = function () {
       attrs: {
         "label-width": "0",
         "element-loading-background": "rgba(0, 0, 0, 0.65)",
-        model: _vm.tag === "div" ? "" : _vm.datas,
+        model: _vm.tag === "div" ? "" : _vm.list,
         "element-loading-text": _vm.tableLoadingText,
       },
     },
@@ -6967,10 +6967,10 @@ var mainvue_type_template_id_04c7a78c_render = function () {
                         (_vm.theadBorder && _vm.border != "none"
                           ? " es-thead-border"
                           : ""),
-                      attrs: { data: _vm.datas },
+                      attrs: { data: _vm.list },
                       on: {
                         "update:data": function ($event) {
-                          _vm.datas = $event
+                          _vm.list = $event
                         },
                       },
                     },
@@ -7152,7 +7152,7 @@ var mainvue_type_template_id_04c7a78c_render = function () {
                       _vm._v("共" + _vm._s(_vm.config.totalCount) + "条，"),
                     ]),
                     _c("span", [
-                      _vm._v("已加载" + _vm._s(_vm.datas.length) + "条"),
+                      _vm._v("已加载" + _vm._s(_vm.list.length) + "条"),
                     ]),
                   ])
                 : _vm.page
@@ -7190,11 +7190,11 @@ var mainvue_type_template_id_04c7a78c_render = function () {
     1
   )
 }
-var mainvue_type_template_id_04c7a78c_staticRenderFns = []
-mainvue_type_template_id_04c7a78c_render._withStripped = true
+var mainvue_type_template_id_15de25d9_staticRenderFns = []
+mainvue_type_template_id_15de25d9_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=04c7a78c&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=15de25d9&
 
 // 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 () {
@@ -9715,6 +9715,14 @@ var mainvue_type_script_lang_js_components, _watch;
         return this.data;
       },
       set: function set(val) {
+        var _this3 = this;
+
+        if (this.list && this.list.length) {
+          this.$nextTick(function () {
+            _this3.list = val;
+          });
+          console.log(val, 7777788);
+        }
         this.$emit('update:data', val);
         return val;
       }
@@ -9773,18 +9781,12 @@ var mainvue_type_script_lang_js_components, _watch;
       this.doLayout();
     },
 
-    // data: {
-    //   deep: true,
-    //   handler(val) {
-    //     if (
-    //       this.page &&
-    //       typeof this.page === 'object' &&
-    //       !Object.prototype.hasOwnProperty.call(this.page, 'totalCount')
-    //     ) {
-    //       this.config.totalCount = val.length - this.lose;
-    //     }
-    //   }
-    // },
+    data: {
+      deep: true,
+      handler: function handler() {
+        this.list = this.setData();
+      }
+    },
     page: function page() {
       this.resetHeight();
       this.doLayout();
@@ -9808,7 +9810,7 @@ var mainvue_type_script_lang_js_components, _watch;
       }
     },
     checked: function checked(newVal) {
-      this.datas.length && this.checkSelect(newVal);
+      this.list.length && this.checkSelect(newVal);
     },
 
     thead: {
@@ -9850,6 +9852,7 @@ var mainvue_type_script_lang_js_components, _watch;
   }, _watch['config.pageNum'] = function configPageNum() {
     if (this.data.length) {
       this.$refs.oaTable && this.$refs.oaTable.resetScroll && this.$refs.oaTable.resetScroll(0, 0);
+      this.list = this.setData();
     }
   }, _watch.height = {
     immediate: true,
@@ -9872,10 +9875,10 @@ var mainvue_type_script_lang_js_components, _watch;
     }
   }, _watch),
   beforeCreate: function beforeCreate() {
-    var _this3 = this;
+    var _this4 = this;
 
     this.getTableData = Object(external_throttle_debounce_["debounce"])(500, function (res) {
-      _this3.getTableDatas(res);
+      _this4.getTableDatas(res);
     });
   },
   created: function created() {
@@ -9886,11 +9889,27 @@ var mainvue_type_script_lang_js_components, _watch;
     this.chekOpenTotalArea();
   },
   mounted: function mounted() {
-    this.datas.length && this.checkSelect(this.checked);
+    if (this.data.length) {
+      this.list = this.setData();
+    }
+    this.list.length && this.checkSelect(this.checked);
     this.resetHeight();
   },
 
   methods: {
+    setData: function setData() {
+      var _this5 = this;
+
+      if (this.page && (mainvue_type_script_lang_js_typeof(this.page) === 'object' && (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') || this.page.totalCount == 0) || this.page === true)) {
+        this.config.totalCount = this.data.length - this.lose;
+      }
+      if (this.page && this.data.length > this.config.pageSize) {
+        return this.data.filter(function (item, index) {
+          return index > (_this5.config.pageNum - 1) * _this5.config.pageSize - 1 && index < _this5.config.pageNum * _this5.config.pageSize;
+        });
+      }
+      return this.data;
+    },
     getRequestKey: function getRequestKey(config) {
       var method = config.method,
           url = config.url,
@@ -9900,55 +9919,55 @@ var mainvue_type_script_lang_js_components, _watch;
       return [method, url, external_qs_default.a.stringify(params), external_qs_default.a.stringify(data)].join('&');
     },
     getOptions: function getOptions(res) {
-      var _this4 = this;
+      var _this6 = this;
 
       var sysCodes = [];
       res.forEach(function (item) {
         if (item.sysCode || item.url) {
           item.sysCode && sysCodes.push(item.sysCode);
           var params = utils_util["a" /* default */].extend({}, item.sysCode ? { sysAppCode: item.sysCode, code: item.sysCode } : {}, item.param ? item.param : {});
-          var key = _this4.getRequestKey({
-            method: _this4.method,
-            url: item.sysCode ? _this4.findCode : item.url,
+          var key = _this6.getRequestKey({
+            method: _this6.method,
+            url: item.sysCode ? _this6.findCode : item.url,
             params: params,
             data: {}
           });
-          if (!_this4.requests.includes(key)) {
+          if (!_this6.requests.includes(key)) {
             utils_util["a" /* default */].ajax({
-              url: item.sysCode ? _this4.findCode : item.url,
-              method: _this4.method,
+              url: item.sysCode ? _this6.findCode : item.url,
+              method: _this6.method,
               params: params,
               data: params
             }).then(function (res) {
               if (res.rCode === 0) {
                 if (item.type == 'ganged') {
-                  _this4.$set(_this4.options, item.sysCode || item.field || item.prop, [JSON.parse(JSON.stringify(res.results))]);
+                  _this6.$set(_this6.options, item.sysCode || item.field || item.prop, [JSON.parse(JSON.stringify(res.results))]);
                   if (item.sysCode) {
-                    bus.$emit(item.sysCode, JSON.parse(JSON.stringify(_this4.options[item.sysCode])));
+                    bus.$emit(item.sysCode, JSON.parse(JSON.stringify(_this6.options[item.sysCode])));
                   }
                 } else {
-                  _this4.$set(_this4.options, item.sysCode || item.field || item.prop, JSON.parse(JSON.stringify(res.results)));
+                  _this6.$set(_this6.options, item.sysCode || item.field || item.prop, JSON.parse(JSON.stringify(res.results)));
                   if (item.sysCode) {
                     bus.$emit(item.sysCode, JSON.parse(JSON.stringify(res.results)));
                   }
                 }
-                _this4.requests.push(key);
+                _this6.requests.push(key);
               } else {
                 var msg = res.msg || '系统错误，请联系管理员！';
-                _this4.$message.error(msg);
+                _this6.$message.error(msg);
               }
             }).catch(function (err) {
               if (err.message && err.message !== 'canceled') {
-                _this4.$message.error(err.message);
+                _this6.$message.error(err.message);
               }
             });
           }
         } else {
           if (item.childHead && item.childHead.length) {
-            _this4.getOptions(item.childHead);
+            _this6.getOptions(item.childHead);
           }
           if (item.children && item.children.length) {
-            _this4.getOptions(item.children);
+            _this6.getOptions(item.children);
           }
         }
       });
@@ -9960,7 +9979,7 @@ var mainvue_type_script_lang_js_components, _watch;
       return utils_util["a" /* default */].getObjectType(item) === 'object';
     },
     chekOpenTotalArea: function chekOpenTotalArea() {
-      var _this5 = this;
+      var _this7 = this;
 
       if (this.total || this.showSummary) {
         this.showTotal = true;
@@ -9969,7 +9988,7 @@ var mainvue_type_script_lang_js_components, _watch;
       var arr = JSON.parse(JSON.stringify(this.theads));
       arr.forEach(function (item) {
         if (item.total) {
-          _this5.showTotal = true;
+          _this7.showTotal = true;
         }
       });
     },
@@ -10016,13 +10035,13 @@ var mainvue_type_script_lang_js_components, _watch;
       }
     },
     getRow: function getRow(thead, obj) {
-      var _this6 = this;
+      var _this8 = this;
 
       thead.forEach(function (item) {
         if (item.field) {
           obj[item['field']] = item.defaultValue || '';
         } else if (item.children && item.children.length) {
-          _this6.getRow(item.children, obj);
+          _this8.getRow(item.children, obj);
         }
       });
     },
@@ -10049,27 +10068,27 @@ var mainvue_type_script_lang_js_components, _watch;
       });
     },
     checkSelect: function checkSelect(newVal) {
-      var _this7 = this;
+      var _this9 = this;
 
       this.$nextTick(function () {
         if (utils_util["a" /* default */].getObjectType(newVal) === 'array') {
           newVal.forEach(function (row) {
             if (utils_util["a" /* default */].isObject(row)) {
-              _this7.$refs.oaTable.toggleRowSelection(row, true);
-            } else _this7.datas.forEach(function (item) {
-              if (item[_this7.checkedKey] === row) {
-                _this7.$refs.oaTable.toggleRowSelection(item, true);
+              _this9.$refs.oaTable.toggleRowSelection(row, true);
+            } else _this9.list.forEach(function (item) {
+              if (item[_this9.checkedKey] === row) {
+                _this9.$refs.oaTable.toggleRowSelection(item, true);
                 return;
               }
             });
           });
         } else if (newVal === true) {
-          _this7.toggleAllSelection();
+          _this9.toggleAllSelection();
         }
       });
     },
     getTheads: function getTheads() {
-      var _this8 = this;
+      var _this10 = this;
 
       utils_util["a" /* default */].ajax({
         url: this.thead,
@@ -10081,27 +10100,27 @@ var mainvue_type_script_lang_js_components, _watch;
         if (res.rCode === 0) {
           var results = res.results;
           if (Array.isArray(results)) {
-            _this8.theadData = results;
+            _this10.theadData = results;
           } else {
-            _this8.theadData = results.theadData || [];
-            _this8.list = results.data || results.records || [];
-            _this8.config.totalCount = results.count || results.total || results.totalCount;
-            _this8.getOptions(_this8.theadData);
+            _this10.theadData = results.theadData || [];
+            _this10.list = results.data || results.records || [];
+            _this10.config.totalCount = results.count || results.total || results.totalCount;
+            _this10.getOptions(_this10.theadData);
           }
         } else {
-          _this8.theadData = [];
+          _this10.theadData = [];
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this8.$message.error(msg);
+          _this10.$message.error(msg);
         }
-        _this8.$emit('success', res);
+        _this10.$emit('success', res);
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this8.$message.error(err.message);
+          _this10.$message.error(err.message);
         }
       });
     },
     getTableDatas: function getTableDatas(res) {
-      var _this9 = this;
+      var _this11 = this;
 
       var where = void 0;
       var first = void 0;
@@ -10141,42 +10160,42 @@ var mainvue_type_script_lang_js_components, _watch;
         params: reqData,
         data: reqData
       })).then(function (res) {
-        _this9.tableLoading = false;
+        _this11.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
-          if (_this9.isReload) {
-            _this9.list = [];
-            _this9.isReload = false;
+          if (_this11.isReload) {
+            _this11.list = [];
+            _this11.isReload = false;
           }
-          var results = _this9.parseData !== undefined ? _this9.parseData(res.results || res.data || res) : res.results || res.data;
-          if (_this9.infiniteScroll) {
-            _this9.list = _this9.list.concat(results.data || results.records || results.list);
-            _this9.config.pageNum += 1;
+          var results = _this11.parseData !== undefined ? _this11.parseData(res.results || res.data || res) : res.results || res.data;
+          if (_this11.infiniteScroll) {
+            _this11.list = _this11.list.concat(results.data || results.records || results.list);
+            _this11.config.pageNum += 1;
           } else {
-            _this9.list = results.data || results.records || results.list;
-            _this9.$nextTick(function () {
-              _this9.$refs.oaTable && _this9.$refs.oaTable.resetScroll && _this9.$refs.oaTable.resetScroll(0, 0);
+            _this11.list = results.data || results.records || results.list;
+            _this11.$nextTick(function () {
+              _this11.$refs.oaTable && _this11.$refs.oaTable.resetScroll && _this11.$refs.oaTable.resetScroll(0, 0);
             });
           }
-          _this9.config.totalCount = results.count || results.total || results.totalCount;
-          _this9.checked && _this9.$nextTick(function () {
-            _this9.checkSelect(_this9.checked);
+          _this11.config.totalCount = results.count || results.total || results.totalCount;
+          _this11.checked && _this11.$nextTick(function () {
+            _this11.checkSelect(_this11.checked);
           });
-          if (_this9.infiniteScroll && _this9.config.totalCount === _this9.list.length) {
-            _this9.infiniteDisabled = true;
+          if (_this11.infiniteScroll && _this11.config.totalCount === _this11.list.length) {
+            _this11.infiniteDisabled = true;
           }
         } else {
-          _this9.list = [];
+          _this11.list = [];
           //this.tableHeight = false;
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this9.$message.error(msg);
+          _this11.$message.error(msg);
         }
-        _this9.$emit('success', res);
+        _this11.$emit('success', res);
       }).catch(function (err) {
         //this.tableHeight = false;
         if (err.message && err.message !== 'canceled') {
-          _this9.$message.error(err.message);
+          _this11.$message.error(err.message);
         }
-        _this9.tableLoading = false;
+        _this11.tableLoading = false;
       });
     },
     selectionChange: function selectionChange(data) {
@@ -10211,17 +10230,17 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$refs.oaTable.sort(prop, order);
     },
     formBlur: function formBlur(data) {
-      this.$emit('blur', data, this.datas);
+      this.$emit('blur', data, this.list);
     },
     formFocus: function formFocus(data) {
-      this.$emit('focus', data, this.datas);
+      this.$emit('focus', data, this.list);
     },
     formChange: function formChange(data) {
-      this.$emit('edit', data, this.datas);
-      this.$emit('change', data, this.datas);
+      this.$emit('edit', data, this.list);
+      this.$emit('change', data, this.list);
     },
     handleAjax: function handleAjax(handle, row) {
-      var _this10 = this;
+      var _this12 = this;
 
       this.changeLoading(true, handle.text + '\u4E2D...');
       var params = handle.param || {};
@@ -10277,9 +10296,9 @@ var mainvue_type_script_lang_js_components, _watch;
         method: handle.method,
         format: handle.format
       })).then(function (res) {
-        _this10.changeLoading(false);
+        _this12.changeLoading(false);
         if (res.rCode === 0) {
-          _this10.$message({
+          _this12.$message({
             message: handle.text + '\u6210\u529F',
             duration: 2000,
             type: 'success',
@@ -10287,17 +10306,17 @@ var mainvue_type_script_lang_js_components, _watch;
               var first = Object.prototype.hasOwnProperty.call(handle, 'first') ? handle.first : false;
               var reload = handle.reload || true;
               if (reload) {
-                _this10.reload({}, first);
+                _this12.reload({}, first);
               }
             }
           });
         } else {
-          _this10.$message.error(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
+          _this12.$message.error(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
         }
       }).catch(function (err) {
-        _this10.changeLoading(false);
+        _this12.changeLoading(false);
         if (err.message && err.message !== 'canceled') {
-          _this10.$message.error(err.message);
+          _this12.$message.error(err.message);
         }
       });
     },
@@ -10322,7 +10341,7 @@ var mainvue_type_script_lang_js_components, _watch;
       return data_table_src_mainvue_type_script_lang_js_extends({}, obj, item);
     },
     handleClick: function handleClick(res) {
-      var _this11 = this;
+      var _this13 = this;
 
       var row = res.row,
           handle = res.handle;
@@ -10358,7 +10377,7 @@ var mainvue_type_script_lang_js_components, _watch;
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this11.handleAjax(handle, rows);
+            _this13.handleAjax(handle, rows);
           }).catch(function () {});
         } else {
           this.handleAjax(handle, rows);
@@ -10368,7 +10387,7 @@ var mainvue_type_script_lang_js_components, _watch;
           handle.event(data_table_src_mainvue_type_script_lang_js_extends({
             ele: this,
             thead: thead,
-            data: this.datas,
+            data: this.list,
             selected: rows
           }, res));
         } else if (handle.event === 'add' || handle.event === 'edit' || handle.event === 'look') {
@@ -10446,18 +10465,18 @@ var mainvue_type_script_lang_js_components, _watch;
           var type = ['selection', 'index', 'expand'];
           thead = thead.map(function (item) {
             return item.filter(function (ele) {
-              return !type.includes(ele.type) && ele.label !== text && !_this11.exportExcludeLabel.includes(ele.label);
+              return !type.includes(ele.type) && ele.label !== text && !_this13.exportExcludeLabel.includes(ele.label);
             });
           });
           utils_util["a" /* default */].exportXls({
             thead: thead,
-            data: this.datas,
+            data: this.list,
             name: this.fileName,
             option: this.optionDatas
           });
         }
-        this.$emit('btnClick', res, this.datas, thead, rows);
-        this.$emit('btn-click', res, this.datas, thead, rows);
+        this.$emit('btnClick', res, this.list, thead, rows);
+        this.$emit('btn-click', res, this.list, thead, rows);
       }
     },
     sizeChange: function sizeChange(res) {
@@ -10547,40 +10566,40 @@ var mainvue_type_script_lang_js_components, _watch;
       }
     },
     resetHeight: function resetHeight(warn) {
-      var _this12 = this;
+      var _this14 = this;
 
       this.$nextTick(function () {
-        if (_this12.full && !_this12.height && !_this12.maxHeight) {
-          var height = _this12.$el.parentNode.offsetHeight;
+        if (_this14.full && !_this14.height && !_this14.maxHeight) {
+          var height = _this14.$el.parentNode.offsetHeight;
           if (height) {
-            height = parseInt(utils_util["a" /* default */].getStyle(_this12.$el.parentNode, 'height', '%'), 10);
-            height = (height == NaN ? 0 : height) - parseInt(utils_util["a" /* default */].getStyle(_this12.$el.parentNode, 'padding-top'), 10) - parseInt(utils_util["a" /* default */].getStyle(_this12.$el.parentNode, 'padding-bottom'), 10);
-            for (var i = 0; i < _this12.$el.parentNode.childNodes.length; i++) {
-              var ele = _this12.$el.parentNode.childNodes[i];
-              if (ele !== _this12.$el && ele.offsetHeight !== undefined) {
+            height = parseInt(utils_util["a" /* default */].getStyle(_this14.$el.parentNode, 'height', '%'), 10);
+            height = (height == NaN ? 0 : height) - parseInt(utils_util["a" /* default */].getStyle(_this14.$el.parentNode, 'padding-top'), 10) - parseInt(utils_util["a" /* default */].getStyle(_this14.$el.parentNode, 'padding-bottom'), 10);
+            for (var i = 0; i < _this14.$el.parentNode.childNodes.length; i++) {
+              var ele = _this14.$el.parentNode.childNodes[i];
+              if (ele !== _this14.$el && ele.offsetHeight !== undefined) {
                 height = height - ele.offsetHeight - parseInt(utils_util["a" /* default */].getStyle(ele, 'margin-top'), 10) - parseInt(utils_util["a" /* default */].getStyle(ele, 'margin-bottom'), 10);
               }
             }
-            height -= _this12.showToolbar ? 45 : 0;
-            height -= _this12.page === false ? 0 : 46;
-            height -= _this12.title ? _this12.$refs.title.offsetHeight : 0;
-            height -= parseInt(utils_util["a" /* default */].getStyle(_this12.$refs.esTableContent, 'padding-top'), 10);
-            height -= parseInt(utils_util["a" /* default */].getStyle(_this12.$refs.esTableContent, 'padding-bottom'), 10);
-            var emptyText = _this12.$refs.esTableContent.querySelector('.el-table__empty-text');
+            height -= _this14.showToolbar ? 45 : 0;
+            height -= _this14.page === false ? 0 : 46;
+            height -= _this14.title ? _this14.$refs.title.offsetHeight : 0;
+            height -= parseInt(utils_util["a" /* default */].getStyle(_this14.$refs.esTableContent, 'padding-top'), 10);
+            height -= parseInt(utils_util["a" /* default */].getStyle(_this14.$refs.esTableContent, 'padding-bottom'), 10);
+            var emptyText = _this14.$refs.esTableContent.querySelector('.el-table__empty-text');
             var eht = 0;
             if (emptyText) {
               eht = emptyText.offsetHeight;
-              var thead = _this12.$refs.esTableContent.querySelector('.el-table__header');
+              var thead = _this14.$refs.esTableContent.querySelector('.el-table__header');
               thead && (eht += thead.offsetHeight);
             }
             if (height > 1 && height - eht > 1) {
-              _this12.tableHeight = height;
+              _this14.tableHeight = height;
             } else {
-              console.warn(_this12.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
+              console.warn(_this14.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
             }
           } else if (!warn) {
             setTimeout(function () {
-              _this12.resetHeight(true);
+              _this14.resetHeight(true);
             }, 1000);
           }
         }
@@ -10613,31 +10632,31 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('update-drag-sort', data, event);
     },
     mergeThead: function mergeThead(res) {
-      var _this13 = this;
+      var _this15 = this;
 
       this.theadData = res;
       this.icon = true;
       setTimeout(function () {
-        _this13.show = true;
+        _this15.show = true;
       }, 100);
     },
     setOptions: function setOptions(val, sysCode) {
       this.$set(this.options, sysCode, val);
     },
     bindEventBus: function bindEventBus() {
-      var _this14 = this;
+      var _this16 = this;
 
       this.sysCodes.forEach(function (item) {
         bus.$on(item, function (val) {
-          _this14.setOptions(val, item);
+          _this16.setOptions(val, item);
         });
       });
     },
     unbindEventBus: function unbindEventBus() {
-      var _this15 = this;
+      var _this17 = this;
 
       this.sysCodes.forEach(function (item) {
-        bus.$off(item, _this15.setOptions);
+        bus.$off(item, _this17.setOptions);
       });
     },
     reset: function reset() {
@@ -10657,8 +10676,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_04c7a78c_render,
-  mainvue_type_template_id_04c7a78c_staticRenderFns,
+  mainvue_type_template_id_15de25d9_render,
+  mainvue_type_template_id_15de25d9_staticRenderFns,
   false,
   null,
   null,
@@ -47880,8 +47899,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=bf93bbba&
-var mainvue_type_template_id_bf93bbba_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=584ce1fc&
+var mainvue_type_template_id_584ce1fc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -48825,11 +48844,11 @@ var mainvue_type_template_id_bf93bbba_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_bf93bbba_staticRenderFns = []
-mainvue_type_template_id_bf93bbba_render._withStripped = true
+var mainvue_type_template_id_584ce1fc_staticRenderFns = []
+mainvue_type_template_id_584ce1fc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=bf93bbba&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=584ce1fc&
 
 // 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=579bc87d&
 var resetPasswordvue_type_template_id_579bc87d_render = function () {
@@ -49953,6 +49972,7 @@ function login_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
       type: String,
       default: 'center'
     },
+    translate: String,
     useResults: {
       type: Boolean,
       default: true
@@ -49965,31 +49985,32 @@ function login_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
   },
   computed: {
     transform: function transform() {
+      var translate = this.translate ? this.translate : this.align === 'center' ? '-50%, -51%' : '-51%';
       if (this.align.indexOf('%') > -1) {
         return {
           left: this.align,
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: 'translateY(' + translate + ')'
         };
       }
       if (this.align === 'left') {
         return {
           left: '30%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: 'translateY(' + translate + ')'
         };
       }
       if (this.align === 'right') {
         return {
           left: '70%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: 'translateY(' + translate + ')'
         };
       }
       return {
         left: '50%',
         top: '50%',
-        transform: 'translate(-50%, -51%)'
+        transform: 'translate(' + translate + ')'
       };
     },
     redirectUri: function redirectUri() {
@@ -50927,8 +50948,8 @@ function login_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return fun
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_bf93bbba_render,
-  mainvue_type_template_id_bf93bbba_staticRenderFns,
+  mainvue_type_template_id_584ce1fc_render,
+  mainvue_type_template_id_584ce1fc_staticRenderFns,
   false,
   null,
   null,
@@ -50984,8 +51005,8 @@ mainvue_type_template_id_6aa3a502_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=6aa3a502&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=4a717394&scoped=true&
-var simplicityvue_type_template_id_4a717394_scoped_true_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/simplicity/index.vue?vue&type=template&id=f80eb4e8&scoped=true&
+var simplicityvue_type_template_id_f80eb4e8_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -51001,7 +51022,13 @@ var simplicityvue_type_template_id_4a717394_scoped_true_render = function () {
             })
           : _vm._e(),
         _c("div", { staticClass: "es-simplicity-org-name" }, [
-          _vm._v(_vm._s(_vm.userModel.orgName)),
+          _vm._v(
+            "\n      " +
+              _vm._s(
+                _vm.simpleUserInfo.orgShortName || _vm.simpleUserInfo.orgName
+              ) +
+              "\n    "
+          ),
         ]),
         _c(
           "el-popover",
@@ -51017,7 +51044,11 @@ var simplicityvue_type_template_id_4a717394_scoped_true_render = function () {
                 notify: _vm.notify,
                 contents: _vm.userInfoContents,
               },
-              on: { change: _vm.handleChangeConfig, close: _vm.handlerClose },
+              on: {
+                success: _vm.handleSuccess,
+                change: _vm.handleChangeConfig,
+                close: _vm.handlerClose,
+              },
             }),
             _c("avatar", {
               attrs: { slot: "reference", user: _vm.user },
@@ -51353,7 +51384,7 @@ var simplicityvue_type_template_id_4a717394_scoped_true_render = function () {
           {
             staticClass: "es-simplicity-iframe",
             class: { "is-open": _vm.showMenu, "is-fold": _vm.fold },
-            attrs: { closable: "", "hide-bar": "" },
+            attrs: { closable: "", "hide-bar": "", opacity: "" },
             on: {
               "tab-remove": _vm.handleRemove,
               "tab-contextmenu": _vm.handleContextmenu,
@@ -51528,11 +51559,11 @@ var simplicityvue_type_template_id_4a717394_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_4a717394_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_4a717394_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_f80eb4e8_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_f80eb4e8_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=4a717394&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=f80eb4e8&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=2597c13a&scoped=true&
 var avatarvue_type_template_id_2597c13a_scoped_true_render = function () {
@@ -52048,14 +52079,14 @@ sub_menuvue_type_template_id_427b4bf6_scoped_true_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/simplicity/sub-menu.vue?vue&type=template&id=427b4bf6&scoped=true&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/menu-list.vue?vue&type=template&id=6e16cc62&scoped=true&
-var menu_listvue_type_template_id_6e16cc62_scoped_true_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/simplicity/menu-list.vue?vue&type=template&id=6e724ce5&scoped=true&
+var menu_listvue_type_template_id_6e724ce5_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   return _c(
     "el-scrollbar",
-    { ref: "scrollbar", class: { "is-fold": _vm.fold } },
+    { class: { "is-fold": _vm.fold } },
     [
       _vm._l(_vm.data, function (item, index) {
         return [
@@ -52064,37 +52095,42 @@ var menu_listvue_type_template_id_6e16cc62_scoped_true_render = function () {
             ? _c(
                 "el-popover",
                 {
-                  key: item.id,
                   attrs: {
                     placement: "right",
                     trigger: "hover",
                     "popper-class": "es-simplicity-menus-sub",
                     width: _vm.width,
                   },
-                  on: {
-                    show: function ($event) {
-                      _vm.show = true
-                    },
-                    hide: function ($event) {
-                      _vm.show = false
+                  on: { show: _vm.handleShow, hide: _vm.handleHide },
+                  scopedSlots: _vm._u([
+                    {
+                      key: "default",
+                      fn: function (ref) {
+                        var parent = ref.parent
+                        return [
+                          _c("menu-list", {
+                            ref: "menus",
+                            refInFor: true,
+                            attrs: {
+                              parent: parent,
+                              active: _vm.active,
+                              popover: _vm.show,
+                              data: (item.children || []).concat(
+                                item.fourthTabs || []
+                              ),
+                              menuIcon: _vm.menuIcon,
+                              color: _vm.color,
+                              backgroundColor: _vm.backgroundColor,
+                              width: _vm.width,
+                            },
+                            on: { command: _vm.handleClick },
+                          }),
+                        ]
+                      },
                     },
-                  },
+                  ]),
                 },
                 [
-                  _c("menu-list", {
-                    ref: "menus",
-                    refInFor: true,
-                    attrs: {
-                      active: _vm.active,
-                      popover: _vm.show,
-                      data: (item.children || []).concat(item.fourthTabs || []),
-                      menuIcon: _vm.menuIcon,
-                      color: _vm.color,
-                      backgroundColor: _vm.backgroundColor,
-                      width: _vm.width,
-                    },
-                    on: { command: _vm.handleClick },
-                  }),
                   _c(
                     "div",
                     {
@@ -52178,8 +52214,7 @@ var menu_listvue_type_template_id_6e16cc62_scoped_true_render = function () {
                     ],
                     2
                   ),
-                ],
-                1
+                ]
               )
             : _c(
                 "div",
@@ -52268,11 +52303,11 @@ var menu_listvue_type_template_id_6e16cc62_scoped_true_render = function () {
     2
   )
 }
-var menu_listvue_type_template_id_6e16cc62_scoped_true_staticRenderFns = []
-menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
+var menu_listvue_type_template_id_6e724ce5_scoped_true_staticRenderFns = []
+menu_listvue_type_template_id_6e724ce5_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/menu-list.vue?vue&type=template&id=6e16cc62&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/menu-list.vue?vue&type=template&id=6e724ce5&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/menu-list.vue?vue&type=script&lang=js&
 //
@@ -52368,6 +52403,8 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
 //
 //
 //
+//
+//
 
 /* harmony default export */ var menu_listvue_type_script_lang_js_ = ({
   name: 'MenuList',
@@ -52380,7 +52417,8 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
     data: Array,
     fold: Boolean,
     width: Number,
-    popover: Boolean
+    popover: Boolean,
+    parent: Object
   },
   data: function data() {
     return {
@@ -52395,7 +52433,6 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
     popover: function popover() {
       if (this.$el.offsetHeight > this.height) {
         this.$el.style.height = this.height + 'px';
-        this.$refs.scrollbar.update();
       } else {
         this.$el.style.height = '';
       }
@@ -52436,6 +52473,18 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
         }
       }
       this.$emit('command', res);
+    },
+    handleShow: function handleShow() {
+      this.show = true;
+      if (this.parent) {
+        this.parent.changeContinue(true);
+      }
+    },
+    handleHide: function handleHide() {
+      if (this.parent) {
+        this.parent.changeContinue(false);
+        //this.parent.hidePopper();
+      }
     }
   }
 });
@@ -52451,11 +52500,11 @@ menu_listvue_type_template_id_6e16cc62_scoped_true_render._withStripped = true
 
 var menu_list_component = normalizeComponent(
   simplicity_menu_listvue_type_script_lang_js_,
-  menu_listvue_type_template_id_6e16cc62_scoped_true_render,
-  menu_listvue_type_template_id_6e16cc62_scoped_true_staticRenderFns,
+  menu_listvue_type_template_id_6e724ce5_scoped_true_render,
+  menu_listvue_type_template_id_6e724ce5_scoped_true_staticRenderFns,
   false,
   null,
-  "6e16cc62",
+  "6e724ce5",
   null
   
 )
@@ -53403,8 +53452,8 @@ var apps_component = normalizeComponent(
 )
 
 /* harmony default export */ var simplicity_apps = (apps_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/user.vue?vue&type=template&id=4f9acb61&scoped=true&
-var uservue_type_template_id_4f9acb61_scoped_true_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/simplicity/user.vue?vue&type=template&id=7b281bbe&scoped=true&
+var uservue_type_template_id_7b281bbe_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -53559,11 +53608,11 @@ var uservue_type_template_id_4f9acb61_scoped_true_render = function () {
     1
   )
 }
-var uservue_type_template_id_4f9acb61_scoped_true_staticRenderFns = []
-uservue_type_template_id_4f9acb61_scoped_true_render._withStripped = true
+var uservue_type_template_id_7b281bbe_scoped_true_staticRenderFns = []
+uservue_type_template_id_7b281bbe_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=4f9acb61&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=7b281bbe&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=0dbd4cc6&
 var userinfovue_type_template_id_0dbd4cc6_render = function () {
@@ -53990,6 +54039,7 @@ var userinfo_component = normalizeComponent(
           _this2.checkPassword = results.checkPassword;
           _this2.checkPasswordMsg = results.checkPasswordMsg;
           _this2.headImgCode = results.headImgCode || undefined;
+          _this2.$emit('success', results);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
           _this2.$message.error(msg);
@@ -54104,11 +54154,11 @@ var userinfo_component = normalizeComponent(
 
 var user_component = normalizeComponent(
   simplicity_uservue_type_script_lang_js_,
-  uservue_type_template_id_4f9acb61_scoped_true_render,
-  uservue_type_template_id_4f9acb61_scoped_true_staticRenderFns,
+  uservue_type_template_id_7b281bbe_scoped_true_render,
+  uservue_type_template_id_7b281bbe_scoped_true_staticRenderFns,
   false,
   null,
-  "4f9acb61",
+  "7b281bbe",
   null
   
 )
@@ -55515,6 +55565,10 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -55756,7 +55810,7 @@ var events = [function (tabs, index, that) {
       //选中菜单
       active: '',
       //单位名称
-      orgName: ''
+      simpleUserInfo: {}
     };
   },
 
@@ -56446,6 +56500,16 @@ var events = [function (tabs, index, that) {
       }
     },
 
+
+    /**
+     * @desc:用户详情请求成功
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleSuccess: function handleSuccess(res) {
+      this.simpleUserInfo = res.simpleUserInfo;
+    },
+
     /**
      * @desc:修改用户配置
      * @author huangbo
@@ -56887,11 +56951,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = normalizeComponent(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_4a717394_scoped_true_render,
-  simplicityvue_type_template_id_4a717394_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_f80eb4e8_scoped_true_render,
+  simplicityvue_type_template_id_f80eb4e8_scoped_true_staticRenderFns,
   false,
   null,
-  "4a717394",
+  "f80eb4e8",
   null
   
 )
@@ -65152,7 +65216,7 @@ function src_mainvue_type_script_lang_js_objectWithoutProperties(obj, keys) { va
             }
           }
         } else {
-          if (typeof data === 'string' || !data.length) {
+          if (typeof data === 'string' || !data.length && !this.sysCode && !this.url) {
             return value;
           }
           if (Array.isArray(data) && data.length) {
@@ -81344,7 +81408,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.81-beta6',
+  version: '0.5.81-beta7',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,