epx-frame 4.0.9 → 4.0.11

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.
@@ -2456,10 +2456,10 @@ var EntityListvue_type_script_lang_js = __webpack_require__(98);
2456
2456
  var injectStylesIntoStyleTag = __webpack_require__(19);
2457
2457
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
2458
2458
 
2459
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2460
- var EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss = __webpack_require__(132);
2459
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2460
+ var EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss = __webpack_require__(132);
2461
2461
 
2462
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2462
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2463
2463
 
2464
2464
 
2465
2465
 
@@ -2468,12 +2468,12 @@ var options = {};
2468
2468
  options.insert = "head";
2469
2469
  options.singleton = false;
2470
2470
 
2471
- var update = injectStylesIntoStyleTag_default()(EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss["a" /* default */], options);
2471
+ var update = injectStylesIntoStyleTag_default()(EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss["a" /* default */], options);
2472
2472
 
2473
2473
 
2474
2474
 
2475
- /* harmony default export */ var entity_list_EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss = (EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss["a" /* default */].locals || {});
2476
- // CONCATENATED MODULE: ./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2475
+ /* harmony default export */ var entity_list_EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss = (EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss["a" /* default */].locals || {});
2476
+ // CONCATENATED MODULE: ./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2477
2477
 
2478
2478
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
2479
2479
  var componentNormalizer = __webpack_require__(15);
@@ -3256,6 +3256,9 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
3256
3256
  },
3257
3257
  inject: ['upPage'],
3258
3258
  computed: {
3259
+ showFlag: function showFlag() {
3260
+ return !this.$configs.showCondition || this.$configs.showCondition.length === 0 || this.$util.runExpByScope.call(this, this.$configs.showCondition, this.formData);
3261
+ },
3259
3262
  // 展示查询字段数量
3260
3263
  showFieldNum: function showFieldNum() {
3261
3264
  var _this$$configs$showFi = this.$configs.showFieldNum,
@@ -3984,6 +3987,7 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
3984
3987
  },
3985
3988
  methods: {
3986
3989
  initComponent: function initComponent() {
3990
+ if (!this.showFlag) return;
3987
3991
  var pageSize = this.$configs.pageSize;
3988
3992
  this.pageSize = Number(pageSize);
3989
3993
  this.getDefaultOperates();
@@ -8388,8 +8392,7 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
8388
8392
  render: function render() {
8389
8393
  var _this71 = this;
8390
8394
  var h = arguments[0];
8391
- var showFlag = !this.$configs.showCondition || this.$configs.showCondition.length === 0 || this.$util.runExpByScope.call(this, this.$configs.showCondition, this.formData);
8392
- if (!showFlag) return;
8395
+ if (!this.showFlag) return;
8393
8396
  if (this.$isMobile) {
8394
8397
  return this.renderMobile();
8395
8398
  }
@@ -8765,11 +8768,22 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
8765
8768
  };
8766
8769
  if (item.type === 'meta') {
8767
8770
  field.type = item.type;
8768
- field.showWay = item.showWay || 'value';
8769
- field.separator = '、';
8771
+ var showWay = item.function && item.function !== 'GROUP_CONCAT' ? 'statistics' : 'value';
8772
+ field.showWay = item.showWay || showWay;
8773
+ if (item.function) field.statisticsType = item.function;
8770
8774
  } else {
8771
8775
  field.attriName = item.attriName + '#';
8772
8776
  }
8777
+ if (item.alias) field.alias = item.alias;
8778
+ if (item.showWay) {
8779
+ field.showWay = item.showWay === 'record' ? 'statistics' : item.showWay;
8780
+ if (item.showWay === 'statistics') {
8781
+ field.statisticsType = item.statisticsType || 'SUM';
8782
+ }
8783
+ if (item.showWay === 'el') {
8784
+ field.showEl = item.showEl;
8785
+ }
8786
+ }
8773
8787
  if (item.showFieldNum) {
8774
8788
  field.showFieldNum = item.showFieldNum;
8775
8789
  }
@@ -10529,10 +10543,10 @@ var Mobilevue_type_script_lang_js = __webpack_require__(99);
10529
10543
  var injectStylesIntoStyleTag = __webpack_require__(19);
10530
10544
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
10531
10545
 
10532
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10533
- var Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss = __webpack_require__(133);
10546
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10547
+ var Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss = __webpack_require__(133);
10534
10548
 
10535
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10549
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10536
10550
 
10537
10551
 
10538
10552
 
@@ -10541,12 +10555,12 @@ var options = {};
10541
10555
  options.insert = "head";
10542
10556
  options.singleton = false;
10543
10557
 
10544
- var update = injectStylesIntoStyleTag_default()(Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss["a" /* default */], options);
10558
+ var update = injectStylesIntoStyleTag_default()(Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss["a" /* default */], options);
10545
10559
 
10546
10560
 
10547
10561
 
10548
- /* harmony default export */ var components_Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss = (Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss["a" /* default */].locals || {});
10549
- // CONCATENATED MODULE: ./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10562
+ /* harmony default export */ var components_Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss = (Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss["a" /* default */].locals || {});
10563
+ // CONCATENATED MODULE: ./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10550
10564
 
10551
10565
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
10552
10566
  var componentNormalizer = __webpack_require__(15);
@@ -2456,10 +2456,10 @@ var EntityListvue_type_script_lang_js = __webpack_require__(98);
2456
2456
  var injectStylesIntoStyleTag = __webpack_require__(19);
2457
2457
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
2458
2458
 
2459
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2460
- var EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss = __webpack_require__(132);
2459
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2460
+ var EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss = __webpack_require__(132);
2461
2461
 
2462
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2462
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2463
2463
 
2464
2464
 
2465
2465
 
@@ -2468,12 +2468,12 @@ var options = {};
2468
2468
  options.insert = "head";
2469
2469
  options.singleton = false;
2470
2470
 
2471
- var update = injectStylesIntoStyleTag_default()(EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss["a" /* default */], options);
2471
+ var update = injectStylesIntoStyleTag_default()(EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss["a" /* default */], options);
2472
2472
 
2473
2473
 
2474
2474
 
2475
- /* harmony default export */ var entity_list_EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss = (EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss["a" /* default */].locals || {});
2476
- // CONCATENATED MODULE: ./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2475
+ /* harmony default export */ var entity_list_EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss = (EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss["a" /* default */].locals || {});
2476
+ // CONCATENATED MODULE: ./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2477
2477
 
2478
2478
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
2479
2479
  var componentNormalizer = __webpack_require__(15);
@@ -3256,6 +3256,9 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
3256
3256
  },
3257
3257
  inject: ['upPage'],
3258
3258
  computed: {
3259
+ showFlag: function showFlag() {
3260
+ return !this.$configs.showCondition || this.$configs.showCondition.length === 0 || this.$util.runExpByScope.call(this, this.$configs.showCondition, this.formData);
3261
+ },
3259
3262
  // 展示查询字段数量
3260
3263
  showFieldNum: function showFieldNum() {
3261
3264
  var _this$$configs$showFi = this.$configs.showFieldNum,
@@ -3984,6 +3987,7 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
3984
3987
  },
3985
3988
  methods: {
3986
3989
  initComponent: function initComponent() {
3990
+ if (!this.showFlag) return;
3987
3991
  var pageSize = this.$configs.pageSize;
3988
3992
  this.pageSize = Number(pageSize);
3989
3993
  this.getDefaultOperates();
@@ -8388,8 +8392,7 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
8388
8392
  render: function render() {
8389
8393
  var _this71 = this;
8390
8394
  var h = arguments[0];
8391
- var showFlag = !this.$configs.showCondition || this.$configs.showCondition.length === 0 || this.$util.runExpByScope.call(this, this.$configs.showCondition, this.formData);
8392
- if (!showFlag) return;
8395
+ if (!this.showFlag) return;
8393
8396
  if (this.$isMobile) {
8394
8397
  return this.renderMobile();
8395
8398
  }
@@ -8765,11 +8768,22 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
8765
8768
  };
8766
8769
  if (item.type === 'meta') {
8767
8770
  field.type = item.type;
8768
- field.showWay = item.showWay || 'value';
8769
- field.separator = '、';
8771
+ var showWay = item.function && item.function !== 'GROUP_CONCAT' ? 'statistics' : 'value';
8772
+ field.showWay = item.showWay || showWay;
8773
+ if (item.function) field.statisticsType = item.function;
8770
8774
  } else {
8771
8775
  field.attriName = item.attriName + '#';
8772
8776
  }
8777
+ if (item.alias) field.alias = item.alias;
8778
+ if (item.showWay) {
8779
+ field.showWay = item.showWay === 'record' ? 'statistics' : item.showWay;
8780
+ if (item.showWay === 'statistics') {
8781
+ field.statisticsType = item.statisticsType || 'SUM';
8782
+ }
8783
+ if (item.showWay === 'el') {
8784
+ field.showEl = item.showEl;
8785
+ }
8786
+ }
8773
8787
  if (item.showFieldNum) {
8774
8788
  field.showFieldNum = item.showFieldNum;
8775
8789
  }
@@ -10529,10 +10543,10 @@ var Mobilevue_type_script_lang_js = __webpack_require__(99);
10529
10543
  var injectStylesIntoStyleTag = __webpack_require__(19);
10530
10544
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
10531
10545
 
10532
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10533
- var Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss = __webpack_require__(133);
10546
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10547
+ var Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss = __webpack_require__(133);
10534
10548
 
10535
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10549
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10536
10550
 
10537
10551
 
10538
10552
 
@@ -10541,12 +10555,12 @@ var options = {};
10541
10555
  options.insert = "head";
10542
10556
  options.singleton = false;
10543
10557
 
10544
- var update = injectStylesIntoStyleTag_default()(Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss["a" /* default */], options);
10558
+ var update = injectStylesIntoStyleTag_default()(Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss["a" /* default */], options);
10545
10559
 
10546
10560
 
10547
10561
 
10548
- /* harmony default export */ var components_Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss = (Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss["a" /* default */].locals || {});
10549
- // CONCATENATED MODULE: ./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10562
+ /* harmony default export */ var components_Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss = (Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss["a" /* default */].locals || {});
10563
+ // CONCATENATED MODULE: ./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10550
10564
 
10551
10565
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
10552
10566
  var componentNormalizer = __webpack_require__(15);
@@ -2456,10 +2456,10 @@ var EntityListvue_type_script_lang_js = __webpack_require__(98);
2456
2456
  var injectStylesIntoStyleTag = __webpack_require__(19);
2457
2457
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
2458
2458
 
2459
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2460
- var EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss = __webpack_require__(132);
2459
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2460
+ var EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss = __webpack_require__(132);
2461
2461
 
2462
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2462
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2463
2463
 
2464
2464
 
2465
2465
 
@@ -2468,12 +2468,12 @@ var options = {};
2468
2468
  options.insert = "head";
2469
2469
  options.singleton = false;
2470
2470
 
2471
- var update = injectStylesIntoStyleTag_default()(EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss["a" /* default */], options);
2471
+ var update = injectStylesIntoStyleTag_default()(EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss["a" /* default */], options);
2472
2472
 
2473
2473
 
2474
2474
 
2475
- /* harmony default export */ var entity_list_EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss = (EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss["a" /* default */].locals || {});
2476
- // CONCATENATED MODULE: ./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2475
+ /* harmony default export */ var entity_list_EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss = (EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss["a" /* default */].locals || {});
2476
+ // CONCATENATED MODULE: ./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2477
2477
 
2478
2478
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
2479
2479
  var componentNormalizer = __webpack_require__(15);
@@ -3256,6 +3256,9 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
3256
3256
  },
3257
3257
  inject: ['upPage'],
3258
3258
  computed: {
3259
+ showFlag: function showFlag() {
3260
+ return !this.$configs.showCondition || this.$configs.showCondition.length === 0 || this.$util.runExpByScope.call(this, this.$configs.showCondition, this.formData);
3261
+ },
3259
3262
  // 展示查询字段数量
3260
3263
  showFieldNum: function showFieldNum() {
3261
3264
  var _this$$configs$showFi = this.$configs.showFieldNum,
@@ -3984,6 +3987,7 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
3984
3987
  },
3985
3988
  methods: {
3986
3989
  initComponent: function initComponent() {
3990
+ if (!this.showFlag) return;
3987
3991
  var pageSize = this.$configs.pageSize;
3988
3992
  this.pageSize = Number(pageSize);
3989
3993
  this.getDefaultOperates();
@@ -8388,8 +8392,7 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
8388
8392
  render: function render() {
8389
8393
  var _this71 = this;
8390
8394
  var h = arguments[0];
8391
- var showFlag = !this.$configs.showCondition || this.$configs.showCondition.length === 0 || this.$util.runExpByScope.call(this, this.$configs.showCondition, this.formData);
8392
- if (!showFlag) return;
8395
+ if (!this.showFlag) return;
8393
8396
  if (this.$isMobile) {
8394
8397
  return this.renderMobile();
8395
8398
  }
@@ -8765,11 +8768,22 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
8765
8768
  };
8766
8769
  if (item.type === 'meta') {
8767
8770
  field.type = item.type;
8768
- field.showWay = item.showWay || 'value';
8769
- field.separator = '、';
8771
+ var showWay = item.function && item.function !== 'GROUP_CONCAT' ? 'statistics' : 'value';
8772
+ field.showWay = item.showWay || showWay;
8773
+ if (item.function) field.statisticsType = item.function;
8770
8774
  } else {
8771
8775
  field.attriName = item.attriName + '#';
8772
8776
  }
8777
+ if (item.alias) field.alias = item.alias;
8778
+ if (item.showWay) {
8779
+ field.showWay = item.showWay === 'record' ? 'statistics' : item.showWay;
8780
+ if (item.showWay === 'statistics') {
8781
+ field.statisticsType = item.statisticsType || 'SUM';
8782
+ }
8783
+ if (item.showWay === 'el') {
8784
+ field.showEl = item.showEl;
8785
+ }
8786
+ }
8773
8787
  if (item.showFieldNum) {
8774
8788
  field.showFieldNum = item.showFieldNum;
8775
8789
  }
@@ -10529,10 +10543,10 @@ var Mobilevue_type_script_lang_js = __webpack_require__(99);
10529
10543
  var injectStylesIntoStyleTag = __webpack_require__(19);
10530
10544
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
10531
10545
 
10532
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10533
- var Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss = __webpack_require__(133);
10546
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10547
+ var Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss = __webpack_require__(133);
10534
10548
 
10535
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10549
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10536
10550
 
10537
10551
 
10538
10552
 
@@ -10541,12 +10555,12 @@ var options = {};
10541
10555
  options.insert = "head";
10542
10556
  options.singleton = false;
10543
10557
 
10544
- var update = injectStylesIntoStyleTag_default()(Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss["a" /* default */], options);
10558
+ var update = injectStylesIntoStyleTag_default()(Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss["a" /* default */], options);
10545
10559
 
10546
10560
 
10547
10561
 
10548
- /* harmony default export */ var components_Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss = (Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss["a" /* default */].locals || {});
10549
- // CONCATENATED MODULE: ./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10562
+ /* harmony default export */ var components_Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss = (Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss["a" /* default */].locals || {});
10563
+ // CONCATENATED MODULE: ./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10550
10564
 
10551
10565
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
10552
10566
  var componentNormalizer = __webpack_require__(15);
@@ -2456,10 +2456,10 @@ var EntityListvue_type_script_lang_js = __webpack_require__(98);
2456
2456
  var injectStylesIntoStyleTag = __webpack_require__(19);
2457
2457
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
2458
2458
 
2459
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2460
- var EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss = __webpack_require__(132);
2459
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2460
+ var EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss = __webpack_require__(132);
2461
2461
 
2462
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2462
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2463
2463
 
2464
2464
 
2465
2465
 
@@ -2468,12 +2468,12 @@ var options = {};
2468
2468
  options.insert = "head";
2469
2469
  options.singleton = false;
2470
2470
 
2471
- var update = injectStylesIntoStyleTag_default()(EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss["a" /* default */], options);
2471
+ var update = injectStylesIntoStyleTag_default()(EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss["a" /* default */], options);
2472
2472
 
2473
2473
 
2474
2474
 
2475
- /* harmony default export */ var entity_list_EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss = (EntityListvue_type_style_index_0_id_263acd32_prod_lang_scss["a" /* default */].locals || {});
2476
- // CONCATENATED MODULE: ./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=263acd32&prod&lang=scss
2475
+ /* harmony default export */ var entity_list_EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss = (EntityListvue_type_style_index_0_id_7c4ff008_prod_lang_scss["a" /* default */].locals || {});
2476
+ // CONCATENATED MODULE: ./src/frame/packages/entity-list/EntityList.vue?vue&type=style&index=0&id=7c4ff008&prod&lang=scss
2477
2477
 
2478
2478
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
2479
2479
  var componentNormalizer = __webpack_require__(15);
@@ -3256,6 +3256,9 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
3256
3256
  },
3257
3257
  inject: ['upPage'],
3258
3258
  computed: {
3259
+ showFlag: function showFlag() {
3260
+ return !this.$configs.showCondition || this.$configs.showCondition.length === 0 || this.$util.runExpByScope.call(this, this.$configs.showCondition, this.formData);
3261
+ },
3259
3262
  // 展示查询字段数量
3260
3263
  showFieldNum: function showFieldNum() {
3261
3264
  var _this$$configs$showFi = this.$configs.showFieldNum,
@@ -3984,6 +3987,7 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
3984
3987
  },
3985
3988
  methods: {
3986
3989
  initComponent: function initComponent() {
3990
+ if (!this.showFlag) return;
3987
3991
  var pageSize = this.$configs.pageSize;
3988
3992
  this.pageSize = Number(pageSize);
3989
3993
  this.getDefaultOperates();
@@ -8388,8 +8392,7 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
8388
8392
  render: function render() {
8389
8393
  var _this71 = this;
8390
8394
  var h = arguments[0];
8391
- var showFlag = !this.$configs.showCondition || this.$configs.showCondition.length === 0 || this.$util.runExpByScope.call(this, this.$configs.showCondition, this.formData);
8392
- if (!showFlag) return;
8395
+ if (!this.showFlag) return;
8393
8396
  if (this.$isMobile) {
8394
8397
  return this.renderMobile();
8395
8398
  }
@@ -8765,11 +8768,22 @@ var _excluded = ["num", "printWay", "printCode", "cptName", "params"];
8765
8768
  };
8766
8769
  if (item.type === 'meta') {
8767
8770
  field.type = item.type;
8768
- field.showWay = item.showWay || 'value';
8769
- field.separator = '、';
8771
+ var showWay = item.function && item.function !== 'GROUP_CONCAT' ? 'statistics' : 'value';
8772
+ field.showWay = item.showWay || showWay;
8773
+ if (item.function) field.statisticsType = item.function;
8770
8774
  } else {
8771
8775
  field.attriName = item.attriName + '#';
8772
8776
  }
8777
+ if (item.alias) field.alias = item.alias;
8778
+ if (item.showWay) {
8779
+ field.showWay = item.showWay === 'record' ? 'statistics' : item.showWay;
8780
+ if (item.showWay === 'statistics') {
8781
+ field.statisticsType = item.statisticsType || 'SUM';
8782
+ }
8783
+ if (item.showWay === 'el') {
8784
+ field.showEl = item.showEl;
8785
+ }
8786
+ }
8773
8787
  if (item.showFieldNum) {
8774
8788
  field.showFieldNum = item.showFieldNum;
8775
8789
  }
@@ -10529,10 +10543,10 @@ var Mobilevue_type_script_lang_js = __webpack_require__(99);
10529
10543
  var injectStylesIntoStyleTag = __webpack_require__(19);
10530
10544
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
10531
10545
 
10532
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10533
- var Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss = __webpack_require__(133);
10546
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10547
+ var Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss = __webpack_require__(133);
10534
10548
 
10535
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10549
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10536
10550
 
10537
10551
 
10538
10552
 
@@ -10541,12 +10555,12 @@ var options = {};
10541
10555
  options.insert = "head";
10542
10556
  options.singleton = false;
10543
10557
 
10544
- var update = injectStylesIntoStyleTag_default()(Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss["a" /* default */], options);
10558
+ var update = injectStylesIntoStyleTag_default()(Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss["a" /* default */], options);
10545
10559
 
10546
10560
 
10547
10561
 
10548
- /* harmony default export */ var components_Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss = (Mobilevue_type_style_index_0_id_2b351169_prod_lang_scss["a" /* default */].locals || {});
10549
- // CONCATENATED MODULE: ./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=2b351169&prod&lang=scss
10562
+ /* harmony default export */ var components_Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss = (Mobilevue_type_style_index_0_id_0a5061ee_prod_lang_scss["a" /* default */].locals || {});
10563
+ // CONCATENATED MODULE: ./src/frame/packages/entity-list/components/Mobile.vue?vue&type=style&index=0&id=0a5061ee&prod&lang=scss
10550
10564
 
10551
10565
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
10552
10566
  var componentNormalizer = __webpack_require__(15);
@@ -10886,6 +10900,7 @@ module.exports = require("epx-frame/lib/entity-list");
10886
10900
  }))();
10887
10901
  },
10888
10902
  initComponent: function initComponent() {
10903
+ if (!this.showFlag) return;
10889
10904
  // 获取子集查询条件
10890
10905
  this.getDefaultOperates();
10891
10906
  this.getFields();
@@ -11787,10 +11802,10 @@ var EntitySubListvue_type_script_lang_js = __webpack_require__(198);
11787
11802
  var injectStylesIntoStyleTag = __webpack_require__(19);
11788
11803
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
11789
11804
 
11790
- // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-sub-list/EntitySubList.vue?vue&type=style&index=0&id=86f00c3e&prod&lang=scss
11791
- var EntitySubListvue_type_style_index_0_id_86f00c3e_prod_lang_scss = __webpack_require__(282);
11805
+ // EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-sub-list/EntitySubList.vue?vue&type=style&index=0&id=590349c9&prod&lang=scss
11806
+ var EntitySubListvue_type_style_index_0_id_590349c9_prod_lang_scss = __webpack_require__(282);
11792
11807
 
11793
- // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-sub-list/EntitySubList.vue?vue&type=style&index=0&id=86f00c3e&prod&lang=scss
11808
+ // CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/entity-sub-list/EntitySubList.vue?vue&type=style&index=0&id=590349c9&prod&lang=scss
11794
11809
 
11795
11810
 
11796
11811
 
@@ -11799,12 +11814,12 @@ var options = {};
11799
11814
  options.insert = "head";
11800
11815
  options.singleton = false;
11801
11816
 
11802
- var update = injectStylesIntoStyleTag_default()(EntitySubListvue_type_style_index_0_id_86f00c3e_prod_lang_scss["a" /* default */], options);
11817
+ var update = injectStylesIntoStyleTag_default()(EntitySubListvue_type_style_index_0_id_590349c9_prod_lang_scss["a" /* default */], options);
11803
11818
 
11804
11819
 
11805
11820
 
11806
- /* harmony default export */ var entity_sub_list_EntitySubListvue_type_style_index_0_id_86f00c3e_prod_lang_scss = (EntitySubListvue_type_style_index_0_id_86f00c3e_prod_lang_scss["a" /* default */].locals || {});
11807
- // CONCATENATED MODULE: ./src/frame/packages/entity-sub-list/EntitySubList.vue?vue&type=style&index=0&id=86f00c3e&prod&lang=scss
11821
+ /* harmony default export */ var entity_sub_list_EntitySubListvue_type_style_index_0_id_590349c9_prod_lang_scss = (EntitySubListvue_type_style_index_0_id_590349c9_prod_lang_scss["a" /* default */].locals || {});
11822
+ // CONCATENATED MODULE: ./src/frame/packages/entity-sub-list/EntitySubList.vue?vue&type=style&index=0&id=590349c9&prod&lang=scss
11808
11823
 
11809
11824
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
11810
11825
  var componentNormalizer = __webpack_require__(15);