@panpanzhao/component-ui 0.0.51 → 0.0.53

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/component-ui.common.js +39 -21
  2. package/lib/components/dialog.js +8 -8
  3. package/lib/components/drawer.js +6 -6
  4. package/lib/components/form-query.js +29 -1
  5. package/lib/index.js +1 -1
  6. package/package.json +1 -1
package/lib/component-ui.common.js CHANGED
@@ -233,13 +233,13 @@ module.exports = require("element-ui/lib/message-box");
233
233
  /* 24 */
234
234
  /***/ (function(module, exports) {
235
235
 
236
- module.exports = require("element-ui/src/utils/popup");
236
+ module.exports = require("element-ui/lib/utils/popup");
237
237
 
238
238
  /***/ }),
239
239
  /* 25 */
240
240
  /***/ (function(module, exports) {
241
241
 
242
- module.exports = require("element-ui/src/mixins/emitter");
242
+ module.exports = require("element-ui/lib/mixins/emitter");
243
243
 
244
244
  /***/ }),
245
245
  /* 26 */
@@ -437,7 +437,7 @@ module.exports = require("element-ui/lib/badge");
437
437
  /* 58 */
438
438
  /***/ (function(module, exports) {
439
439
 
440
- module.exports = require("element-ui/src/mixins/migrating");
440
+ module.exports = require("element-ui/lib/mixins/migrating");
441
441
 
442
442
  /***/ }),
443
443
  /* 59 */
@@ -2686,6 +2686,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2686
2686
 
2687
2687
 
2688
2688
 
2689
+
2689
2690
  /* harmony default export */ var form_query_src_formvue_type_script_lang_js_ = ({
2690
2691
  name: "FormQuery",
2691
2692
  componentName: "FormQuery",
@@ -2875,7 +2876,24 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2875
2876
  var itemLength = 0;
2876
2877
 
2877
2878
  // 处理过，包含是否需要隐藏的 数组
2878
- var processedList = this.formItems.map(function (item, index) {
2879
+ var processedList = this.formItems.filter(function (item) {
2880
+ if (item.show === false) {
2881
+ return false;
2882
+ }
2883
+ if (typeof item.show === "function" && !item.show.call(_this2, _this2.formModel, {
2884
+ form: _this2,
2885
+ formModel: _this2.formModel,
2886
+ config: item
2887
+ })) {
2888
+ return false;
2889
+ }
2890
+ if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this2.formModel, {
2891
+ evalMode: true
2892
+ })) {
2893
+ return false;
2894
+ }
2895
+ return true;
2896
+ }).map(function (item, index) {
2879
2897
  // 如果 formItem 自己配置了 hidden，默认使用它自己的
2880
2898
  var colSize = item.colSize ? item.colSize : 1;
2881
2899
  var colSpan = item.span || Math.min(_this2.span * (colSize || 1), 24);
@@ -10095,8 +10113,8 @@ formula_src.install = function (Vue) {
10095
10113
  Vue.component(formula_src.name, formula_src);
10096
10114
  };
10097
10115
  /* harmony default export */ var formula = (formula_src);
10098
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/dialog/src/index.vue?vue&type=template&id=6ea89ba6&
10099
- var srcvue_type_template_id_6ea89ba6_render = function render() {
10116
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/dialog/src/index.vue?vue&type=template&id=d7696cf6&
10117
+ var srcvue_type_template_id_d7696cf6_render = function render() {
10100
10118
  var _vm = this,
10101
10119
  _c = _vm._self._c
10102
10120
  return _c(
@@ -10204,21 +10222,21 @@ var srcvue_type_template_id_6ea89ba6_render = function render() {
10204
10222
  ]
10205
10223
  )
10206
10224
  }
10207
- var srcvue_type_template_id_6ea89ba6_staticRenderFns = []
10208
- srcvue_type_template_id_6ea89ba6_render._withStripped = true
10225
+ var srcvue_type_template_id_d7696cf6_staticRenderFns = []
10226
+ srcvue_type_template_id_d7696cf6_render._withStripped = true
10209
10227
 
10210
10228
 
10211
- // CONCATENATED MODULE: ./src/components/dialog/src/index.vue?vue&type=template&id=6ea89ba6&
10229
+ // CONCATENATED MODULE: ./src/components/dialog/src/index.vue?vue&type=template&id=d7696cf6&
10212
10230
 
10213
- // EXTERNAL MODULE: external "element-ui/src/utils/popup"
10231
+ // EXTERNAL MODULE: external "element-ui/lib/utils/popup"
10214
10232
  var popup_ = __webpack_require__(24);
10215
10233
  var popup_default = /*#__PURE__*/__webpack_require__.n(popup_);
10216
10234
 
10217
- // EXTERNAL MODULE: external "element-ui/src/mixins/migrating"
10235
+ // EXTERNAL MODULE: external "element-ui/lib/mixins/migrating"
10218
10236
  var migrating_ = __webpack_require__(58);
10219
10237
  var migrating_default = /*#__PURE__*/__webpack_require__.n(migrating_);
10220
10238
 
10221
- // EXTERNAL MODULE: external "element-ui/src/mixins/emitter"
10239
+ // EXTERNAL MODULE: external "element-ui/lib/mixins/emitter"
10222
10240
  var emitter_ = __webpack_require__(25);
10223
10241
  var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
10224
10242
 
@@ -10399,8 +10417,8 @@ var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
10399
10417
 
10400
10418
  var dialog_src_component = normalizeComponent(
10401
10419
  components_dialog_srcvue_type_script_lang_js_,
10402
- srcvue_type_template_id_6ea89ba6_render,
10403
- srcvue_type_template_id_6ea89ba6_staticRenderFns,
10420
+ srcvue_type_template_id_d7696cf6_render,
10421
+ srcvue_type_template_id_d7696cf6_staticRenderFns,
10404
10422
  false,
10405
10423
  null,
10406
10424
  null,
@@ -10415,8 +10433,8 @@ dialog_src.install = function (Vue) {
10415
10433
  Vue.component(dialog_src.name, dialog_src);
10416
10434
  };
10417
10435
  /* harmony default export */ var dialog = (dialog_src);
10418
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/drawer/src/index.vue?vue&type=template&id=6565c780&
10419
- var srcvue_type_template_id_6565c780_render = function render() {
10436
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/drawer/src/index.vue?vue&type=template&id=949797fc&
10437
+ var srcvue_type_template_id_949797fc_render = function render() {
10420
10438
  var _vm = this,
10421
10439
  _c = _vm._self._c
10422
10440
  return _c(
@@ -10542,11 +10560,11 @@ var srcvue_type_template_id_6565c780_render = function render() {
10542
10560
  ]
10543
10561
  )
10544
10562
  }
10545
- var srcvue_type_template_id_6565c780_staticRenderFns = []
10546
- srcvue_type_template_id_6565c780_render._withStripped = true
10563
+ var srcvue_type_template_id_949797fc_staticRenderFns = []
10564
+ srcvue_type_template_id_949797fc_render._withStripped = true
10547
10565
 
10548
10566
 
10549
- // CONCATENATED MODULE: ./src/components/drawer/src/index.vue?vue&type=template&id=6565c780&
10567
+ // CONCATENATED MODULE: ./src/components/drawer/src/index.vue?vue&type=template&id=949797fc&
10550
10568
 
10551
10569
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/drawer/src/index.vue?vue&type=script&lang=js&
10552
10570
 
@@ -10716,8 +10734,8 @@ srcvue_type_template_id_6565c780_render._withStripped = true
10716
10734
 
10717
10735
  var drawer_src_component = normalizeComponent(
10718
10736
  components_drawer_srcvue_type_script_lang_js_,
10719
- srcvue_type_template_id_6565c780_render,
10720
- srcvue_type_template_id_6565c780_staticRenderFns,
10737
+ srcvue_type_template_id_949797fc_render,
10738
+ srcvue_type_template_id_949797fc_staticRenderFns,
10721
10739
  false,
10722
10740
  null,
10723
10741
  null,
package/lib/components/dialog.js CHANGED
@@ -195,21 +195,21 @@ function normalizeComponent(
195
195
  /***/ 33:
196
196
  /***/ (function(module, exports) {
197
197
 
198
- module.exports = require("element-ui/src/utils/popup");
198
+ module.exports = require("element-ui/lib/utils/popup");
199
199
 
200
200
  /***/ }),
201
201
 
202
202
  /***/ 34:
203
203
  /***/ (function(module, exports) {
204
204
 
205
- module.exports = require("element-ui/src/mixins/emitter");
205
+ module.exports = require("element-ui/lib/mixins/emitter");
206
206
 
207
207
  /***/ }),
208
208
 
209
209
  /***/ 65:
210
210
  /***/ (function(module, exports) {
211
211
 
212
- module.exports = require("element-ui/src/mixins/migrating");
212
+ module.exports = require("element-ui/lib/mixins/migrating");
213
213
 
214
214
  /***/ }),
215
215
 
@@ -220,7 +220,7 @@ module.exports = require("element-ui/src/mixins/migrating");
220
220
  // ESM COMPAT FLAG
221
221
  __webpack_require__.r(__webpack_exports__);
222
222
 
223
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/dialog/src/index.vue?vue&type=template&id=6ea89ba6&
223
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/dialog/src/index.vue?vue&type=template&id=d7696cf6&
224
224
  var render = function render() {
225
225
  var _vm = this,
226
226
  _c = _vm._self._c
@@ -333,17 +333,17 @@ var staticRenderFns = []
333
333
  render._withStripped = true
334
334
 
335
335
 
336
- // CONCATENATED MODULE: ./src/components/dialog/src/index.vue?vue&type=template&id=6ea89ba6&
336
+ // CONCATENATED MODULE: ./src/components/dialog/src/index.vue?vue&type=template&id=d7696cf6&
337
337
 
338
- // EXTERNAL MODULE: external "element-ui/src/utils/popup"
338
+ // EXTERNAL MODULE: external "element-ui/lib/utils/popup"
339
339
  var popup_ = __webpack_require__(33);
340
340
  var popup_default = /*#__PURE__*/__webpack_require__.n(popup_);
341
341
 
342
- // EXTERNAL MODULE: external "element-ui/src/mixins/migrating"
342
+ // EXTERNAL MODULE: external "element-ui/lib/mixins/migrating"
343
343
  var migrating_ = __webpack_require__(65);
344
344
  var migrating_default = /*#__PURE__*/__webpack_require__.n(migrating_);
345
345
 
346
- // EXTERNAL MODULE: external "element-ui/src/mixins/emitter"
346
+ // EXTERNAL MODULE: external "element-ui/lib/mixins/emitter"
347
347
  var emitter_ = __webpack_require__(34);
348
348
  var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
349
349
 
package/lib/components/drawer.js CHANGED
@@ -195,14 +195,14 @@ function normalizeComponent(
195
195
  /***/ 33:
196
196
  /***/ (function(module, exports) {
197
197
 
198
- module.exports = require("element-ui/src/utils/popup");
198
+ module.exports = require("element-ui/lib/utils/popup");
199
199
 
200
200
  /***/ }),
201
201
 
202
202
  /***/ 34:
203
203
  /***/ (function(module, exports) {
204
204
 
205
- module.exports = require("element-ui/src/mixins/emitter");
205
+ module.exports = require("element-ui/lib/mixins/emitter");
206
206
 
207
207
  /***/ }),
208
208
 
@@ -213,7 +213,7 @@ module.exports = require("element-ui/src/mixins/emitter");
213
213
  // ESM COMPAT FLAG
214
214
  __webpack_require__.r(__webpack_exports__);
215
215
 
216
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/drawer/src/index.vue?vue&type=template&id=6565c780&
216
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/drawer/src/index.vue?vue&type=template&id=949797fc&
217
217
  var render = function render() {
218
218
  var _vm = this,
219
219
  _c = _vm._self._c
@@ -344,13 +344,13 @@ var staticRenderFns = []
344
344
  render._withStripped = true
345
345
 
346
346
 
347
- // CONCATENATED MODULE: ./src/components/drawer/src/index.vue?vue&type=template&id=6565c780&
347
+ // CONCATENATED MODULE: ./src/components/drawer/src/index.vue?vue&type=template&id=949797fc&
348
348
 
349
- // EXTERNAL MODULE: external "element-ui/src/utils/popup"
349
+ // EXTERNAL MODULE: external "element-ui/lib/utils/popup"
350
350
  var popup_ = __webpack_require__(33);
351
351
  var popup_default = /*#__PURE__*/__webpack_require__.n(popup_);
352
352
 
353
- // EXTERNAL MODULE: external "element-ui/src/mixins/emitter"
353
+ // EXTERNAL MODULE: external "element-ui/lib/mixins/emitter"
354
354
  var emitter_ = __webpack_require__(34);
355
355
  var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
356
356
 
package/lib/components/form-query.js CHANGED
@@ -234,6 +234,13 @@ module.exports = require("lodash");
234
234
 
235
235
  /***/ }),
236
236
 
237
+ /***/ 3:
238
+ /***/ (function(module, exports) {
239
+
240
+ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
241
+
242
+ /***/ }),
243
+
237
244
  /***/ 79:
238
245
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
239
246
 
@@ -261,6 +268,9 @@ var col_default = /*#__PURE__*/__webpack_require__.n(col_);
261
268
  var form_item_ = __webpack_require__(16);
262
269
  var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
263
270
 
271
+ // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
272
+ var formula_ = __webpack_require__(3);
273
+
264
274
  // EXTERNAL MODULE: external "lodash"
265
275
  var external_lodash_ = __webpack_require__(2);
266
276
 
@@ -273,6 +283,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
273
283
 
274
284
 
275
285
 
286
+
276
287
  /* harmony default export */ var formvue_type_script_lang_js_ = ({
277
288
  name: "FormQuery",
278
289
  componentName: "FormQuery",
@@ -462,7 +473,24 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
462
473
  var itemLength = 0;
463
474
 
464
475
  // 处理过，包含是否需要隐藏的 数组
465
- var processedList = this.formItems.map(function (item, index) {
476
+ var processedList = this.formItems.filter(function (item) {
477
+ if (item.show === false) {
478
+ return false;
479
+ }
480
+ if (typeof item.show === "function" && !item.show.call(_this2, _this2.formModel, {
481
+ form: _this2,
482
+ formModel: _this2.formModel,
483
+ config: item
484
+ })) {
485
+ return false;
486
+ }
487
+ if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this2.formModel, {
488
+ evalMode: true
489
+ })) {
490
+ return false;
491
+ }
492
+ return true;
493
+ }).map(function (item, index) {
466
494
  // 如果 formItem 自己配置了 hidden，默认使用它自己的
467
495
  var colSize = item.colSize ? item.colSize : 1;
468
496
  var colSpan = item.span || Math.min(_this2.span * (colSize || 1), 24);