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.
Files changed (15) hide show
  1. package/lib/2.js +1 -1
  2. package/lib/add-form.js +35 -30
  3. package/lib/apply-form.js +35 -30
  4. package/lib/category-list.js +30 -16
  5. package/lib/edit-entity-list.js +30 -16
  6. package/lib/entity-card-list.js +30 -16
  7. package/lib/entity-list-find.js +30 -16
  8. package/lib/entity-list.js +30 -16
  9. package/lib/entity-sub-list.js +37 -22
  10. package/lib/epx-frame.common.js +1 -1
  11. package/lib/form-item.js +19 -19
  12. package/lib/formula.js +1 -1
  13. package/lib/page.js +1 -1
  14. package/lib/report-chart.js +43 -29
  15. package/package.json +1 -1
package/lib/add-form.js CHANGED
@@ -4212,13 +4212,14 @@ var _excluded = ["action", "rule", "metaId", "text", "num", "confirm", "confirmM
4212
4212
  var _fieldConfigs = _step.value;
4213
4213
  var _field = _fieldConfigs.attriName;
4214
4214
  var formValue = form.model.data[_field];
4215
+ console.log(form.model.data);
4215
4216
  var submitValue = formValue;
4216
4217
  if (Array.isArray(formValue)) {
4217
4218
  submitValue = formValue[formValue.length - 1];
4218
4219
  }
4219
- this.submitData[_field] = submitValue || '';
4220
+ this.submitData[_field] = this.$_.isNil(submitValue) ? '' : submitValue;
4220
4221
  if (_fieldConfigs.state === 'READONLY' || _fieldConfigs.submitValue === false || _fieldConfigs.dataType === 'password' && !submitValue) continue;
4221
- params["bean.".concat(_field)] = submitValue || '';
4222
+ params["bean.".concat(_field)] = this.$_.isNil(submitValue) ? '' : submitValue;
4222
4223
  if (_fieldConfigs.state === 'HIDDEN' && _fieldConfigs.isDateNow) {
4223
4224
  this.submitData[_field] = this.$moment().format('YYYY-MM-DD HH:mm:ss');
4224
4225
  params["bean.".concat(_field)] = this.$moment().format('YYYY-MM-DD HH:mm:ss');
@@ -4236,6 +4237,7 @@ var _excluded = ["action", "rule", "metaId", "text", "num", "confirm", "confirmM
4236
4237
  }
4237
4238
  }
4238
4239
  }
4240
+ console.log(params);
4239
4241
  params = this.$formatParams(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"])({}, params));
4240
4242
  if (this.data.subEntitys) {
4241
4243
  params.subEntitys = this.data.subEntitys;
@@ -4493,12 +4495,15 @@ var _excluded = ["action", "rule", "metaId", "text", "num", "confirm", "confirmM
4493
4495
  }
4494
4496
  // 获取form表单 提交
4495
4497
  var formParams = this.getFormData(buttonConfig);
4498
+ console.log(formParams);
4496
4499
  var submitParams = this.$_.assignWith(this.$formatParams(pageSubmitParams), formParams, function (pageSubmitValue, formValue) {
4497
- return formValue || pageSubmitValue;
4500
+ return _this27.$_.isNil(formValue) ? pageSubmitValue : formValue;
4498
4501
  });
4502
+ console.log(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"])({}, submitParams));
4499
4503
  submitParams = this.$_.assignWith(submitParams, this.submitParams, function (submitValue, _submitValue) {
4500
- return submitValue || _submitValue;
4504
+ return _this27.$_.isNil(_submitValue) ? _submitValue : submitValue;
4501
4505
  });
4506
+ console.log(submitParams);
4502
4507
  var submitFn = function submitFn() {
4503
4508
  if (!formParams) return;
4504
4509
  if (_this27.$query.noSubmit === true) {
@@ -5741,7 +5746,7 @@ ___CSS_LOADER_EXPORT___.push([module.i, ".djs-visual.pass rect{stroke:#67C23A !i
5741
5746
 
5742
5747
  var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
5743
5748
  // Module
5744
- ___CSS_LOADER_EXPORT___.push([module.i, ".catalog__item-title-left[data-v-78427db8]{display:inline-block;width:20px;text-align:center}.catalog__item-title-icon[data-v-78427db8]{margin-right:6px}.catalog__item-dot[data-v-78427db8]{display:inline-block;width:4px;height:4px;border-radius:50%;background-color:#999;position:relative;top:-3px}.catalog-item-num[data-v-78427db8]{font-weight:500}\n", ""]);
5749
+ ___CSS_LOADER_EXPORT___.push([module.i, ".catalog__item-title-left[data-v-affb65fc]{display:inline-block;width:20px;text-align:center}.catalog__item-title-icon[data-v-affb65fc]{margin-right:6px}.catalog__item-dot[data-v-affb65fc]{display:inline-block;width:4px;height:4px;border-radius:50%;background-color:#999;position:relative;top:-3px}.catalog-item-num[data-v-affb65fc]{font-weight:500}\n", ""]);
5745
5750
  // Exports
5746
5751
  /* harmony default export */ __webpack_exports__["a"] = (___CSS_LOADER_EXPORT___);
5747
5752
 
@@ -5816,10 +5821,10 @@ var AddFormvue_type_script_lang_js = __webpack_require__(161);
5816
5821
  var injectStylesIntoStyleTag = __webpack_require__(19);
5817
5822
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
5818
5823
 
5819
- // 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/add-form/AddForm.vue?vue&type=style&index=0&id=78427db8&prod&lang=scss
5820
- var AddFormvue_type_style_index_0_id_78427db8_prod_lang_scss = __webpack_require__(172);
5824
+ // 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/add-form/AddForm.vue?vue&type=style&index=0&id=affb65fc&prod&lang=scss
5825
+ var AddFormvue_type_style_index_0_id_affb65fc_prod_lang_scss = __webpack_require__(172);
5821
5826
 
5822
- // 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/add-form/AddForm.vue?vue&type=style&index=0&id=78427db8&prod&lang=scss
5827
+ // 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/add-form/AddForm.vue?vue&type=style&index=0&id=affb65fc&prod&lang=scss
5823
5828
 
5824
5829
 
5825
5830
 
@@ -5828,50 +5833,50 @@ var options = {};
5828
5833
  options.insert = "head";
5829
5834
  options.singleton = false;
5830
5835
 
5831
- var update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_0_id_78427db8_prod_lang_scss["a" /* default */], options);
5836
+ var update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_0_id_affb65fc_prod_lang_scss["a" /* default */], options);
5832
5837
 
5833
5838
 
5834
5839
 
5835
- /* harmony default export */ var add_form_AddFormvue_type_style_index_0_id_78427db8_prod_lang_scss = (AddFormvue_type_style_index_0_id_78427db8_prod_lang_scss["a" /* default */].locals || {});
5836
- // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=0&id=78427db8&prod&lang=scss
5840
+ /* harmony default export */ var add_form_AddFormvue_type_style_index_0_id_affb65fc_prod_lang_scss = (AddFormvue_type_style_index_0_id_affb65fc_prod_lang_scss["a" /* default */].locals || {});
5841
+ // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=0&id=affb65fc&prod&lang=scss
5837
5842
 
5838
- // 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/add-form/AddForm.vue?vue&type=style&index=1&id=78427db8&prod&lang=scss
5839
- var AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss = __webpack_require__(173);
5843
+ // 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/add-form/AddForm.vue?vue&type=style&index=1&id=affb65fc&prod&lang=scss
5844
+ var AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss = __webpack_require__(173);
5840
5845
 
5841
- // 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/add-form/AddForm.vue?vue&type=style&index=1&id=78427db8&prod&lang=scss
5846
+ // 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/add-form/AddForm.vue?vue&type=style&index=1&id=affb65fc&prod&lang=scss
5842
5847
 
5843
5848
 
5844
5849
 
5845
- var AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_options = {};
5850
+ var AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_options = {};
5846
5851
 
5847
- AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_options.insert = "head";
5848
- AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_options.singleton = false;
5852
+ AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_options.insert = "head";
5853
+ AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_options.singleton = false;
5849
5854
 
5850
- var AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss["a" /* default */], AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_options);
5855
+ var AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss["a" /* default */], AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_options);
5851
5856
 
5852
5857
 
5853
5858
 
5854
- /* harmony default export */ var add_form_AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss = (AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss["a" /* default */].locals || {});
5855
- // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=1&id=78427db8&prod&lang=scss
5859
+ /* harmony default export */ var add_form_AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss = (AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss["a" /* default */].locals || {});
5860
+ // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=1&id=affb65fc&prod&lang=scss
5856
5861
 
5857
- // 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/add-form/AddForm.vue?vue&type=style&index=2&id=78427db8&prod&lang=scss&scoped=true
5858
- var AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true = __webpack_require__(174);
5862
+ // 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/add-form/AddForm.vue?vue&type=style&index=2&id=affb65fc&prod&lang=scss&scoped=true
5863
+ var AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true = __webpack_require__(174);
5859
5864
 
5860
- // 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/add-form/AddForm.vue?vue&type=style&index=2&id=78427db8&prod&lang=scss&scoped=true
5865
+ // 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/add-form/AddForm.vue?vue&type=style&index=2&id=affb65fc&prod&lang=scss&scoped=true
5861
5866
 
5862
5867
 
5863
5868
 
5864
- var AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_options = {};
5869
+ var AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_options = {};
5865
5870
 
5866
- AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_options.insert = "head";
5867
- AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_options.singleton = false;
5871
+ AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_options.insert = "head";
5872
+ AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_options.singleton = false;
5868
5873
 
5869
- var AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true["a" /* default */], AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_options);
5874
+ var AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true["a" /* default */], AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_options);
5870
5875
 
5871
5876
 
5872
5877
 
5873
- /* harmony default export */ var add_form_AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true = (AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true["a" /* default */].locals || {});
5874
- // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=2&id=78427db8&prod&lang=scss&scoped=true
5878
+ /* harmony default export */ var add_form_AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true = (AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true["a" /* default */].locals || {});
5879
+ // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=2&id=affb65fc&prod&lang=scss&scoped=true
5875
5880
 
5876
5881
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
5877
5882
  var componentNormalizer = __webpack_require__(15);
@@ -5893,7 +5898,7 @@ var component = Object(componentNormalizer["a" /* default */])(
5893
5898
  staticRenderFns,
5894
5899
  false,
5895
5900
  null,
5896
- "78427db8",
5901
+ "affb65fc",
5897
5902
  null
5898
5903
 
5899
5904
  )
package/lib/apply-form.js CHANGED
@@ -2540,13 +2540,14 @@ var _excluded = ["action", "rule", "metaId", "text", "num", "confirm", "confirmM
2540
2540
  var _fieldConfigs = _step.value;
2541
2541
  var _field = _fieldConfigs.attriName;
2542
2542
  var formValue = form.model.data[_field];
2543
+ console.log(form.model.data);
2543
2544
  var submitValue = formValue;
2544
2545
  if (Array.isArray(formValue)) {
2545
2546
  submitValue = formValue[formValue.length - 1];
2546
2547
  }
2547
- this.submitData[_field] = submitValue || '';
2548
+ this.submitData[_field] = this.$_.isNil(submitValue) ? '' : submitValue;
2548
2549
  if (_fieldConfigs.state === 'READONLY' || _fieldConfigs.submitValue === false || _fieldConfigs.dataType === 'password' && !submitValue) continue;
2549
- params["bean.".concat(_field)] = submitValue || '';
2550
+ params["bean.".concat(_field)] = this.$_.isNil(submitValue) ? '' : submitValue;
2550
2551
  if (_fieldConfigs.state === 'HIDDEN' && _fieldConfigs.isDateNow) {
2551
2552
  this.submitData[_field] = this.$moment().format('YYYY-MM-DD HH:mm:ss');
2552
2553
  params["bean.".concat(_field)] = this.$moment().format('YYYY-MM-DD HH:mm:ss');
@@ -2564,6 +2565,7 @@ var _excluded = ["action", "rule", "metaId", "text", "num", "confirm", "confirmM
2564
2565
  }
2565
2566
  }
2566
2567
  }
2568
+ console.log(params);
2567
2569
  params = this.$formatParams(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"])({}, params));
2568
2570
  if (this.data.subEntitys) {
2569
2571
  params.subEntitys = this.data.subEntitys;
@@ -2821,12 +2823,15 @@ var _excluded = ["action", "rule", "metaId", "text", "num", "confirm", "confirmM
2821
2823
  }
2822
2824
  // 获取form表单 提交
2823
2825
  var formParams = this.getFormData(buttonConfig);
2826
+ console.log(formParams);
2824
2827
  var submitParams = this.$_.assignWith(this.$formatParams(pageSubmitParams), formParams, function (pageSubmitValue, formValue) {
2825
- return formValue || pageSubmitValue;
2828
+ return _this27.$_.isNil(formValue) ? pageSubmitValue : formValue;
2826
2829
  });
2830
+ console.log(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"])({}, submitParams));
2827
2831
  submitParams = this.$_.assignWith(submitParams, this.submitParams, function (submitValue, _submitValue) {
2828
- return submitValue || _submitValue;
2832
+ return _this27.$_.isNil(_submitValue) ? _submitValue : submitValue;
2829
2833
  });
2834
+ console.log(submitParams);
2830
2835
  var submitFn = function submitFn() {
2831
2836
  if (!formParams) return;
2832
2837
  if (_this27.$query.noSubmit === true) {
@@ -4069,7 +4074,7 @@ ___CSS_LOADER_EXPORT___.push([module.i, ".djs-visual.pass rect{stroke:#67C23A !i
4069
4074
 
4070
4075
  var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
4071
4076
  // Module
4072
- ___CSS_LOADER_EXPORT___.push([module.i, ".catalog__item-title-left[data-v-78427db8]{display:inline-block;width:20px;text-align:center}.catalog__item-title-icon[data-v-78427db8]{margin-right:6px}.catalog__item-dot[data-v-78427db8]{display:inline-block;width:4px;height:4px;border-radius:50%;background-color:#999;position:relative;top:-3px}.catalog-item-num[data-v-78427db8]{font-weight:500}\n", ""]);
4077
+ ___CSS_LOADER_EXPORT___.push([module.i, ".catalog__item-title-left[data-v-affb65fc]{display:inline-block;width:20px;text-align:center}.catalog__item-title-icon[data-v-affb65fc]{margin-right:6px}.catalog__item-dot[data-v-affb65fc]{display:inline-block;width:4px;height:4px;border-radius:50%;background-color:#999;position:relative;top:-3px}.catalog-item-num[data-v-affb65fc]{font-weight:500}\n", ""]);
4073
4078
  // Exports
4074
4079
  /* harmony default export */ __webpack_exports__["a"] = (___CSS_LOADER_EXPORT___);
4075
4080
 
@@ -4495,10 +4500,10 @@ var AddFormvue_type_script_lang_js = __webpack_require__(161);
4495
4500
  var injectStylesIntoStyleTag = __webpack_require__(19);
4496
4501
  var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
4497
4502
 
4498
- // 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/add-form/AddForm.vue?vue&type=style&index=0&id=78427db8&prod&lang=scss
4499
- var AddFormvue_type_style_index_0_id_78427db8_prod_lang_scss = __webpack_require__(172);
4503
+ // 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/add-form/AddForm.vue?vue&type=style&index=0&id=affb65fc&prod&lang=scss
4504
+ var AddFormvue_type_style_index_0_id_affb65fc_prod_lang_scss = __webpack_require__(172);
4500
4505
 
4501
- // 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/add-form/AddForm.vue?vue&type=style&index=0&id=78427db8&prod&lang=scss
4506
+ // 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/add-form/AddForm.vue?vue&type=style&index=0&id=affb65fc&prod&lang=scss
4502
4507
 
4503
4508
 
4504
4509
 
@@ -4507,50 +4512,50 @@ var options = {};
4507
4512
  options.insert = "head";
4508
4513
  options.singleton = false;
4509
4514
 
4510
- var update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_0_id_78427db8_prod_lang_scss["a" /* default */], options);
4515
+ var update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_0_id_affb65fc_prod_lang_scss["a" /* default */], options);
4511
4516
 
4512
4517
 
4513
4518
 
4514
- /* harmony default export */ var add_form_AddFormvue_type_style_index_0_id_78427db8_prod_lang_scss = (AddFormvue_type_style_index_0_id_78427db8_prod_lang_scss["a" /* default */].locals || {});
4515
- // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=0&id=78427db8&prod&lang=scss
4519
+ /* harmony default export */ var add_form_AddFormvue_type_style_index_0_id_affb65fc_prod_lang_scss = (AddFormvue_type_style_index_0_id_affb65fc_prod_lang_scss["a" /* default */].locals || {});
4520
+ // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=0&id=affb65fc&prod&lang=scss
4516
4521
 
4517
- // 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/add-form/AddForm.vue?vue&type=style&index=1&id=78427db8&prod&lang=scss
4518
- var AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss = __webpack_require__(173);
4522
+ // 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/add-form/AddForm.vue?vue&type=style&index=1&id=affb65fc&prod&lang=scss
4523
+ var AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss = __webpack_require__(173);
4519
4524
 
4520
- // 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/add-form/AddForm.vue?vue&type=style&index=1&id=78427db8&prod&lang=scss
4525
+ // 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/add-form/AddForm.vue?vue&type=style&index=1&id=affb65fc&prod&lang=scss
4521
4526
 
4522
4527
 
4523
4528
 
4524
- var AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_options = {};
4529
+ var AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_options = {};
4525
4530
 
4526
- AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_options.insert = "head";
4527
- AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_options.singleton = false;
4531
+ AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_options.insert = "head";
4532
+ AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_options.singleton = false;
4528
4533
 
4529
- var AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss["a" /* default */], AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss_options);
4534
+ var AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss["a" /* default */], AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss_options);
4530
4535
 
4531
4536
 
4532
4537
 
4533
- /* harmony default export */ var add_form_AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss = (AddFormvue_type_style_index_1_id_78427db8_prod_lang_scss["a" /* default */].locals || {});
4534
- // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=1&id=78427db8&prod&lang=scss
4538
+ /* harmony default export */ var add_form_AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss = (AddFormvue_type_style_index_1_id_affb65fc_prod_lang_scss["a" /* default */].locals || {});
4539
+ // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=1&id=affb65fc&prod&lang=scss
4535
4540
 
4536
- // 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/add-form/AddForm.vue?vue&type=style&index=2&id=78427db8&prod&lang=scss&scoped=true
4537
- var AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true = __webpack_require__(174);
4541
+ // 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/add-form/AddForm.vue?vue&type=style&index=2&id=affb65fc&prod&lang=scss&scoped=true
4542
+ var AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true = __webpack_require__(174);
4538
4543
 
4539
- // 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/add-form/AddForm.vue?vue&type=style&index=2&id=78427db8&prod&lang=scss&scoped=true
4544
+ // 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/add-form/AddForm.vue?vue&type=style&index=2&id=affb65fc&prod&lang=scss&scoped=true
4540
4545
 
4541
4546
 
4542
4547
 
4543
- var AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_options = {};
4548
+ var AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_options = {};
4544
4549
 
4545
- AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_options.insert = "head";
4546
- AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_options.singleton = false;
4550
+ AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_options.insert = "head";
4551
+ AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_options.singleton = false;
4547
4552
 
4548
- var AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true["a" /* default */], AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true_options);
4553
+ var AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_update = injectStylesIntoStyleTag_default()(AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true["a" /* default */], AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true_options);
4549
4554
 
4550
4555
 
4551
4556
 
4552
- /* harmony default export */ var add_form_AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true = (AddFormvue_type_style_index_2_id_78427db8_prod_lang_scss_scoped_true["a" /* default */].locals || {});
4553
- // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=2&id=78427db8&prod&lang=scss&scoped=true
4557
+ /* harmony default export */ var add_form_AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true = (AddFormvue_type_style_index_2_id_affb65fc_prod_lang_scss_scoped_true["a" /* default */].locals || {});
4558
+ // CONCATENATED MODULE: ./src/frame/packages/add-form/AddForm.vue?vue&type=style&index=2&id=affb65fc&prod&lang=scss&scoped=true
4554
4559
 
4555
4560
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
4556
4561
  var componentNormalizer = __webpack_require__(15);
@@ -4572,7 +4577,7 @@ var component = Object(componentNormalizer["a" /* default */])(
4572
4577
  staticRenderFns,
4573
4578
  false,
4574
4579
  null,
4575
- "78427db8",
4580
+ "affb65fc",
4576
4581
  null
4577
4582
 
4578
4583
  )
package/lib/category-list.js CHANGED
@@ -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);
package/lib/edit-entity-list.js CHANGED
@@ -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);