three-trees-ui 1.0.30 → 1.0.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/three-trees-ui.common.js +66 -35
  2. package/lib/three-trees-ui.umd.js +66 -35
  3. package/lib/three-trees-ui.umd.min.js +1 -1
  4. package/package.json +1 -1
  5. package/src/mixins/querySqlPreview.js +61 -24
  6. package/src/mixins/templatePreview.js +30 -2
package/lib/three-trees-ui.common.js CHANGED
@@ -4677,7 +4677,7 @@ if (typeof window !== 'undefined' && window.Vue) {
4677
4677
  /***/ "9224":
4678
4678
  /***/ (function(module) {
4679
4679
 
4680
- module.exports = JSON.parse("{\"a\":\"1.0.30\"}");
4680
+ module.exports = JSON.parse("{\"a\":\"1.0.32\"}");
4681
4681
 
4682
4682
  /***/ }),
4683
4683
 
@@ -5438,12 +5438,13 @@ module.exports = require("setimmediate");
5438
5438
  /* harmony import */ var element_ui__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("5f72");
5439
5439
  /* harmony import */ var element_ui__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(element_ui__WEBPACK_IMPORTED_MODULE_0__);
5440
5440
  /* harmony import */ var three_trees_ui_src_utils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("025e");
5441
- /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("8bbf");
5442
- /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_2__);
5443
- /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("c5e1");
5444
- /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_3__);
5445
- /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("60bb");
5446
- /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_4__);
5441
+ /* harmony import */ var _util_base64__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("c46f");
5442
+ /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("8bbf");
5443
+ /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_3__);
5444
+ /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("c5e1");
5445
+ /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_4__);
5446
+ /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("60bb");
5447
+ /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_5__);
5447
5448
 
5448
5449
 
5449
5450
  const {
@@ -5455,6 +5456,7 @@ const {
5455
5456
 
5456
5457
 
5457
5458
 
5459
+
5458
5460
  /* harmony default export */ __webpack_exports__["a"] = ({
5459
5461
  data() {
5460
5462
  return {
@@ -5520,7 +5522,7 @@ const {
5520
5522
  me_.uploadParams.id.push(item.INSTID);
5521
5523
  });
5522
5524
  }
5523
- lodash__WEBPACK_IMPORTED_MODULE_4___default.a.debounce(() => {
5525
+ lodash__WEBPACK_IMPORTED_MODULE_5___default.a.debounce(() => {
5524
5526
  if (newVal && newVal.length > 0) {
5525
5527
  this.filterOldSummaryValByType('selected');
5526
5528
  this.summaryTableData.unshift({
@@ -5541,7 +5543,7 @@ const {
5541
5543
  let displayField = three_trees_ui_src_utils_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"].parseToJson(newVal.shows);
5542
5544
  let buttonsts = three_trees_ui_src_utils_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"].parseToJson(newVal.buttons);
5543
5545
  console.log(buttonsts);
5544
- if (buttonsts[0].isdefault == "1") {
5546
+ if (buttonsts[0].isdefault == '1') {
5545
5547
  this.isdefaultQuery = false;
5546
5548
  }
5547
5549
  for (var i = 0; i < displayField.length; i++) {
@@ -5612,7 +5614,7 @@ const {
5612
5614
  getCustomSummary(val) {
5613
5615
  const this_ = this;
5614
5616
  return new Promise(resolve => {
5615
- const tempComponent = vue__WEBPACK_IMPORTED_MODULE_2___default.a.extend({
5617
+ const tempComponent = vue__WEBPACK_IMPORTED_MODULE_3___default.a.extend({
5616
5618
  data() {
5617
5619
  return {
5618
5620
  summaryResult: this_.summaryTableData,
@@ -5760,7 +5762,7 @@ const {
5760
5762
  alias: this.alias || this.queryView.alias
5761
5763
  };
5762
5764
  params.pagination = pageBean;
5763
- if (jquery__WEBPACK_IMPORTED_MODULE_3___default.a.isEmptyObject(this.searchForm)) {
5765
+ if (jquery__WEBPACK_IMPORTED_MODULE_4___default.a.isEmptyObject(this.searchForm)) {
5764
5766
  return params;
5765
5767
  } else {
5766
5768
  for (var key in this.searchForm) {
@@ -5827,7 +5829,7 @@ const {
5827
5829
  },
5828
5830
  //获取查询条件类型
5829
5831
  getSearchItems() {
5830
- let searchItems = jquery__WEBPACK_IMPORTED_MODULE_3___default()('.search-item');
5832
+ let searchItems = jquery__WEBPACK_IMPORTED_MODULE_4___default()('.search-item');
5831
5833
  let operationMap = {}; //查询条件类型
5832
5834
  let operationType = {
5833
5835
  LK: 'LIKE',
@@ -5844,14 +5846,14 @@ const {
5844
5846
  if (searchItems) {
5845
5847
  for (var i = 0; i < searchItems.length; i++) {
5846
5848
  var operation = '=';
5847
- if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5849
+ if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5848
5850
  //查询条件类型
5849
- operation = jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('operation');
5850
- operationMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query')] = typeof operationType[operation] != 'undefined' ? operationType[operation] : operation;
5851
- } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5851
+ operation = jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('operation');
5852
+ operationMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query')] = typeof operationType[operation] != 'undefined' ? operationType[operation] : operation;
5853
+ } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5852
5854
  //查询条件类型
5853
- operation = jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('operation');
5854
- operationMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query')] = typeof operationType[operation] != 'undefined' ? operationType[operation] : operation;
5855
+ operation = jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('operation');
5856
+ operationMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query')] = typeof operationType[operation] != 'undefined' ? operationType[operation] : operation;
5855
5857
  }
5856
5858
  }
5857
5859
  }
@@ -5859,17 +5861,17 @@ const {
5859
5861
  },
5860
5862
  //获取查询条件字段
5861
5863
  getFieldQuery() {
5862
- let searchItems = jquery__WEBPACK_IMPORTED_MODULE_3___default()('.search-item');
5864
+ let searchItems = jquery__WEBPACK_IMPORTED_MODULE_4___default()('.search-item');
5863
5865
  let fieldQueryMap = {}; //查询条件字段
5864
5866
 
5865
5867
  if (searchItems) {
5866
5868
  for (var i = 0; i < searchItems.length; i++) {
5867
- if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5869
+ if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5868
5870
  //查询条件字段
5869
- fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query')] = jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('field-query');
5870
- } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5871
+ fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query')] = jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('field-query');
5872
+ } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5871
5873
  //查询条件字段
5872
- fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query')] = jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('field-query');
5874
+ fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query')] = jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('field-query');
5873
5875
  }
5874
5876
  }
5875
5877
  }
@@ -5877,17 +5879,17 @@ const {
5877
5879
  },
5878
5880
  //获取特殊查询情况（自定义对话框）
5879
5881
  getSpecialMap() {
5880
- let searchItems = jquery__WEBPACK_IMPORTED_MODULE_3___default()('.search-item');
5882
+ let searchItems = jquery__WEBPACK_IMPORTED_MODULE_4___default()('.search-item');
5881
5883
  let fieldQueryMap = {}; //查询条件字段
5882
5884
 
5883
5885
  if (searchItems) {
5884
5886
  for (var i = 0; i < searchItems.length; i++) {
5885
- if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5887
+ if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5886
5888
  //查询条件字段
5887
- fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query')] = typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('special-query') != 'undefined' ? true : false;
5888
- } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5889
+ fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query')] = typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('special-query') != 'undefined' ? true : false;
5890
+ } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5889
5891
  //查询条件字段
5890
- fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query')] = typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('special-query') != 'undefined' ? true : false;
5892
+ fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query')] = typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('special-query') != 'undefined' ? true : false;
5891
5893
  }
5892
5894
  }
5893
5895
  }
@@ -5973,8 +5975,9 @@ const {
5973
5975
  if (this.isdefaultQuery) {
5974
5976
  this.dialogExportVisible = true;
5975
5977
  } else {
5976
- this.exportData.expField = JSON.parse(JSON.stringify(this.displayFields));
5977
- console.log(this.exportData);
5978
+ // 增加导出字段限制
5979
+ const checkField = this.getCheckField().map(item => item.value);
5980
+ this.exportData.expField = this.displayFields.filter(item => checkField.includes(item.fieldName));
5978
5981
  this.submitExport();
5979
5982
  }
5980
5983
  },
@@ -6075,8 +6078,8 @@ const {
6075
6078
  });
6076
6079
  } else {
6077
6080
  let temp = this.displayFields[index - 1];
6078
- vue__WEBPACK_IMPORTED_MODULE_2___default.a.set(this.displayFields, index - 1, this.displayFields[index]);
6079
- vue__WEBPACK_IMPORTED_MODULE_2___default.a.set(this.displayFields, index, temp);
6081
+ vue__WEBPACK_IMPORTED_MODULE_3___default.a.set(this.displayFields, index - 1, this.displayFields[index]);
6082
+ vue__WEBPACK_IMPORTED_MODULE_3___default.a.set(this.displayFields, index, temp);
6080
6083
  }
6081
6084
  } else {
6082
6085
  if (index === this.displayFields.length - 1) {
@@ -6087,8 +6090,8 @@ const {
6087
6090
  } else {
6088
6091
  this.isTransition = true;
6089
6092
  let i = this.displayFields[index + 1];
6090
- vue__WEBPACK_IMPORTED_MODULE_2___default.a.set(this.displayFields, index + 1, this.displayFields[index]);
6091
- vue__WEBPACK_IMPORTED_MODULE_2___default.a.set(this.displayFields, index, i);
6093
+ vue__WEBPACK_IMPORTED_MODULE_3___default.a.set(this.displayFields, index + 1, this.displayFields[index]);
6094
+ vue__WEBPACK_IMPORTED_MODULE_3___default.a.set(this.displayFields, index, i);
6092
6095
  }
6093
6096
  }
6094
6097
  },
@@ -6216,6 +6219,14 @@ const {
6216
6219
  },
6217
6220
  showSearchPane() {
6218
6221
  return true;
6222
+ },
6223
+ getCheckField() {
6224
+ let customColumns = this.$refs.queryViewList.customColumns || [];
6225
+ let customColumnSetting = JSON.parse(localStorage.getItem('customColumnSetting') || '{}');
6226
+ const keys = customColumns.reduce((m, n) => m.concat(n.key), []);
6227
+ const customColumnsHashCode = three_trees_ui_src_utils_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"].hashCode(keys.join(','));
6228
+ const checkField = JSON.parse(Object(_util_base64__WEBPACK_IMPORTED_MODULE_2__[/* decode */ "a"])(customColumnSetting[customColumnsHashCode]) || '[]');
6229
+ return checkField.filter(field => field.checked && ['序号', '操作'].indexOf(field.value) == -1);
6219
6230
  }
6220
6231
  }
6221
6232
  });
@@ -45052,6 +45063,7 @@ const {
45052
45063
  saveAs: templatePreview_saveAs
45053
45064
  } = __webpack_require__("9588");
45054
45065
 
45066
+
45055
45067
  const req = function (url) {
45056
45068
  let data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
45057
45069
  let option = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -45485,7 +45497,9 @@ const req = function (url) {
45485
45497
  return list;
45486
45498
  },
45487
45499
  tableHeight() {
45488
- return this.summaryFields && this.summaryFields.length > 0 ? this.defaultCurrentInnerHeight - this.summaryTableHeight : this.defaultCurrentInnerHeight;
45500
+ const currentHeight = 0.85 * window.innerHeight;
45501
+ const tableHeight = this.currentTableHeight ? this.currentTableHeight : currentHeight;
45502
+ return this.summaryFields && this.summaryFields.length > 0 ? tableHeight - this.summaryTableHeight : tableHeight;
45489
45503
  }
45490
45504
  },
45491
45505
  mounted() {
@@ -47122,6 +47136,15 @@ const req = function (url) {
47122
47136
  if (type === 'searchResult') {
47123
47137
  this.curSelectParams.queryFilter.querys = this.templateSearchQuery;
47124
47138
  }
47139
+ // 增加导出字段限制
47140
+ const checkField = this.getCheckField();
47141
+ if (checkField && checkField.length) {
47142
+ let fieldExport = {};
47143
+ checkField.forEach(item => {
47144
+ fieldExport[item.key] = item.value;
47145
+ });
47146
+ this.curSelectParams.fieldExport = fieldExport;
47147
+ }
47125
47148
  this.$requestConfig.exportByBtnSetting({
47126
47149
  id: this.templateInfo.id,
47127
47150
  params: this.curSelectParams
@@ -48945,6 +48968,14 @@ const req = function (url) {
48945
48968
  } else {
48946
48969
  return strData;
48947
48970
  }
48971
+ },
48972
+ getCheckField() {
48973
+ let customColumns = this.$refs.multipleTemplateTable.customColumns || [];
48974
+ let customColumnSetting = JSON.parse(localStorage.getItem('customColumnSetting') || '{}');
48975
+ const keys = customColumns.reduce((m, n) => m.concat(n.key), []);
48976
+ const customColumnsHashCode = utils["a" /* default */].hashCode(keys.join(','));
48977
+ const checkField = JSON.parse(Object(base64["a" /* decode */])(customColumnSetting[customColumnsHashCode]) || '[]');
48978
+ return checkField.filter(field => field.checked && ['序号', '操作'].indexOf(field.value) == -1);
48948
48979
  }
48949
48980
  }
48950
48981
  // asyncComputed: {
package/lib/three-trees-ui.umd.js CHANGED
@@ -4686,7 +4686,7 @@ if (typeof window !== 'undefined' && window.Vue) {
4686
4686
  /***/ "9224":
4687
4687
  /***/ (function(module) {
4688
4688
 
4689
- module.exports = JSON.parse("{\"a\":\"1.0.30\"}");
4689
+ module.exports = JSON.parse("{\"a\":\"1.0.32\"}");
4690
4690
 
4691
4691
  /***/ }),
4692
4692
 
@@ -5447,12 +5447,13 @@ module.exports = require("setimmediate");
5447
5447
  /* harmony import */ var element_ui__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("5f72");
5448
5448
  /* harmony import */ var element_ui__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(element_ui__WEBPACK_IMPORTED_MODULE_0__);
5449
5449
  /* harmony import */ var three_trees_ui_src_utils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("025e");
5450
- /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("8bbf");
5451
- /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_2__);
5452
- /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("c5e1");
5453
- /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_3__);
5454
- /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("60bb");
5455
- /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_4__);
5450
+ /* harmony import */ var _util_base64__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("c46f");
5451
+ /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("8bbf");
5452
+ /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_3__);
5453
+ /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("c5e1");
5454
+ /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_4__);
5455
+ /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("60bb");
5456
+ /* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_5__);
5456
5457
 
5457
5458
 
5458
5459
  const {
@@ -5464,6 +5465,7 @@ const {
5464
5465
 
5465
5466
 
5466
5467
 
5468
+
5467
5469
  /* harmony default export */ __webpack_exports__["a"] = ({
5468
5470
  data() {
5469
5471
  return {
@@ -5529,7 +5531,7 @@ const {
5529
5531
  me_.uploadParams.id.push(item.INSTID);
5530
5532
  });
5531
5533
  }
5532
- lodash__WEBPACK_IMPORTED_MODULE_4___default.a.debounce(() => {
5534
+ lodash__WEBPACK_IMPORTED_MODULE_5___default.a.debounce(() => {
5533
5535
  if (newVal && newVal.length > 0) {
5534
5536
  this.filterOldSummaryValByType('selected');
5535
5537
  this.summaryTableData.unshift({
@@ -5550,7 +5552,7 @@ const {
5550
5552
  let displayField = three_trees_ui_src_utils_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"].parseToJson(newVal.shows);
5551
5553
  let buttonsts = three_trees_ui_src_utils_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"].parseToJson(newVal.buttons);
5552
5554
  console.log(buttonsts);
5553
- if (buttonsts[0].isdefault == "1") {
5555
+ if (buttonsts[0].isdefault == '1') {
5554
5556
  this.isdefaultQuery = false;
5555
5557
  }
5556
5558
  for (var i = 0; i < displayField.length; i++) {
@@ -5621,7 +5623,7 @@ const {
5621
5623
  getCustomSummary(val) {
5622
5624
  const this_ = this;
5623
5625
  return new Promise(resolve => {
5624
- const tempComponent = vue__WEBPACK_IMPORTED_MODULE_2___default.a.extend({
5626
+ const tempComponent = vue__WEBPACK_IMPORTED_MODULE_3___default.a.extend({
5625
5627
  data() {
5626
5628
  return {
5627
5629
  summaryResult: this_.summaryTableData,
@@ -5769,7 +5771,7 @@ const {
5769
5771
  alias: this.alias || this.queryView.alias
5770
5772
  };
5771
5773
  params.pagination = pageBean;
5772
- if (jquery__WEBPACK_IMPORTED_MODULE_3___default.a.isEmptyObject(this.searchForm)) {
5774
+ if (jquery__WEBPACK_IMPORTED_MODULE_4___default.a.isEmptyObject(this.searchForm)) {
5773
5775
  return params;
5774
5776
  } else {
5775
5777
  for (var key in this.searchForm) {
@@ -5836,7 +5838,7 @@ const {
5836
5838
  },
5837
5839
  //获取查询条件类型
5838
5840
  getSearchItems() {
5839
- let searchItems = jquery__WEBPACK_IMPORTED_MODULE_3___default()('.search-item');
5841
+ let searchItems = jquery__WEBPACK_IMPORTED_MODULE_4___default()('.search-item');
5840
5842
  let operationMap = {}; //查询条件类型
5841
5843
  let operationType = {
5842
5844
  LK: 'LIKE',
@@ -5853,14 +5855,14 @@ const {
5853
5855
  if (searchItems) {
5854
5856
  for (var i = 0; i < searchItems.length; i++) {
5855
5857
  var operation = '=';
5856
- if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5858
+ if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5857
5859
  //查询条件类型
5858
- operation = jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('operation');
5859
- operationMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query')] = typeof operationType[operation] != 'undefined' ? operationType[operation] : operation;
5860
- } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5860
+ operation = jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('operation');
5861
+ operationMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query')] = typeof operationType[operation] != 'undefined' ? operationType[operation] : operation;
5862
+ } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5861
5863
  //查询条件类型
5862
- operation = jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('operation');
5863
- operationMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query')] = typeof operationType[operation] != 'undefined' ? operationType[operation] : operation;
5864
+ operation = jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('operation');
5865
+ operationMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query')] = typeof operationType[operation] != 'undefined' ? operationType[operation] : operation;
5864
5866
  }
5865
5867
  }
5866
5868
  }
@@ -5868,17 +5870,17 @@ const {
5868
5870
  },
5869
5871
  //获取查询条件字段
5870
5872
  getFieldQuery() {
5871
- let searchItems = jquery__WEBPACK_IMPORTED_MODULE_3___default()('.search-item');
5873
+ let searchItems = jquery__WEBPACK_IMPORTED_MODULE_4___default()('.search-item');
5872
5874
  let fieldQueryMap = {}; //查询条件字段
5873
5875
 
5874
5876
  if (searchItems) {
5875
5877
  for (var i = 0; i < searchItems.length; i++) {
5876
- if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5878
+ if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5877
5879
  //查询条件字段
5878
- fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query')] = jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('field-query');
5879
- } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5880
+ fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query')] = jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('field-query');
5881
+ } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5880
5882
  //查询条件字段
5881
- fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query')] = jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('field-query');
5883
+ fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query')] = jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('field-query');
5882
5884
  }
5883
5885
  }
5884
5886
  }
@@ -5886,17 +5888,17 @@ const {
5886
5888
  },
5887
5889
  //获取特殊查询情况（自定义对话框）
5888
5890
  getSpecialMap() {
5889
- let searchItems = jquery__WEBPACK_IMPORTED_MODULE_3___default()('.search-item');
5891
+ let searchItems = jquery__WEBPACK_IMPORTED_MODULE_4___default()('.search-item');
5890
5892
  let fieldQueryMap = {}; //查询条件字段
5891
5893
 
5892
5894
  if (searchItems) {
5893
5895
  for (var i = 0; i < searchItems.length; i++) {
5894
- if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5896
+ if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query') != 'undefined') {
5895
5897
  //查询条件字段
5896
- fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('ht-query')] = typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).attr('special-query') != 'undefined' ? true : false;
5897
- } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5898
+ fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('ht-query')] = typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).attr('special-query') != 'undefined' ? true : false;
5899
+ } else if (typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query') != 'undefined') {
5898
5900
  //查询条件字段
5899
- fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('ht-query')] = typeof jquery__WEBPACK_IMPORTED_MODULE_3___default()(searchItems[i]).children().attr('special-query') != 'undefined' ? true : false;
5901
+ fieldQueryMap[jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('ht-query')] = typeof jquery__WEBPACK_IMPORTED_MODULE_4___default()(searchItems[i]).children().attr('special-query') != 'undefined' ? true : false;
5900
5902
  }
5901
5903
  }
5902
5904
  }
@@ -5982,8 +5984,9 @@ const {
5982
5984
  if (this.isdefaultQuery) {
5983
5985
  this.dialogExportVisible = true;
5984
5986
  } else {
5985
- this.exportData.expField = JSON.parse(JSON.stringify(this.displayFields));
5986
- console.log(this.exportData);
5987
+ // 增加导出字段限制
5988
+ const checkField = this.getCheckField().map(item => item.value);
5989
+ this.exportData.expField = this.displayFields.filter(item => checkField.includes(item.fieldName));
5987
5990
  this.submitExport();
5988
5991
  }
5989
5992
  },
@@ -6084,8 +6087,8 @@ const {
6084
6087
  });
6085
6088
  } else {
6086
6089
  let temp = this.displayFields[index - 1];
6087
- vue__WEBPACK_IMPORTED_MODULE_2___default.a.set(this.displayFields, index - 1, this.displayFields[index]);
6088
- vue__WEBPACK_IMPORTED_MODULE_2___default.a.set(this.displayFields, index, temp);
6090
+ vue__WEBPACK_IMPORTED_MODULE_3___default.a.set(this.displayFields, index - 1, this.displayFields[index]);
6091
+ vue__WEBPACK_IMPORTED_MODULE_3___default.a.set(this.displayFields, index, temp);
6089
6092
  }
6090
6093
  } else {
6091
6094
  if (index === this.displayFields.length - 1) {
@@ -6096,8 +6099,8 @@ const {
6096
6099
  } else {
6097
6100
  this.isTransition = true;
6098
6101
  let i = this.displayFields[index + 1];
6099
- vue__WEBPACK_IMPORTED_MODULE_2___default.a.set(this.displayFields, index + 1, this.displayFields[index]);
6100
- vue__WEBPACK_IMPORTED_MODULE_2___default.a.set(this.displayFields, index, i);
6102
+ vue__WEBPACK_IMPORTED_MODULE_3___default.a.set(this.displayFields, index + 1, this.displayFields[index]);
6103
+ vue__WEBPACK_IMPORTED_MODULE_3___default.a.set(this.displayFields, index, i);
6101
6104
  }
6102
6105
  }
6103
6106
  },
@@ -6225,6 +6228,14 @@ const {
6225
6228
  },
6226
6229
  showSearchPane() {
6227
6230
  return true;
6231
+ },
6232
+ getCheckField() {
6233
+ let customColumns = this.$refs.queryViewList.customColumns || [];
6234
+ let customColumnSetting = JSON.parse(localStorage.getItem('customColumnSetting') || '{}');
6235
+ const keys = customColumns.reduce((m, n) => m.concat(n.key), []);
6236
+ const customColumnsHashCode = three_trees_ui_src_utils_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"].hashCode(keys.join(','));
6237
+ const checkField = JSON.parse(Object(_util_base64__WEBPACK_IMPORTED_MODULE_2__[/* decode */ "a"])(customColumnSetting[customColumnsHashCode]) || '[]');
6238
+ return checkField.filter(field => field.checked && ['序号', '操作'].indexOf(field.value) == -1);
6228
6239
  }
6229
6240
  }
6230
6241
  });
@@ -45061,6 +45072,7 @@ const {
45061
45072
  saveAs: templatePreview_saveAs
45062
45073
  } = __webpack_require__("9588");
45063
45074
 
45075
+
45064
45076
  const req = function (url) {
45065
45077
  let data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
45066
45078
  let option = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -45494,7 +45506,9 @@ const req = function (url) {
45494
45506
  return list;
45495
45507
  },
45496
45508
  tableHeight() {
45497
- return this.summaryFields && this.summaryFields.length > 0 ? this.defaultCurrentInnerHeight - this.summaryTableHeight : this.defaultCurrentInnerHeight;
45509
+ const currentHeight = 0.85 * window.innerHeight;
45510
+ const tableHeight = this.currentTableHeight ? this.currentTableHeight : currentHeight;
45511
+ return this.summaryFields && this.summaryFields.length > 0 ? tableHeight - this.summaryTableHeight : tableHeight;
45498
45512
  }
45499
45513
  },
45500
45514
  mounted() {
@@ -47131,6 +47145,15 @@ const req = function (url) {
47131
47145
  if (type === 'searchResult') {
47132
47146
  this.curSelectParams.queryFilter.querys = this.templateSearchQuery;
47133
47147
  }
47148
+ // 增加导出字段限制
47149
+ const checkField = this.getCheckField();
47150
+ if (checkField && checkField.length) {
47151
+ let fieldExport = {};
47152
+ checkField.forEach(item => {
47153
+ fieldExport[item.key] = item.value;
47154
+ });
47155
+ this.curSelectParams.fieldExport = fieldExport;
47156
+ }
47134
47157
  this.$requestConfig.exportByBtnSetting({
47135
47158
  id: this.templateInfo.id,
47136
47159
  params: this.curSelectParams
@@ -48954,6 +48977,14 @@ const req = function (url) {
48954
48977
  } else {
48955
48978
  return strData;
48956
48979
  }
48980
+ },
48981
+ getCheckField() {
48982
+ let customColumns = this.$refs.multipleTemplateTable.customColumns || [];
48983
+ let customColumnSetting = JSON.parse(localStorage.getItem('customColumnSetting') || '{}');
48984
+ const keys = customColumns.reduce((m, n) => m.concat(n.key), []);
48985
+ const customColumnsHashCode = utils["a" /* default */].hashCode(keys.join(','));
48986
+ const checkField = JSON.parse(Object(base64["a" /* decode */])(customColumnSetting[customColumnsHashCode]) || '[]');
48987
+ return checkField.filter(field => field.checked && ['序号', '操作'].indexOf(field.value) == -1);
48957
48988
  }
48958
48989
  }
48959
48990
  // asyncComputed: {