@panpanzhao/component-ui 1.0.0 → 1.0.2

package/lib/components/form-item.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 82);
+/******/ 	return __webpack_require__(__webpack_require__.s = 83);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -101,21 +101,21 @@ module.exports = require("lodash");
 
 /***/ }),
 
-/***/ 27:
+/***/ 28:
 /***/ (function(module, exports) {
 
 module.exports = require("@panpanzhao/component-ui/lib/components/form-input");
 
 /***/ }),
 
-/***/ 54:
+/***/ 55:
 /***/ (function(module, exports) {
 
 module.exports = require("element-ui/lib/form-item");
 
 /***/ }),
 
-/***/ 82:
+/***/ 83:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -127,11 +127,11 @@ var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
 var babel_helper_vue_jsx_merge_props_default = /*#__PURE__*/__webpack_require__.n(babel_helper_vue_jsx_merge_props_);
 
 // EXTERNAL MODULE: external "element-ui/lib/form-item"
-var form_item_ = __webpack_require__(54);
+var form_item_ = __webpack_require__(55);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-input"
-var form_input_ = __webpack_require__(27);
+var form_input_ = __webpack_require__(28);
 var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
 
 // EXTERNAL MODULE: external "lodash"
@@ -158,6 +158,7 @@ var external_lodash_ = __webpack_require__(2);
     showMessage: Boolean,
     inlineMessage: Boolean,
     size: String,
+    slots: Object,
     rules: [Object, Array],
     required: Boolean,
     actions: Array,
@@ -297,7 +298,13 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this3 = this,
+      _this$slots,
+      _this$slots2,
+      _this$slots3,
+      _this$slots4,
+      _this$slots5,
+      _this$slots6;
     if (typeof this.render === "function") {
       return this.render(h, {
         form: this.form,
@@ -338,7 +345,11 @@ var external_lodash_ = __webpack_require__(2);
         "labelWidth": this.labelWidth,
         "size": this.size
       }
-    }, [h("form-input", babel_helper_vue_jsx_merge_props_default()([{}, itemProp]))]);
+    }, [h("div", {
+      "class": "form-input_wrap"
+    }, [typeof ((_this$slots = this.slots) == null ? void 0 : _this$slots.prependItem) === "function" ? (_this$slots2 = this.slots) == null || (_this$slots2 = _this$slots2.prependItem) == null ? void 0 : _this$slots2.call(this, h) : (_this$slots3 = this.slots) == null ? void 0 : _this$slots3.prependItem, h("div", {
+      "class": "form-input_content"
+    }, [h("form-input", babel_helper_vue_jsx_merge_props_default()([{}, itemProp]))]), typeof ((_this$slots4 = this.slots) == null ? void 0 : _this$slots4.appendItem) === "function" ? (_this$slots5 = this.slots) == null || (_this$slots5 = _this$slots5.appendItem) == null ? void 0 : _this$slots5.call(this, h) : (_this$slots6 = this.slots) == null ? void 0 : _this$slots6.appendItem])]);
   }
 });
 // CONCATENATED MODULE: ./src/components/form-item/index.js

package/lib/components/form-query.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 79);
+/******/ 	return __webpack_require__(__webpack_require__.s = 80);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -234,7 +234,14 @@ module.exports = require("lodash");
 
 /***/ }),
 
-/***/ 79:
+/***/ 3:
+/***/ (function(module, exports) {
+
+module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
+
+/***/ }),
+
+/***/ 80:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -261,10 +268,13 @@ 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);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-query/src/form.vue?vue&type=script&lang=js&
+// CONCATENATED MODULE: ./node_modules/.pnpm/babel-loader@8.3.0_@babel+core@7.23.9_webpack@4.47.0/node_modules/babel-loader/lib!./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib??vue-loader-options!./src/components/form-query/src/form.vue?vue&type=script&lang=js
 
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -273,7 +283,8 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 
-/* harmony default export */ var formvue_type_script_lang_js_ = ({
+
+/* harmony default export */ var formvue_type_script_lang_js = ({
   name: "FormQuery",
   componentName: "FormQuery",
   components: {
@@ -327,6 +338,12 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       default: function _default() {
         return {};
       }
+    },
+    on: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
     }
   },
   computed: {
@@ -403,13 +420,22 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
       this.resetFields();
     },
     resetFields: function resetFields() {
+      this.$refs.form.resetFields();
+      var resetFieldsFun = this.on.resetFields;
+      if (resetFieldsFun) {
+        resetFieldsFun.call(this, {
+          form: this,
+          formModel: this.formModel,
+          defaultModel: this.defaultModel,
+          formItemLayout: this.formItemLayout
+        });
+      }
       for (var key in this.defaultModel) {
         if (this.formItemLayout[key]) {
           this.formItemLayout[key].value = this.defaultModel[key];
           this.formModel[key] = this.defaultModel[key];
         }
       }
-      this.$refs.form.resetFields();
     },
     clearValidate: function clearValidate(props) {
       return this.$refs.form.clearValidate(props);
@@ -462,7 +488,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);
@@ -589,9 +632,9 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
     })])]);
   }
 });
-// CONCATENATED MODULE: ./src/components/form-query/src/form.vue?vue&type=script&lang=js&
- /* harmony default export */ var src_formvue_type_script_lang_js_ = (formvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
+// CONCATENATED MODULE: ./src/components/form-query/src/form.vue?vue&type=script&lang=js
+ /* harmony default export */ var src_formvue_type_script_lang_js = (formvue_type_script_lang_js); 
+// EXTERNAL MODULE: ./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1);
 
 // CONCATENATED MODULE: ./src/components/form-query/src/form.vue
@@ -603,7 +646,7 @@ var form_render, staticRenderFns
 /* normalize component */
 
 var component = Object(componentNormalizer["a" /* default */])(
-  src_formvue_type_script_lang_js_,
+  src_formvue_type_script_lang_js,
   form_render,
   staticRenderFns,
   false,

package/lib/components/form-view-dialog.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 26);
+/******/ 	return __webpack_require__(__webpack_require__.s = 27);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -332,7 +332,7 @@ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_)
     this.formItems.forEach(function (item) {
       _this2.formItemLayout[item.prop] = item;
       //初始化数据值
-      _this2.$set(_this2.formModel, item.prop, null);
+      _this2.$set(_this2.formModel, item.prop, _this2.formModel[item.prop] || null);
     });
   },
   methods: {
@@ -366,12 +366,17 @@ var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_)
       }
     },
     renderItem: function renderItem(h, item) {
+      var _item$slots, _item$slots2, _item$slots3, _item$slots4, _item$slots5, _item$slots6;
       var param = {
         attrs: Object.assign({}, item)
       };
       return h("el-descriptions-item", babel_helper_vue_jsx_merge_props_default()([{
         "key": item.prop
-      }, param]), [this.renderContent(h, item)]);
+      }, param]), [h("div", {
+        "class": "form-view_wrap"
+      }, [typeof ((_item$slots = item.slots) == null ? void 0 : _item$slots.prependItem) === "function" ? (_item$slots2 = item.slots) == null || (_item$slots2 = _item$slots2.prependItem) == null ? void 0 : _item$slots2.call(this, h) : (_item$slots3 = item.slots) == null ? void 0 : _item$slots3.prependItem, h("div", {
+        "class": "form-view_content"
+      }, [this.renderContent(h, item)]), typeof ((_item$slots4 = item.slots) == null ? void 0 : _item$slots4.appendItem) === "function" ? (_item$slots5 = item.slots) == null || (_item$slots5 = _item$slots5.appendItem) == null ? void 0 : _item$slots5.call(this, h) : (_item$slots6 = item.slots) == null ? void 0 : _item$slots6.appendItem])]);
     }
   },
   render: function render(h) {
@@ -468,15 +473,19 @@ var form_view = __webpack_require__(10);
     render: Function,
     slots: Object,
     config: Object,
+    formModel: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
     show: {
       type: [Boolean, Function],
       default: true
     }
   },
   data: function data() {
-    return {
-      formModel: {}
-    };
+    return {};
   },
   computed: {
     _formViewGroup: function _formViewGroup() {
@@ -539,6 +548,7 @@ var external_lodash_ = __webpack_require__(2);
 
 
 
+
 /* harmony default export */ var src = ({
   name: "FormViewGroup",
   componentName: "FormViewGroup",
@@ -579,6 +589,20 @@ var external_lodash_ = __webpack_require__(2);
       openedCode: null
     };
   },
+  created: function created() {
+    var _this = this;
+    this.items.forEach(function (item) {
+      var _item$formItems;
+      var formData = item.prop && _this.formModel[item.prop] || {};
+      if ((item == null || (_item$formItems = item.formItems) == null ? void 0 : _item$formItems.length) > 0) {
+        item == null || item.formItems.forEach(function (itemCh) {
+          _this.$set(formData, itemCh.prop, formData[itemCh.prop]);
+        });
+      }
+      //初始化数据值
+      _this.$set(_this.formModel, item.prop, formData);
+    });
+  },
   computed: {},
   methods: {
     setFormModel: function setFormModel(model) {
@@ -587,7 +611,9 @@ var external_lodash_ = __webpack_require__(2);
     formNode: function formNode(form) {
       var h = this.$createElement;
       var formProp = {
-        attrs: Object.assign({}, form),
+        attrs: Object.assign({
+          formModel: form.prop && this.formModel[form.prop]
+        }, form),
         on: form.on
       };
       return h(content, babel_helper_vue_jsx_merge_props_default()([{
@@ -600,10 +626,10 @@ var external_lodash_ = __webpack_require__(2);
       }, formProp]));
     },
     renderTab: function renderTab(h, filterItems) {
-      var _this = this;
+      var _this2 = this;
       var itemNode = filterItems.map(function (item) {
         if (typeof item.render === "function") {
-          return item.render(h, _this.formModel, item);
+          return item.render(h, _this2.formModel, item);
         }
         return h("el-tab-pane", {
           "key": item.prop,
@@ -613,7 +639,7 @@ var external_lodash_ = __webpack_require__(2);
           }
         }, [h("template", {
           "slot": "label"
-        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this, h) : item.slots && item.slots.title]), _this.formNode(item)]);
+        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this2, h) : item.slots && item.slots.title]), _this2.formNode(item)]);
       });
       var tabsProp = {
         attrs: {
@@ -622,17 +648,17 @@ var external_lodash_ = __webpack_require__(2);
         },
         on: {
           "tab-click": function tabClick(tabNode) {
-            _this.$emit("openedCode", tabNode.name);
+            _this2.$emit("openedCode", tabNode.name);
           }
         }
       };
       return h("el-tabs", babel_helper_vue_jsx_merge_props_default()([{}, tabsProp]), [itemNode]);
     },
     renderCollapse: function renderCollapse(h, filterItems) {
-      var _this2 = this;
+      var _this3 = this;
       var itemNode = filterItems.map(function (item) {
         if (typeof item.render === "function") {
-          return item.render(h, _this2.formModel, item);
+          return item.render(h, _this3.formModel, item);
         }
         return h("el-collapse-item", {
           "key": item.prop,
@@ -642,7 +668,7 @@ var external_lodash_ = __webpack_require__(2);
           }
         }, [h("template", {
           "slot": "title"
-        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this2, h) : item.slots && item.slots.title]), _this2.formNode(item)]);
+        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this3, h) : item.slots && item.slots.title]), _this3.formNode(item)]);
       });
       var collapseProp = {
         attrs: {
@@ -650,20 +676,46 @@ var external_lodash_ = __webpack_require__(2);
         },
         on: {
           change: function change(val) {
-            _this2.$emit("openedCode", val);
+            _this3.$emit("openedCode", val);
           }
         }
       };
       return h("el-collapse", babel_helper_vue_jsx_merge_props_default()([{}, collapseProp]), [itemNode]);
+    },
+    renderCustom: function renderCustom(h, filterItems) {
+      var _this4 = this;
+      var itemNode = filterItems.map(function (item) {
+        if (typeof item.render === "function") {
+          return item.render(h, _this4.formModel, item);
+        }
+        return h("div", {
+          "key": item.prop,
+          "attrs": {
+            "name": item.prop,
+            "title": item.label
+          }
+        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this4, h) : item.slots && item.slots.title || item.label, _this4.formNode(item)]);
+      });
+      var collapseProp = {
+        attrs: {
+          value: this.openedCode
+        },
+        on: {
+          change: function change(val) {
+            _this4.$emit("openedCode", val);
+          }
+        }
+      };
+      return h("div", babel_helper_vue_jsx_merge_props_default()([{}, collapseProp]), [itemNode]);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this5 = this;
     var filterItems = this.items.filter(function (item) {
       if (item.show === false) {
         return false;
       }
-      if (typeof item.show === "function" && !item.show.call(_this3, {
+      if (typeof item.show === "function" && !item.show.call(_this5, {
         config: item
       })) {
         return false;
@@ -674,9 +726,14 @@ var external_lodash_ = __webpack_require__(2);
       return null;
     }
     this.openedCode = filterItems[0] && filterItems[0].prop;
+    var group = {
+      Custom: this.renderCustom,
+      Tab: this.renderTab,
+      Collapse: this.renderCollapse
+    };
     return h("div", {
-      "class": ["form-view-group", "is-" + (this.control === "Tab" ? "tab" : "collapse")]
-    }, [this.control === "Tab" ? this.renderTab(h, filterItems) : this.renderCollapse(h, filterItems)]);
+      "class": ["form-view-group", "is-" + this.control]
+    }, [group[this.control] ? group[this.control](h, filterItems) : null]);
   }
 });
 // CONCATENATED MODULE: ./src/components/form-view-group/index.js
@@ -689,7 +746,8 @@ src.install = function (Vue) {
 /***/ }),
 /* 24 */,
 /* 25 */,
-/* 26 */
+/* 26 */,
+/* 27 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -714,10 +772,7 @@ var form_view = __webpack_require__(10);
 // EXTERNAL MODULE: ./src/components/form-view-group/index.js + 2 modules
 var form_view_group = __webpack_require__(23);
 
-// EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(2);
-
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-view-dialog/src/index.vue?vue&type=script&lang=js&
+// CONCATENATED MODULE: ./node_modules/.pnpm/babel-loader@8.3.0_@babel+core@7.23.9_webpack@4.47.0/node_modules/babel-loader/lib!./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib??vue-loader-options!./src/components/form-view-dialog/src/index.vue?vue&type=script&lang=js
 
 
 
@@ -727,8 +782,8 @@ var external_lodash_ = __webpack_require__(2);
 
 
 
-
-/* harmony default export */ var srcvue_type_script_lang_js_ = ({
+// import { merge } from 'lodash';
+/* harmony default export */ var srcvue_type_script_lang_js = ({
   name: "FormViewDialog",
   componentName: "FormViewDialog",
   components: {
@@ -855,7 +910,7 @@ var external_lodash_ = __webpack_require__(2);
       this.show = false;
     },
     setFormModel: function setFormModel(model) {
-      Object(external_lodash_["merge"])(this.formModel, model);
+      Object.assign(this.formModel, model);
     },
     renderForm: function renderForm(h) {
       var param = {
@@ -874,13 +929,19 @@ var external_lodash_ = __webpack_require__(2);
     },
     renderTitle: function renderTitle(h) {
       if (typeof this.slots.title === "function") {
-        return this.slots.title.call(this, this.formModel);
+        return this.slots.title.call(this, {
+          ref: this,
+          formModel: this.formModel
+        });
       }
       return this.slots.title || this.dialog.title;
     },
     renderTools: function renderTools(h) {
       if (typeof this.slots.footer === "function") {
-        return this.slots.footer.call(this, this.formModel);
+        return this.slots.footer.call(this, {
+          ref: this,
+          formModel: this.formModel
+        });
       }
       return h("div", [(this.tools || this.defaultTools).map(function (item) {
         var toolParam = {
@@ -913,9 +974,9 @@ var external_lodash_ = __webpack_require__(2);
     }, [this.renderTools(h)]), this.renderForm(h)]);
   }
 });
-// CONCATENATED MODULE: ./src/components/form-view-dialog/src/index.vue?vue&type=script&lang=js&
- /* harmony default export */ var form_view_dialog_srcvue_type_script_lang_js_ = (srcvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
+// CONCATENATED MODULE: ./src/components/form-view-dialog/src/index.vue?vue&type=script&lang=js
+ /* harmony default export */ var form_view_dialog_srcvue_type_script_lang_js = (srcvue_type_script_lang_js); 
+// EXTERNAL MODULE: ./node_modules/.pnpm/vue-loader@15.11.1_css-loader@2.1.1_lodash@4.17.21_vue-template-compiler@2.7.16_webpack@4.47.0/node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(1);
 
 // CONCATENATED MODULE: ./src/components/form-view-dialog/src/index.vue
@@ -927,7 +988,7 @@ var src_render, staticRenderFns
 /* normalize component */
 
 var component = Object(componentNormalizer["a" /* default */])(
-  form_view_dialog_srcvue_type_script_lang_js_,
+  form_view_dialog_srcvue_type_script_lang_js,
   src_render,
   staticRenderFns,
   false,