@panpanzhao/component-ui 1.0.0 → 1.0.2

package/lib/components/form-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 18);
+/******/ 	return __webpack_require__(__webpack_require__.s = 19);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -215,7 +215,7 @@ module.exports = require("@panpanzhao/component-ui/lib/utils/formula");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/form.vue?vue&type=template&id=097bf622&
+// CONCATENATED 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/loaders/templateLoader.js??ref--5!./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/src/form.vue?vue&type=template&id=74ff4c20
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -286,7 +286,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=097bf622&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=74ff4c20
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(13);
@@ -310,14 +310,14 @@ 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/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/src/form.vue?vue&type=script&lang=js
 
 
 
 
 
 
-/* harmony default export */ var formvue_type_script_lang_js_ = ({
+/* harmony default export */ var formvue_type_script_lang_js = ({
   name: "Form",
   componentName: "Form",
   components: {
@@ -458,9 +458,19 @@ var external_lodash_ = __webpack_require__(2);
       var _callback = null;
       if (callback) {
         _callback = function _callback(flag, message) {
-          callback.call(_this3, flag, message);
           if (typeof _this3.verify === "function") {
-            _this3.verify.call(_this3, flag, message);
+            var promiset = _this3.verify.call(_this3, flag, message);
+            if (promiset && Object.prototype.toString.call(promiset) == "[object Promise]") {
+              promiset.then(function (vFlag, vMessage) {
+                callback.call(_this3, flag && vFlag !== false, message, vMessage);
+              }).catch(function (error) {
+                callback.call(_this3, false, message, error);
+              });
+            } else {
+              callback.call(_this3, flag && promiset !== false, message);
+            }
+          } else {
+            callback.call(_this3, flag, message);
           }
         };
       }
@@ -495,9 +505,9 @@ var external_lodash_ = __webpack_require__(2);
     }
   }
 });
-// CONCATENATED MODULE: ./src/components/form/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/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/src/form.vue
@@ -509,7 +519,7 @@ var componentNormalizer = __webpack_require__(1);
 /* normalize component */
 
 var component = Object(componentNormalizer["a" /* default */])(
-  src_formvue_type_script_lang_js_,
+  src_formvue_type_script_lang_js,
   render,
   staticRenderFns,
   false,
@@ -581,7 +591,8 @@ module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
 
 /***/ }),
 /* 17 */,
-/* 18 */
+/* 18 */,
+/* 19 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -614,6 +625,12 @@ var components_form = __webpack_require__(4);
     render: Function,
     slots: Object,
     config: Object,
+    formModel: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
     show: {
       type: [Boolean, Function],
       default: true
@@ -639,8 +656,11 @@ var components_form = __webpack_require__(4);
   },
   created: function created() {
     if (this._formGroup) {
-      var defaultVal = this.prop ? this._formGroup.formModel[this.prop] : this._formGroup.formModel;
-      this.formModel = defaultVal || {};
+      // if (!(this.prop&&this._formGroup.formModel[this.prop])) {
+      //   this._formGroup.formModel[this.prop]={}
+      // }
+      //const defaultVal= this.prop?this._formGroup.formModel[this.prop]:this._formGroup.formModel
+      //this.formModel=defaultVal
     }
     // if (this.prop && this._formGroup) {
     //   this._formGroup.formModel[this.prop] = this.formModel;
@@ -703,6 +723,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
 
 
 
+
 /* harmony default export */ var src = ({
   name: "FormGroup",
   componentName: "FormGroup",
@@ -724,9 +745,6 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         return [];
       }
     },
-    defaultExpandVal: {
-      type: Array | String
-    },
     items: {
       type: Array,
       default: function _default() {
@@ -752,9 +770,23 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
       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: {
     actionFormMap: function actionFormMap() {
-      var _this = this;
+      var _this2 = this;
       var actionForm = {};
       this.actions.forEach(function (action) {
         if (!action.trigger) {
@@ -777,15 +809,16 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
               if (!targetConfig[formTarget.formCode]) {
                 targetConfig[formTarget.formCode] = {};
               }
-              targetConfig[formTarget.formCode][formTarget.fieldCode] = _this.formLayout[formTarget.formCode][formTarget.fieldCode];
-              targetForm[formTarget.formCode] = _this.formModel[formTarget.formCode];
+              targetConfig[formTarget.formCode][formTarget.fieldCode] = _this2.formLayout[formTarget.formCode][formTarget.fieldCode];
+              targetForm[formTarget.formCode] = _this2.formModel[formTarget.formCode];
             });
             config.targetConfig = targetConfig;
             config.targetForm = targetForm;
+            config.formModel = _this2.formModel;
             for (var _len = arguments.length, arg = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               arg[_key - 1] = arguments[_key];
             }
-            (_action$exec = action.exec).call.apply(_action$exec, [_this, config].concat(arg));
+            (_action$exec = action.exec).call.apply(_action$exec, [_this2, config].concat(arg));
           }
         });
       });
@@ -794,7 +827,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
   },
   methods: {
     validate: function validate(callback) {
-      var _this2 = this;
+      var _this3 = this;
       var promise;
       // if no callback, return promise
       if (typeof callback !== "function" && Promise) {
@@ -812,9 +845,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
       }
       var invalidForms = {};
       this.items.forEach(function (form) {
-        var formNode = _this2.$refs[form.prop];
+        var formNode = _this3.$refs[form.prop];
         if (!formNode) {
-          if (typeof callback === "function" && ++count === _this2.items.length) {
+          if (typeof callback === "function" && ++count === _this3.items.length) {
             callback(valid, invalidForms);
           }
           return true;
@@ -824,7 +857,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
             valid = false;
             invalidForms[form.prop] = msgObj;
           }
-          if (typeof callback === "function" && ++count === _this2.items.length) {
+          if (typeof callback === "function" && ++count === _this3.items.length) {
             callback(valid, invalidForms);
           }
         });
@@ -834,9 +867,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
       }
     },
     reset: function reset() {
-      var _this3 = this;
+      var _this4 = this;
       this.items.forEach(function (form) {
-        var formNode = _this3.$refs[form.prop];
+        var formNode = _this4.$refs[form.prop];
         if (!formNode) {
           return true;
         }
@@ -847,7 +880,8 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
       var h = this.$createElement;
       var formProp = {
         attrs: Object.assign({
-          actions: this.actionFormMap[form.prop]
+          actions: this.actionFormMap[form.prop],
+          formModel: form.prop && this.formModel[form.prop]
         }, form),
         on: form.on
       };
@@ -861,10 +895,10 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
       }, formProp]));
     },
     renderTab: function renderTab(h, filterItems) {
-      var _this4 = this;
+      var _this5 = this;
       var itemNode = filterItems.map(function (item) {
         if (typeof item.render === "function") {
-          return item.render(h, _this4.formModel, item);
+          return item.render(h, _this5.formModel, item);
         }
         return h("el-tab-pane", {
           "key": item.prop,
@@ -874,7 +908,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
           }
         }, [h("template", {
           "slot": "label"
-        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this4, h) : item.slots && item.slots.title]), _this4.formNode(item)]);
+        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this5, h) : item.slots && item.slots.title]), _this5.formNode(item)]);
       });
       var tabsProp = {
         attrs: {
@@ -883,27 +917,27 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         },
         on: {
           "tab-click": function tabClick(tabNode) {
-            _this4.$emit("openedCode", tabNode.name);
+            _this5.$emit("openedCode", tabNode.name);
           }
         }
       };
       return h("el-tabs", babel_helper_vue_jsx_merge_props_default()([{}, tabsProp]), [itemNode]);
     },
     renderCollapse: function renderCollapse(h, filterItems) {
-      var _this5 = this;
+      var _this6 = this;
       var itemNode = filterItems.map(function (item) {
         if (typeof item.render === "function") {
-          return item.render(h, _this5.formModel, item);
+          return item.render(h, _this6.formModel, item);
         }
         return h("el-collapse-item", {
-          "key": item.prop || item.label,
+          "key": item.prop,
           "attrs": {
-            "name": item.prop || item.label,
+            "name": item.prop,
             "title": item.label
           }
         }, [h("template", {
           "slot": "title"
-        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this5, h) : item.slots && item.slots.title]), _this5.formNode(item)]);
+        }, [item.slots && typeof item.slots.title === "function" ? item.slots.title.call(_this6, h) : item.slots && item.slots.title]), _this6.formNode(item)]);
       });
       var collapseProp = {
         attrs: {
@@ -911,20 +945,46 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         },
         on: {
           change: function change(val) {
-            _this5.$emit("openedCode", val);
+            _this6.$emit("openedCode", val);
           }
         }
       };
       return h("el-collapse", babel_helper_vue_jsx_merge_props_default()([{}, collapseProp]), [itemNode]);
+    },
+    renderCustom: function renderCustom(h, filterItems) {
+      var _this7 = this;
+      var itemNode = filterItems.map(function (item) {
+        if (typeof item.render === "function") {
+          return item.render(h, _this7.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(_this7, h) : item.slots && item.slots.title || item.label, _this7.formNode(item)]);
+      });
+      var collapseProp = {
+        attrs: {
+          value: this.openedCode
+        },
+        on: {
+          change: function change(val) {
+            _this7.$emit("openedCode", val);
+          }
+        }
+      };
+      return h("div", babel_helper_vue_jsx_merge_props_default()([{}, collapseProp]), [itemNode]);
     }
   },
   render: function render(h) {
-    var _this6 = this;
+    var _this8 = this;
     var filterItems = this.items.filter(function (item) {
       if (item.show === false) {
         return false;
       }
-      if (typeof item.show === "function" && !item.show.call(_this6, {
+      if (typeof item.show === "function" && !item.show.call(_this8, {
         config: item
       })) {
         return false;
@@ -934,10 +994,15 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
     if (!filterItems.length > 0) {
       return null;
     }
-    this.openedCode = this.defaultExpandVal || filterItems[0] && filterItems[0].prop;
+    this.openedCode = filterItems[0] && filterItems[0].prop;
+    var group = {
+      Custom: this.renderCustom,
+      Tab: this.renderTab,
+      Collapse: this.renderCollapse
+    };
     return h("div", {
-      "class": ["form-group", "is-" + (this.control === "Tab" ? "tab" : "collapse")]
-    }, [this.control === "Tab" ? this.renderTab(h, filterItems) : this.renderCollapse(h, filterItems)]);
+      "class": ["form-group", "is-" + this.control]
+    }, [group[this.control] ? group[this.control](h, filterItems) : null]);
   }
 });
 // CONCATENATED MODULE: ./src/components/form-group/index.js