ecinc-cloud-wappaio 9.6.475 → 9.6.476

package/lib/ecwappaio.common.js

@@ -10748,7 +10748,7 @@ var mutations = {
   DEL_ALL_CACHED_VIEWS: function DEL_ALL_CACHED_VIEWS(state) {
     state.cachedViews = [];
   },
-  UPDATE_VISITED_VIEW: function UPDATE_VISITED_VIEW(state, view) {
+  UPDATE_VISITED_VIEW: function UPDATE_VISITED_VIEW(state, view, pagedata) {
     var _iterator4 = _createForOfIteratorHelper(state.visitedViews),
       _step4;
     try {
@@ -10864,9 +10864,9 @@ var actions = {
       resolve(_toConsumableArray(state.cachedViews));
     });
   },
-  updateVisitedView: function updateVisitedView(_ref13, view) {
+  updateVisitedView: function updateVisitedView(_ref13, view, pagedata) {
     var commit = _ref13.commit;
-    commit('UPDATE_VISITED_VIEW', view);
+    commit('UPDATE_VISITED_VIEW', view, pagedata);
   }
 };
 /* harmony default export */ __webpack_exports__["default"] = ({
@@ -42172,7 +42172,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".list-border .more-btn-drop{padding:10
 
 /***/ }),
 
-/***/ 99573:
+/***/ 64726:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -42186,7 +42186,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".content-column[data-v-768e7cdb]{cursor:pointer}.column_operate[data-v-768e7cdb]{background-color:#fff}.column_operate[data-v-768e7cdb],.column_operate[data-v-768e7cdb] .cell{white-space:nowrap!important;overflow:hidden!important;word-break:keep-all}.el-pagination-container[data-v-768e7cdb]{text-align:right;margin-top:10px}.el-pagination-container .selected-rows[data-v-768e7cdb]{float:left;color:#606266;font-size:13px;line-height:28px}.el-pagination[data-v-768e7cdb]{padding-right:0;font-weight:400}.el-icon[data-v-768e7cdb]:before{padding-right:3px}[data-v-768e7cdb] th>.cell{word-break:keep-all;white-space:nowrap}[data-v-768e7cdb] .el-table__header .is-fixed{color:#333;background-color:#f2f5fb}[data-v-768e7cdb] .close-tooltip .cell{word-break:normal}[data-v-768e7cdb] .el-table__body-wrapper::-webkit-scrollbar{width:6px;height:6px}[data-v-768e7cdb] .el-table--scrollable-x{padding-right:2px}[data-v-768e7cdb] .el-table--scrollable-x .el-table__body-wrapper{padding-bottom:2px;margin-bottom:2px;cursor:pointer}[data-v-768e7cdb] .el-table--scrollable-x .el-table__body-wrapper .el-table__body{cursor:default}[data-v-768e7cdb] .el-table__body-wrapper::-webkit-scrollbar-thumb{border-radius:4px;background-color:hsla(220,4%,58%,.3)}[data-v-768e7cdb] .el-table__body-wrapper::-webkit-scrollbar-thumb:hover{background-color:hsla(220,4%,58%,.5);margin-right:2px}#card-table[data-v-768e7cdb]{padding:10px 0 10px 0}#card-table .card-item[data-v-768e7cdb]{background:#f7f9ff;border-radius:2px 0 0 2px;padding:20px;margin-bottom:15px;cursor:pointer}#card-table .card-item .card-top[data-v-768e7cdb]{color:#333;font-size:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;line-height:21px}#card-table .card-item .card-top .card-top-left[data-v-768e7cdb],#card-table .card-item .card-top .card-top-right[data-v-768e7cdb]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}#card-table .card-item .card-top .card-top-right[data-v-768e7cdb]{text-align:end}#card-table .card-item .card-bottom[data-v-768e7cdb]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;line-height:17px;margin-top:10px;color:#999;font-size:13px}#card-table .card-item .card-bottom[data-v-768e7cdb],#card-table .card-item .card-bottom .card-bottom-left[data-v-768e7cdb]{display:-webkit-box;display:-ms-flexbox;display:flex}#card-table .card-item .card-bottom .card-bottom-left .span-item[data-v-768e7cdb]{margin-right:30px}#card-table .card-item .card-bottom .card-bottom-right[data-v-768e7cdb]{display:-webkit-box;display:-ms-flexbox;display:flex}#card-table .card-item .card-bottom .card-bottom-right .span-item[data-v-768e7cdb]{margin-left:30px}#card-table .card-item[data-v-768e7cdb]:hover{background:#eef3ff}#card-table .card-item[data-v-768e7cdb]:last-child{margin-bottom:0}#card-table .card-empty[data-v-768e7cdb]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}#card-table .card-empty .empty-message[data-v-768e7cdb]{color:#999;margin-top:10px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".content-column[data-v-984018fa]{cursor:pointer}.column_operate[data-v-984018fa]{background-color:#fff}.column_operate[data-v-984018fa],.column_operate[data-v-984018fa] .cell{white-space:nowrap!important;overflow:hidden!important;word-break:keep-all}.el-pagination-container[data-v-984018fa]{text-align:right;margin-top:10px}.el-pagination-container .selected-rows[data-v-984018fa]{float:left;color:#606266;font-size:13px;line-height:28px}.el-pagination[data-v-984018fa]{padding-right:0;font-weight:400}.el-icon[data-v-984018fa]:before{padding-right:3px}[data-v-984018fa] th>.cell{word-break:keep-all;white-space:nowrap}[data-v-984018fa] .el-table__header .is-fixed{color:#333;background-color:#f2f5fb}[data-v-984018fa] .close-tooltip .cell{word-break:normal}[data-v-984018fa] .el-table__body-wrapper::-webkit-scrollbar{width:6px;height:6px}[data-v-984018fa] .el-table--scrollable-x{padding-right:2px}[data-v-984018fa] .el-table--scrollable-x .el-table__body-wrapper{padding-bottom:2px;margin-bottom:2px;cursor:pointer}[data-v-984018fa] .el-table--scrollable-x .el-table__body-wrapper .el-table__body{cursor:default}[data-v-984018fa] .el-table__body-wrapper::-webkit-scrollbar-thumb{border-radius:4px;background-color:hsla(220,4%,58%,.3)}[data-v-984018fa] .el-table__body-wrapper::-webkit-scrollbar-thumb:hover{background-color:hsla(220,4%,58%,.5);margin-right:2px}#card-table[data-v-984018fa]{padding:10px 0 10px 0}#card-table .card-item[data-v-984018fa]{background:#f7f9ff;border-radius:2px 0 0 2px;padding:20px;margin-bottom:15px;cursor:pointer}#card-table .card-item .card-top[data-v-984018fa]{color:#333;font-size:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;line-height:21px}#card-table .card-item .card-top .card-top-left[data-v-984018fa],#card-table .card-item .card-top .card-top-right[data-v-984018fa]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}#card-table .card-item .card-top .card-top-right[data-v-984018fa]{text-align:end}#card-table .card-item .card-bottom[data-v-984018fa]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;line-height:17px;margin-top:10px;color:#999;font-size:13px}#card-table .card-item .card-bottom[data-v-984018fa],#card-table .card-item .card-bottom .card-bottom-left[data-v-984018fa]{display:-webkit-box;display:-ms-flexbox;display:flex}#card-table .card-item .card-bottom .card-bottom-left .span-item[data-v-984018fa]{margin-right:30px}#card-table .card-item .card-bottom .card-bottom-right[data-v-984018fa]{display:-webkit-box;display:-ms-flexbox;display:flex}#card-table .card-item .card-bottom .card-bottom-right .span-item[data-v-984018fa]{margin-left:30px}#card-table .card-item[data-v-984018fa]:hover{background:#eef3ff}#card-table .card-item[data-v-984018fa]:last-child{margin-bottom:0}#card-table .card-empty[data-v-984018fa]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}#card-table .card-empty .empty-message[data-v-984018fa]{color:#999;margin-top:10px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -136632,19 +136632,19 @@ var update = add("28e5668b", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 11639:
+/***/ 27032:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(99573);
+var content = __webpack_require__(64726);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(99548)/* ["default"] */ .A)
-var update = add("50c89488", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("38bb84f5", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -152862,8 +152862,8 @@ TaskItemTypeTree.install = function (Vue) {
 };
 var BatchProcessing = BatchProcessing_src;
 var BatchProcessing_TaskItemTypeTree = TaskItemTypeTree;
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/index.vue?vue&type=template&id=768e7cdb&scoped=true
-var srcvue_type_template_id_768e7cdb_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/index.vue?vue&type=template&id=984018fa&scoped=true
+var srcvue_type_template_id_984018fa_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -153190,7 +153190,7 @@ var srcvue_type_template_id_768e7cdb_scoped_true_render = function render() {
     }
   })], 1) : _vm._e(), _vm.showResPermission ? _c('ResPermission') : _vm._e(), _vm._t("default"), _c('DoingDialog')], 2);
 };
-var srcvue_type_template_id_768e7cdb_scoped_true_staticRenderFns = [];
+var srcvue_type_template_id_984018fa_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/TableColumn.vue?vue&type=template&id=35525f86&scoped=true
 var TableColumnvue_type_template_id_35525f86_scoped_true_render = function render() {
@@ -155694,12 +155694,28 @@ var PAGE_INFO = {
   },
   mounted: function mounted() {
     var _this2 = this;
-    if (this.$store.state.tagsView.visitedViews && this.moduleInfo) {
+    var _this = this;
+    if (_this.$store.state.tagsView.visitedViews && _this.moduleInfo) {
       this.$store.state.tagsView.visitedViews.forEach(function (v) {
-        if (v.fullPath === _this2.$route.fullPath) {
+        if (v.fullPath === _this.$route.fullPath) {
           if (v.pageInfo && (!v.moduleCode || v.moduleCode === _this2.moduleInfo.moduleCode)) {
             if (v.listDataUrl === _this2.moduleInfo.listDataUrl) {
               _this2.pageInfo = v.pageInfo;
+              _this2.searchAndOr = v.pageInfo.searchAndOr;
+              _this2.searchMap = v.pageInfo.searchMap;
+              if (_this2.searchAndOr === 'or') {
+                var search = '';
+                for (var key in v.pageInfo.searchMap) {
+                  if (!search && v.pageInfo.searchMap[key]) {
+                    search = v.pageInfo.searchMap[key];
+                  }
+                }
+                if (search) _this2.$bus.emit('newSearch', search);
+              } else if (_this2.searchAndOr === 'and') {
+                //this.$bus.emit('unfloadAdvSearch', true)
+                _this2.$refs['search'].handleSearch(null, 'and');
+                _this2.$bus.emit('setAdvSearchMap', v.pageInfo.searchMap);
+              }
             } else {
               _this2.moduleInfo.disableCache = true;
             }
@@ -156316,18 +156332,19 @@ var PAGE_INFO = {
                 indexCols[0].width += 10;
               }
             }
-            _this8.pageInfo = pageInfo;
-            _this8.emptyText = _this8.$tx('common.noData', '暂无数据');
-            _this8.loadingMast.close();
-            _this8.loading = false;
             if (_this8.$route.meta && !_this8.moduleInfo.disableCache) {
               var view = {
                 fullPath: _this8.$route.fullPath,
                 pageInfo: _this8.pageInfo,
-                listDataUrl: _this8.moduleInfo.listDataUrl
+                listDataUrl: _this8.moduleInfo.listDataUrl,
+                moduleCode: _this8.moduleInfo.moduleCode
               };
               _this8.$store.dispatch('tagsView/updateVisitedView', view);
             }
+            _this8.pageInfo = pageInfo;
+            _this8.emptyText = _this8.$tx('common.noData', '暂无数据');
+            _this8.loadingMast.close();
+            _this8.loading = false;
             _this8.$bus.emit('setTabFileCount');
             _this8.$nextTick(function () {
               _this8.setScrollPosition();
@@ -157316,9 +157333,9 @@ var PAGE_INFO = {
 });
 ;// CONCATENATED MODULE: ./packages/ecwapp/DataTable/src/index.vue?vue&type=script&lang=js
  /* harmony default export */ var ecwapp_DataTable_srcvue_type_script_lang_js = (DataTable_srcvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/index.vue?vue&type=style&index=0&id=768e7cdb&prod&lang=scss&scoped=true
-var srcvue_type_style_index_0_id_768e7cdb_prod_lang_scss_scoped_true = __webpack_require__(11639);
-;// CONCATENATED MODULE: ./packages/ecwapp/DataTable/src/index.vue?vue&type=style&index=0&id=768e7cdb&prod&lang=scss&scoped=true
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/index.vue?vue&type=style&index=0&id=984018fa&prod&lang=scss&scoped=true
+var srcvue_type_style_index_0_id_984018fa_prod_lang_scss_scoped_true = __webpack_require__(27032);
+;// CONCATENATED MODULE: ./packages/ecwapp/DataTable/src/index.vue?vue&type=style&index=0&id=984018fa&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecwapp/DataTable/src/index.vue
 
@@ -157331,11 +157348,11 @@ var srcvue_type_style_index_0_id_768e7cdb_prod_lang_scss_scoped_true = __webpack
 
 var DataTable_src_component = (0,componentNormalizer/* default */.A)(
   ecwapp_DataTable_srcvue_type_script_lang_js,
-  srcvue_type_template_id_768e7cdb_scoped_true_render,
-  srcvue_type_template_id_768e7cdb_scoped_true_staticRenderFns,
+  srcvue_type_template_id_984018fa_scoped_true_render,
+  srcvue_type_template_id_984018fa_scoped_true_staticRenderFns,
   false,
   null,
-  "768e7cdb",
+  "984018fa",
   null
   
 )

package/lib/ecwappaio.umd.js

@@ -10758,7 +10758,7 @@ var mutations = {
   DEL_ALL_CACHED_VIEWS: function DEL_ALL_CACHED_VIEWS(state) {
     state.cachedViews = [];
   },
-  UPDATE_VISITED_VIEW: function UPDATE_VISITED_VIEW(state, view) {
+  UPDATE_VISITED_VIEW: function UPDATE_VISITED_VIEW(state, view, pagedata) {
     var _iterator4 = _createForOfIteratorHelper(state.visitedViews),
       _step4;
     try {
@@ -10874,9 +10874,9 @@ var actions = {
       resolve(_toConsumableArray(state.cachedViews));
     });
   },
-  updateVisitedView: function updateVisitedView(_ref13, view) {
+  updateVisitedView: function updateVisitedView(_ref13, view, pagedata) {
     var commit = _ref13.commit;
-    commit('UPDATE_VISITED_VIEW', view);
+    commit('UPDATE_VISITED_VIEW', view, pagedata);
   }
 };
 /* harmony default export */ __webpack_exports__["default"] = ({
@@ -42182,7 +42182,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".list-border .more-btn-drop{padding:10
 
 /***/ }),
 
-/***/ 51573:
+/***/ 374:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -42196,7 +42196,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".content-column[data-v-768e7cdb]{cursor:pointer}.column_operate[data-v-768e7cdb]{background-color:#fff}.column_operate[data-v-768e7cdb],.column_operate[data-v-768e7cdb] .cell{white-space:nowrap!important;overflow:hidden!important;word-break:keep-all}.el-pagination-container[data-v-768e7cdb]{text-align:right;margin-top:10px}.el-pagination-container .selected-rows[data-v-768e7cdb]{float:left;color:#606266;font-size:13px;line-height:28px}.el-pagination[data-v-768e7cdb]{padding-right:0;font-weight:400}.el-icon[data-v-768e7cdb]:before{padding-right:3px}[data-v-768e7cdb] th>.cell{word-break:keep-all;white-space:nowrap}[data-v-768e7cdb] .el-table__header .is-fixed{color:#333;background-color:#f2f5fb}[data-v-768e7cdb] .close-tooltip .cell{word-break:normal}[data-v-768e7cdb] .el-table__body-wrapper::-webkit-scrollbar{width:6px;height:6px}[data-v-768e7cdb] .el-table--scrollable-x{padding-right:2px}[data-v-768e7cdb] .el-table--scrollable-x .el-table__body-wrapper{padding-bottom:2px;margin-bottom:2px;cursor:pointer}[data-v-768e7cdb] .el-table--scrollable-x .el-table__body-wrapper .el-table__body{cursor:default}[data-v-768e7cdb] .el-table__body-wrapper::-webkit-scrollbar-thumb{border-radius:4px;background-color:hsla(220,4%,58%,.3)}[data-v-768e7cdb] .el-table__body-wrapper::-webkit-scrollbar-thumb:hover{background-color:hsla(220,4%,58%,.5);margin-right:2px}#card-table[data-v-768e7cdb]{padding:10px 0 10px 0}#card-table .card-item[data-v-768e7cdb]{background:#f7f9ff;border-radius:2px 0 0 2px;padding:20px;margin-bottom:15px;cursor:pointer}#card-table .card-item .card-top[data-v-768e7cdb]{color:#333;font-size:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;line-height:21px}#card-table .card-item .card-top .card-top-left[data-v-768e7cdb],#card-table .card-item .card-top .card-top-right[data-v-768e7cdb]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}#card-table .card-item .card-top .card-top-right[data-v-768e7cdb]{text-align:end}#card-table .card-item .card-bottom[data-v-768e7cdb]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;line-height:17px;margin-top:10px;color:#999;font-size:13px}#card-table .card-item .card-bottom[data-v-768e7cdb],#card-table .card-item .card-bottom .card-bottom-left[data-v-768e7cdb]{display:-webkit-box;display:-ms-flexbox;display:flex}#card-table .card-item .card-bottom .card-bottom-left .span-item[data-v-768e7cdb]{margin-right:30px}#card-table .card-item .card-bottom .card-bottom-right[data-v-768e7cdb]{display:-webkit-box;display:-ms-flexbox;display:flex}#card-table .card-item .card-bottom .card-bottom-right .span-item[data-v-768e7cdb]{margin-left:30px}#card-table .card-item[data-v-768e7cdb]:hover{background:#eef3ff}#card-table .card-item[data-v-768e7cdb]:last-child{margin-bottom:0}#card-table .card-empty[data-v-768e7cdb]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}#card-table .card-empty .empty-message[data-v-768e7cdb]{color:#999;margin-top:10px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".content-column[data-v-984018fa]{cursor:pointer}.column_operate[data-v-984018fa]{background-color:#fff}.column_operate[data-v-984018fa],.column_operate[data-v-984018fa] .cell{white-space:nowrap!important;overflow:hidden!important;word-break:keep-all}.el-pagination-container[data-v-984018fa]{text-align:right;margin-top:10px}.el-pagination-container .selected-rows[data-v-984018fa]{float:left;color:#606266;font-size:13px;line-height:28px}.el-pagination[data-v-984018fa]{padding-right:0;font-weight:400}.el-icon[data-v-984018fa]:before{padding-right:3px}[data-v-984018fa] th>.cell{word-break:keep-all;white-space:nowrap}[data-v-984018fa] .el-table__header .is-fixed{color:#333;background-color:#f2f5fb}[data-v-984018fa] .close-tooltip .cell{word-break:normal}[data-v-984018fa] .el-table__body-wrapper::-webkit-scrollbar{width:6px;height:6px}[data-v-984018fa] .el-table--scrollable-x{padding-right:2px}[data-v-984018fa] .el-table--scrollable-x .el-table__body-wrapper{padding-bottom:2px;margin-bottom:2px;cursor:pointer}[data-v-984018fa] .el-table--scrollable-x .el-table__body-wrapper .el-table__body{cursor:default}[data-v-984018fa] .el-table__body-wrapper::-webkit-scrollbar-thumb{border-radius:4px;background-color:hsla(220,4%,58%,.3)}[data-v-984018fa] .el-table__body-wrapper::-webkit-scrollbar-thumb:hover{background-color:hsla(220,4%,58%,.5);margin-right:2px}#card-table[data-v-984018fa]{padding:10px 0 10px 0}#card-table .card-item[data-v-984018fa]{background:#f7f9ff;border-radius:2px 0 0 2px;padding:20px;margin-bottom:15px;cursor:pointer}#card-table .card-item .card-top[data-v-984018fa]{color:#333;font-size:16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;line-height:21px}#card-table .card-item .card-top .card-top-left[data-v-984018fa],#card-table .card-item .card-top .card-top-right[data-v-984018fa]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}#card-table .card-item .card-top .card-top-right[data-v-984018fa]{text-align:end}#card-table .card-item .card-bottom[data-v-984018fa]{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;line-height:17px;margin-top:10px;color:#999;font-size:13px}#card-table .card-item .card-bottom[data-v-984018fa],#card-table .card-item .card-bottom .card-bottom-left[data-v-984018fa]{display:-webkit-box;display:-ms-flexbox;display:flex}#card-table .card-item .card-bottom .card-bottom-left .span-item[data-v-984018fa]{margin-right:30px}#card-table .card-item .card-bottom .card-bottom-right[data-v-984018fa]{display:-webkit-box;display:-ms-flexbox;display:flex}#card-table .card-item .card-bottom .card-bottom-right .span-item[data-v-984018fa]{margin-left:30px}#card-table .card-item[data-v-984018fa]:hover{background:#eef3ff}#card-table .card-item[data-v-984018fa]:last-child{margin-bottom:0}#card-table .card-empty[data-v-984018fa]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}#card-table .card-empty .empty-message[data-v-984018fa]{color:#999;margin-top:10px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -136642,19 +136642,19 @@ var update = add("1c8c724f", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 87905:
+/***/ 73066:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(51573);
+var content = __webpack_require__(374);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(99548)/* ["default"] */ .A)
-var update = add("ad268500", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("0a8c8cb9", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -152872,8 +152872,8 @@ TaskItemTypeTree.install = function (Vue) {
 };
 var BatchProcessing = BatchProcessing_src;
 var BatchProcessing_TaskItemTypeTree = TaskItemTypeTree;
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/index.vue?vue&type=template&id=768e7cdb&scoped=true
-var srcvue_type_template_id_768e7cdb_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/index.vue?vue&type=template&id=984018fa&scoped=true
+var srcvue_type_template_id_984018fa_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -153200,7 +153200,7 @@ var srcvue_type_template_id_768e7cdb_scoped_true_render = function render() {
     }
   })], 1) : _vm._e(), _vm.showResPermission ? _c('ResPermission') : _vm._e(), _vm._t("default"), _c('DoingDialog')], 2);
 };
-var srcvue_type_template_id_768e7cdb_scoped_true_staticRenderFns = [];
+var srcvue_type_template_id_984018fa_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/TableColumn.vue?vue&type=template&id=35525f86&scoped=true
 var TableColumnvue_type_template_id_35525f86_scoped_true_render = function render() {
@@ -155704,12 +155704,28 @@ var PAGE_INFO = {
   },
   mounted: function mounted() {
     var _this2 = this;
-    if (this.$store.state.tagsView.visitedViews && this.moduleInfo) {
+    var _this = this;
+    if (_this.$store.state.tagsView.visitedViews && _this.moduleInfo) {
       this.$store.state.tagsView.visitedViews.forEach(function (v) {
-        if (v.fullPath === _this2.$route.fullPath) {
+        if (v.fullPath === _this.$route.fullPath) {
           if (v.pageInfo && (!v.moduleCode || v.moduleCode === _this2.moduleInfo.moduleCode)) {
             if (v.listDataUrl === _this2.moduleInfo.listDataUrl) {
               _this2.pageInfo = v.pageInfo;
+              _this2.searchAndOr = v.pageInfo.searchAndOr;
+              _this2.searchMap = v.pageInfo.searchMap;
+              if (_this2.searchAndOr === 'or') {
+                var search = '';
+                for (var key in v.pageInfo.searchMap) {
+                  if (!search && v.pageInfo.searchMap[key]) {
+                    search = v.pageInfo.searchMap[key];
+                  }
+                }
+                if (search) _this2.$bus.emit('newSearch', search);
+              } else if (_this2.searchAndOr === 'and') {
+                //this.$bus.emit('unfloadAdvSearch', true)
+                _this2.$refs['search'].handleSearch(null, 'and');
+                _this2.$bus.emit('setAdvSearchMap', v.pageInfo.searchMap);
+              }
             } else {
               _this2.moduleInfo.disableCache = true;
             }
@@ -156326,18 +156342,19 @@ var PAGE_INFO = {
                 indexCols[0].width += 10;
               }
             }
-            _this8.pageInfo = pageInfo;
-            _this8.emptyText = _this8.$tx('common.noData', '暂无数据');
-            _this8.loadingMast.close();
-            _this8.loading = false;
             if (_this8.$route.meta && !_this8.moduleInfo.disableCache) {
               var view = {
                 fullPath: _this8.$route.fullPath,
                 pageInfo: _this8.pageInfo,
-                listDataUrl: _this8.moduleInfo.listDataUrl
+                listDataUrl: _this8.moduleInfo.listDataUrl,
+                moduleCode: _this8.moduleInfo.moduleCode
               };
               _this8.$store.dispatch('tagsView/updateVisitedView', view);
             }
+            _this8.pageInfo = pageInfo;
+            _this8.emptyText = _this8.$tx('common.noData', '暂无数据');
+            _this8.loadingMast.close();
+            _this8.loading = false;
             _this8.$bus.emit('setTabFileCount');
             _this8.$nextTick(function () {
               _this8.setScrollPosition();
@@ -157326,9 +157343,9 @@ var PAGE_INFO = {
 });
 ;// CONCATENATED MODULE: ./packages/ecwapp/DataTable/src/index.vue?vue&type=script&lang=js
  /* harmony default export */ var ecwapp_DataTable_srcvue_type_script_lang_js = (DataTable_srcvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/index.vue?vue&type=style&index=0&id=768e7cdb&prod&lang=scss&scoped=true
-var srcvue_type_style_index_0_id_768e7cdb_prod_lang_scss_scoped_true = __webpack_require__(87905);
-;// CONCATENATED MODULE: ./packages/ecwapp/DataTable/src/index.vue?vue&type=style&index=0&id=768e7cdb&prod&lang=scss&scoped=true
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/DataTable/src/index.vue?vue&type=style&index=0&id=984018fa&prod&lang=scss&scoped=true
+var srcvue_type_style_index_0_id_984018fa_prod_lang_scss_scoped_true = __webpack_require__(73066);
+;// CONCATENATED MODULE: ./packages/ecwapp/DataTable/src/index.vue?vue&type=style&index=0&id=984018fa&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecwapp/DataTable/src/index.vue
 
@@ -157341,11 +157358,11 @@ var srcvue_type_style_index_0_id_768e7cdb_prod_lang_scss_scoped_true = __webpack
 
 var DataTable_src_component = (0,componentNormalizer/* default */.A)(
   ecwapp_DataTable_srcvue_type_script_lang_js,
-  srcvue_type_template_id_768e7cdb_scoped_true_render,
-  srcvue_type_template_id_768e7cdb_scoped_true_staticRenderFns,
+  srcvue_type_template_id_984018fa_scoped_true_render,
+  srcvue_type_template_id_984018fa_scoped_true_staticRenderFns,
   false,
   null,
-  "768e7cdb",
+  "984018fa",
   null
   
 )