eoss-ui 0.5.91 → 0.5.92

package/lib/main.js

@@ -8581,8 +8581,8 @@ var online_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var online = (online_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/public/search.vue?vue&type=template&id=fa3bcf48&
-var searchvue_type_template_id_fa3bcf48_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/public/search.vue?vue&type=template&id=4c2b6f24&
+var searchvue_type_template_id_4c2b6f24_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8992,11 +8992,11 @@ var searchvue_type_template_id_fa3bcf48_render = function () {
     1
   )
 }
-var searchvue_type_template_id_fa3bcf48_staticRenderFns = []
-searchvue_type_template_id_fa3bcf48_render._withStripped = true
+var searchvue_type_template_id_4c2b6f24_staticRenderFns = []
+searchvue_type_template_id_4c2b6f24_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/public/search.vue?vue&type=template&id=fa3bcf48&
+// CONCATENATED MODULE: ./packages/main/src/public/search.vue?vue&type=template&id=4c2b6f24&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=script&lang=js&
 var searchvue_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; };
@@ -9234,7 +9234,7 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
       _this.searchAll(res);
     });
     this.handleSearchd = Object(external_throttle_debounce_["debounce"])(500, function (obj, index) {
-      _this.handleSearch(obj, index);
+      _this.handleSearch(obj, index, false);
     });
   },
   created: function created() {
@@ -9329,7 +9329,7 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.dataRequestUrl) {
             this.isLoading = true;
-            this.handleSearch(item, i);
+            this.handleSearch(item, i, true);
           } else {
             this.types[i].records = [];
             this.types[i].totalCount = 0;
@@ -9367,7 +9367,7 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
       });
       return records;
     },
-    handleSearch: function handleSearch(obj, index) {
+    handleSearch: function handleSearch(obj, index, reset) {
       var _this4 = this;
 
       if (obj.pageNum < obj.pageCount && this.keyWords) {
@@ -9403,7 +9403,7 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
             obj.totalCount = results.totalCount;
             obj.pageCount = results.pageCount;
             obj.pageNum = results.pageNum;
-            obj.records = obj.records.concat(results.records);
+            obj.records = reset ? results.records : obj.records.concat(results.records);
             _this4.$set(_this4.noMore, obj.id || String(index), results.pageNum >= results.pageCount);
           } else {
             _this4.types[index].records = [];
@@ -9453,8 +9453,8 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var search_component = Object(componentNormalizer["a" /* default */])(
   public_searchvue_type_script_lang_js_,
-  searchvue_type_template_id_fa3bcf48_render,
-  searchvue_type_template_id_fa3bcf48_staticRenderFns,
+  searchvue_type_template_id_4c2b6f24_render,
+  searchvue_type_template_id_4c2b6f24_staticRenderFns,
   false,
   null,
   null,

package/lib/selector-panel.js

@@ -3947,7 +3947,7 @@ module.exports = require("sortablejs");
 // 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/selector-panel/src/main.vue?vue&type=template&id=6fde3a69&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/main.vue?vue&type=template&id=1990039f&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4214,7 +4214,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=6fde3a69&
+// CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=1990039f&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/tree.vue?vue&type=template&id=24ad732a&
 var treevue_type_template_id_24ad732a_render = function () {
@@ -5506,11 +5506,12 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
         this.nodeData = this.trees[active].nodeData;
       } else {
         if (typeof this.selection === 'string') {
+          var params = this.param[this.activeName] ? this.param[this.activeName] : this.param;
           util["a" /* default */].ajax({
             method: this.method,
             url: this.host + this.selection,
-            params: this.param,
-            data: this.param
+            params: params,
+            data: params
           }).then(function (res) {
             if (res.rCode === 0) {
               _this3.selections = JSON.parse(JSON.stringify(res.results));
@@ -5530,7 +5531,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     getTreeData: function getTreeData(url, params, id) {
       var _this4 = this;
 
-      var data = util["a" /* default */].extend({}, params, this.param);
+      var data = util["a" /* default */].extend({}, params, this.param[this.activeName] ? this.param[this.activeName] : this.param);
       if (id !== undefined) {
         data.id = id;
       }
@@ -5559,7 +5560,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       if (flag) {
         if (data.selection === undefined || data.selection.length === 0) {
           this.checkAll = false;
-          var params = util["a" /* default */].extend({}, this.param);
+          var params = util["a" /* default */].extend({}, this.param[this.activeName] ? this.param[this.activeName] : this.param);
           params.type = this.activeName;
           params.mid = data.id;
           if (this.activeName === 'enterprise') {
@@ -5600,7 +5601,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           data.state = '';
         }
         if (data.state !== '' && (!data.children || data.children.length === 0)) {
-          var _params = util["a" /* default */].extend({}, this.newTabs[this.activeName].param, this.param);
+          var _params = util["a" /* default */].extend({}, this.newTabs[this.activeName].param, this.param[this.activeName] ? this.param[this.activeName] : this.param);
           _params.id = data.id;
           util["a" /* default */].ajax({
             method: this.method,

package/lib/selector.js

@@ -3771,7 +3771,7 @@ module.exports = require("axios");
 // 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/selector/src/main.vue?vue&type=template&id=b8fc187a&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=495533b9&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4294,6 +4294,7 @@ var render = function () {
                               isShowLevel3: _vm.isShowLevel3,
                             },
                             on: {
+                              tabschage: _vm.tabschage,
                               "!click": function ($event) {
                                 return _vm.stopd($event)
                               },
@@ -4327,7 +4328,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=b8fc187a&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=495533b9&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -4552,6 +4553,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 //
 //
 //
+//
 
 
 
@@ -4877,6 +4879,9 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
     handleBlur: function handleBlur() {
       this.focus = false;
     },
+    tabschage: function tabschage(trees, active) {
+      this.$emit('tabs-change', trees, active);
+    },
     handleClose: function handleClose(res) {
       if (!this.multiple && this.selected[0] === this.words) {
         this.selected = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.91",
+  "version": "0.5.92",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/main/src/public/search.vue

@@ -235,7 +235,7 @@ export default {
       this.searchAll(res);
     });
     this.handleSearchd = debounce(500, (obj, index) => {
-      this.handleSearch(obj, index);
+      this.handleSearch(obj, index, false);
     });
   },
   created() {
@@ -335,7 +335,7 @@ export default {
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.dataRequestUrl) {
             this.isLoading = true;
-            this.handleSearch(item, i);
+            this.handleSearch(item, i, true);
           } else {
             this.types[i].records = [];
             this.types[i].totalCount = 0;
@@ -371,7 +371,7 @@ export default {
       });
       return records;
     },
-    handleSearch(obj, index) {
+    handleSearch(obj, index, reset) {
       if (obj.pageNum < obj.pageCount && this.keyWords) {
         this.$set(this.loadings, obj.id || String(index), true);
         if (this.active == '0') {
@@ -406,7 +406,9 @@ export default {
               obj.totalCount = results.totalCount;
               obj.pageCount = results.pageCount;
               obj.pageNum = results.pageNum;
-              obj.records = obj.records.concat(results.records);
+              obj.records = reset
+                ? results.records
+                : obj.records.concat(results.records);
               this.$set(
                 this.noMore,
                 obj.id || String(index),

package/packages/selector/src/main.vue

@@ -203,6 +203,7 @@
         :type="types"
         :mix="mix"
         :isShowLevel3="isShowLevel3"
+        @tabschage="tabschage"
         @click.capture="stopd"
         @confirm="handleConfirm"
         @cancel="handleCancel"
@@ -536,6 +537,9 @@ export default {
     handleBlur() {
       this.focus = false;
     },
+    tabschage(trees, active) {
+      this.$emit('tabs-change', trees, active);
+    },
     handleClose(res) {
       if (!this.multiple && this.selected[0] === this.words) {
         this.selected = [];

package/packages/selector-panel/src/main.vue

@@ -652,12 +652,15 @@ export default {
         this.nodeData = this.trees[active].nodeData;
       } else {
         if (typeof this.selection === 'string') {
+          let params = this.param[this.activeName]
+            ? this.param[this.activeName]
+            : this.param;
           util
             .ajax({
               method: this.method,
               url: this.host + this.selection,
-              params: this.param,
-              data: this.param
+              params: params,
+              data: params
             })
             .then((res) => {
               if (res.rCode === 0) {
@@ -677,7 +680,11 @@ export default {
       }
     },
     getTreeData(url, params, id) {
-      let data = util.extend({}, params, this.param);
+      let data = util.extend(
+        {},
+        params,
+        this.param[this.activeName] ? this.param[this.activeName] : this.param
+      );
       if (id !== undefined) {
         data.id = id;
       }
@@ -715,7 +722,12 @@ export default {
       if (flag) {
         if (data.selection === undefined || data.selection.length === 0) {
           this.checkAll = false;
-          let params = util.extend({}, this.param);
+          let params = util.extend(
+            {},
+            this.param[this.activeName]
+              ? this.param[this.activeName]
+              : this.param
+          );
           params.type = this.activeName;
           params.mid = data.id;
           if (this.activeName === 'enterprise') {
@@ -772,7 +784,9 @@ export default {
           let params = util.extend(
             {},
             this.newTabs[this.activeName].param,
-            this.param
+            this.param[this.activeName]
+              ? this.param[this.activeName]
+              : this.param
           );
           params.id = data.id;
           util

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.91',
+  version: '0.5.92',
   install,
   Button,
   ButtonGroup,