@panpanzhao/component-ui 0.0.50 → 0.0.52

package/lib/component-ui.common.js

@@ -2686,6 +2686,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
+
 /* harmony default export */ var form_query_src_formvue_type_script_lang_js_ = ({
   name: "FormQuery",
   componentName: "FormQuery",
@@ -2875,7 +2876,24 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       var itemLength = 0;
 
       // 处理过，包含是否需要隐藏的 数组
-      var processedList = this.formItems.map(function (item, index) {
+      var processedList = this.formItems.filter(function (item) {
+        if (item.show === false) {
+          return false;
+        }
+        if (typeof item.show === "function" && !item.show.call(_this2, _this2.formModel, {
+          form: _this2,
+          formModel: _this2.formModel,
+          config: item
+        })) {
+          return false;
+        }
+        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this2.formModel, {
+          evalMode: true
+        })) {
+          return false;
+        }
+        return true;
+      }).map(function (item, index) {
         // 如果 formItem 自己配置了 hidden，默认使用它自己的
         var colSize = item.colSize ? item.colSize : 1;
         var colSpan = item.span || Math.min(_this2.span * (colSize || 1), 24);

package/lib/components/form-query.js

@@ -234,6 +234,13 @@ module.exports = require("lodash");
 
 /***/ }),
 
+/***/ 3:
+/***/ (function(module, exports) {
+
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
+
+/***/ }),
+
 /***/ 79:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -261,6 +268,9 @@ var col_default = /*#__PURE__*/__webpack_require__.n(col_);
 var form_item_ = __webpack_require__(16);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
+// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
+var formula_ = __webpack_require__(3);
+
 // EXTERNAL MODULE: external "lodash"
 var external_lodash_ = __webpack_require__(2);
 
@@ -273,6 +283,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
+
 /* harmony default export */ var formvue_type_script_lang_js_ = ({
   name: "FormQuery",
   componentName: "FormQuery",
@@ -462,7 +473,24 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       var itemLength = 0;
 
       // 处理过，包含是否需要隐藏的 数组
-      var processedList = this.formItems.map(function (item, index) {
+      var processedList = this.formItems.filter(function (item) {
+        if (item.show === false) {
+          return false;
+        }
+        if (typeof item.show === "function" && !item.show.call(_this2, _this2.formModel, {
+          form: _this2,
+          formModel: _this2.formModel,
+          config: item
+        })) {
+          return false;
+        }
+        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this2.formModel, {
+          evalMode: true
+        })) {
+          return false;
+        }
+        return true;
+      }).map(function (item, index) {
         // 如果 formItem 自己配置了 hidden，默认使用它自己的
         var colSize = item.colSize ? item.colSize : 1;
         var colSpan = item.span || Math.min(_this2.span * (colSize || 1), 24);