eoss-ui 0.5.71 → 0.5.73

package/lib/cascader.js

@@ -296,7 +296,26 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   },
   created: function created() {},
 
-  methods: {},
+  methods: {
+    getLabel: function getLabel(val, data) {
+      var label = '';
+      for (var i = 0; i < data.length; i++) {
+        var item = data[i];
+        if (val == item[this.newProps.value]) {
+          label = item[this.newProps.label];
+          break;
+        } else {
+          if (item.children && item.children.length) {
+            label = this.getLabel(val, item.children);
+            if (label) {
+              break;
+            }
+          }
+        }
+      }
+      return label;
+    }
+  },
   render: function render(h) {
     var _this = this;
 
@@ -308,14 +327,14 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             if (Array.isArray(item)) {
               return item.map(function (ele) {
                 if (typeof ele === 'string') {
-                  return ele;
+                  return _this.getLabel(ele, _this.datas);
                 } else {
                   return ele[_this.newProps.label];
                 }
               }).join(_this.separator);
             } else {
               if (typeof item === 'string') {
-                return item;
+                return _this.getLabel(item, _this.datas);
               } else {
                 return item[_this.newProps.label];
               }

package/lib/data-table.js

@@ -3816,8 +3816,8 @@ module.exports = require("vue");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=79cb5b69&
-var mainvue_type_template_id_79cb5b69_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=7b641b60&
+var mainvue_type_template_id_7b641b60_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4128,10 +4128,10 @@ var mainvue_type_template_id_79cb5b69_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_79cb5b69_render._withStripped = true
+mainvue_type_template_id_7b641b60_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=79cb5b69&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7b641b60&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6557,7 +6557,7 @@ var mainvue_type_script_lang_js_components, _watch;
       show: true,
       sysCodes: [],
       infiniteDisabled: this.infiniteScroll,
-      isUpadeData: false
+      isReload: false
     };
   },
 
@@ -6633,8 +6633,8 @@ var mainvue_type_script_lang_js_components, _watch;
         if (this.list && this.list.length) {
           return this.list;
         }
-        if (this.page && this.data && this.data.length && this.config.totalCount < this.data.length + 2) {
-          this.config.totalCount = this.data.length - this.lose;
+        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 > (_this.config.pageNum - 1) * _this.config.pageSize - 1 && index < _this.config.pageNum * _this.config.pageSize;
           });
@@ -6699,6 +6699,14 @@ var mainvue_type_script_lang_js_components, _watch;
       this.resetHeight();
       this.doLayout();
     },
+
+    // data: {
+    //   immediate: true,
+    //   deep: true,
+    //   handler(val) {
+    //     this.config.totalCount = val.length - this.lose;
+    //   }
+    // },
     page: function page() {
       this.resetHeight();
       this.doLayout();
@@ -6744,7 +6752,7 @@ var mainvue_type_script_lang_js_components, _watch;
     param: {
       deep: true,
       handler: function handler(val) {
-        this.getTableData(112);
+        this.getTableData();
       }
     }
   }, _watch['page'] = {
@@ -7057,13 +7065,19 @@ var mainvue_type_script_lang_js_components, _watch;
       })).then(function (res) {
         _this8.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
+          if (_this8.isReload) {
+            _this8.list = [];
+            _this8.isReload = false;
+          }
           var results = _this8.parseData !== undefined ? _this8.parseData(res.results || res.data || res) : res.results || res.data;
           if (_this8.infiniteScroll) {
             _this8.list = _this8.list.concat(results.data || results.records || results.list);
             _this8.config.pageNum += 1;
           } else {
-            _this8.list = results.data || results.records || results.list || [];
-            _this8.$refs.oaTable && _this8.$refs.oaTable.resetScroll && _this8.$refs.oaTable.resetScroll(0, 0);
+            _this8.$nextTick(function () {
+              _this8.list = results.data || results.records || results.list || [];
+              _this8.$refs.oaTable && _this8.$refs.oaTable.resetScroll && _this8.$refs.oaTable.resetScroll(0, 0);
+            });
           }
           _this8.config.totalCount = results.count || results.total || results.totalCount;
           _this8.checked && _this8.$nextTick(function () {
@@ -7450,6 +7464,7 @@ var mainvue_type_script_lang_js_components, _watch;
         this.config = util["a" /* default */].extend({}, this.config, obj.config);
       }
       if (this.url) {
+        this.isReload = true;
         this.getTableData({ where: obj && obj.where ? obj.where : {}, first: first });
       }
     },
@@ -7564,7 +7579,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_79cb5b69_render,
+  mainvue_type_template_id_7b641b60_render,
   staticRenderFns,
   false,
   null,

package/lib/dialog.js

@@ -3826,7 +3826,7 @@ module.exports = require("wujie-vue2");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=55a176e4&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=90beba00&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4341,7 +4341,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=55a176e4&
+// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=90beba00&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -4869,7 +4869,6 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
       this.show = false;
       this.$emit('close', res, this);
       if (this.closeParent && this.esDialog) {
-        console.log(12121);
         this.esDialog.handleClosed(res);
       }
     },