@panpanzhao/component-ui 0.0.46 → 1.0.0

package/lib/component-ui.common.js

@@ -3073,9 +3073,13 @@ form_query_src_form.install = function (Vue) {
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var 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;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {
@@ -3155,6 +3159,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         return [];
       }
     },
+    defaultExpandVal: {
+      type: Array | String
+    },
     items: {
       type: Array,
       default: function _default() {
@@ -3324,9 +3331,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
           return item.render(h, _this5.formModel, item);
         }
         return h("el-collapse-item", {
-          "key": item.prop,
+          "key": item.prop || item.label,
           "attrs": {
-            "name": item.prop,
+            "name": item.prop || item.label,
             "title": item.label
           }
         }, [h("template", {
@@ -3362,7 +3369,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
     if (!filterItems.length > 0) {
       return null;
     }
-    this.openedCode = filterItems[0] && filterItems[0].prop;
+    this.openedCode = this.defaultExpandVal || filterItems[0] && filterItems[0].prop;
     return h("div", {
       "class": ["form-group", "is-" + (this.control === "Tab" ? "tab" : "collapse")]
     }, [this.control === "Tab" ? this.renderTab(h, filterItems) : this.renderCollapse(h, filterItems)]);
@@ -7132,8 +7139,8 @@ table_operate_src.install = function (Vue) {
   Vue.component(table_operate_src.name, table_operate_src);
 };
 /* harmony default export */ var table_operate = (table_operate_src);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/crud/src/index.vue?vue&type=template&id=8ec3f608&
-var srcvue_type_template_id_8ec3f608_render = function render() {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/crud/src/index.vue?vue&type=template&id=09a7f1dc&
+var srcvue_type_template_id_09a7f1dc_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "crud" }, [
@@ -7200,11 +7207,11 @@ var srcvue_type_template_id_8ec3f608_render = function render() {
     ),
   ])
 }
-var srcvue_type_template_id_8ec3f608_staticRenderFns = []
-srcvue_type_template_id_8ec3f608_render._withStripped = true
+var srcvue_type_template_id_09a7f1dc_staticRenderFns = []
+srcvue_type_template_id_09a7f1dc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=8ec3f608&
+// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=09a7f1dc&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/crud/src/index.vue?vue&type=script&lang=js&
 
@@ -7236,7 +7243,8 @@ srcvue_type_template_id_8ec3f608_render._withStripped = true
         message: {
           success: {
             message: '添加成功',
-            type: 'success'
+            type: 'success',
+            showClose: true
           }
         }
       }, this.create);
@@ -7251,7 +7259,8 @@ srcvue_type_template_id_8ec3f608_render._withStripped = true
         message: {
           success: {
             message: '修改成功',
-            type: 'success'
+            type: 'success',
+            showClose: true
           }
         }
       }, this.update);
@@ -7574,8 +7583,8 @@ srcvue_type_template_id_8ec3f608_render._withStripped = true
 
 var crud_src_component = normalizeComponent(
   components_crud_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_8ec3f608_render,
-  srcvue_type_template_id_8ec3f608_staticRenderFns,
+  srcvue_type_template_id_09a7f1dc_render,
+  srcvue_type_template_id_09a7f1dc_staticRenderFns,
   false,
   null,
   null,

package/lib/components/crud.js

@@ -817,9 +817,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var 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;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {
@@ -899,6 +903,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         return [];
       }
     },
+    defaultExpandVal: {
+      type: Array | String
+    },
     items: {
       type: Array,
       default: function _default() {
@@ -1068,9 +1075,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
           return item.render(h, _this5.formModel, item);
         }
         return h("el-collapse-item", {
-          "key": item.prop,
+          "key": item.prop || item.label,
           "attrs": {
-            "name": item.prop,
+            "name": item.prop || item.label,
             "title": item.label
           }
         }, [h("template", {
@@ -1106,7 +1113,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
     if (!filterItems.length > 0) {
       return null;
     }
-    this.openedCode = filterItems[0] && filterItems[0].prop;
+    this.openedCode = this.defaultExpandVal || filterItems[0] && filterItems[0].prop;
     return h("div", {
       "class": ["form-group", "is-" + (this.control === "Tab" ? "tab" : "collapse")]
     }, [this.control === "Tab" ? this.renderTab(h, filterItems) : this.renderCollapse(h, filterItems)]);
@@ -2106,7 +2113,7 @@ module.exports = require("element-ui/lib/message-box");
 // 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/crud/src/index.vue?vue&type=template&id=8ec3f608&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/crud/src/index.vue?vue&type=template&id=09a7f1dc&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -2178,7 +2185,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=8ec3f608&
+// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=09a7f1dc&
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-search"
 var table_search_ = __webpack_require__(29);
@@ -2234,7 +2241,8 @@ var external_lodash_ = __webpack_require__(2);
         message: {
           success: {
             message: '添加成功',
-            type: 'success'
+            type: 'success',
+            showClose: true
           }
         }
       }, this.create);
@@ -2249,7 +2257,8 @@ var external_lodash_ = __webpack_require__(2);
         message: {
           success: {
             message: '修改成功',
-            type: 'success'
+            type: 'success',
+            showClose: true
           }
         }
       }, this.update);

package/lib/components/form-dialog.js

@@ -648,9 +648,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var 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;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {
@@ -730,6 +734,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         return [];
       }
     },
+    defaultExpandVal: {
+      type: Array | String
+    },
     items: {
       type: Array,
       default: function _default() {
@@ -899,9 +906,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
           return item.render(h, _this5.formModel, item);
         }
         return h("el-collapse-item", {
-          "key": item.prop,
+          "key": item.prop || item.label,
           "attrs": {
-            "name": item.prop,
+            "name": item.prop || item.label,
             "title": item.label
           }
         }, [h("template", {
@@ -937,7 +944,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
     if (!filterItems.length > 0) {
       return null;
     }
-    this.openedCode = filterItems[0] && filterItems[0].prop;
+    this.openedCode = this.defaultExpandVal || filterItems[0] && filterItems[0].prop;
     return h("div", {
       "class": ["form-group", "is-" + (this.control === "Tab" ? "tab" : "collapse")]
     }, [this.control === "Tab" ? this.renderTab(h, filterItems) : this.renderCollapse(h, filterItems)]);

package/lib/components/form-drawer.js

@@ -284,9 +284,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var 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;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {
@@ -366,6 +370,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         return [];
       }
     },
+    defaultExpandVal: {
+      type: Array | String
+    },
     items: {
       type: Array,
       default: function _default() {
@@ -535,9 +542,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
           return item.render(h, _this5.formModel, item);
         }
         return h("el-collapse-item", {
-          "key": item.prop,
+          "key": item.prop || item.label,
           "attrs": {
-            "name": item.prop,
+            "name": item.prop || item.label,
             "title": item.label
           }
         }, [h("template", {
@@ -573,7 +580,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
     if (!filterItems.length > 0) {
       return null;
     }
-    this.openedCode = filterItems[0] && filterItems[0].prop;
+    this.openedCode = this.defaultExpandVal || filterItems[0] && filterItems[0].prop;
     return h("div", {
       "class": ["form-group", "is-" + (this.control === "Tab" ? "tab" : "collapse")]
     }, [this.control === "Tab" ? this.renderTab(h, filterItems) : this.renderCollapse(h, filterItems)]);

package/lib/components/form-group.js

@@ -638,9 +638,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var 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;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {
@@ -720,6 +724,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         return [];
       }
     },
+    defaultExpandVal: {
+      type: Array | String
+    },
     items: {
       type: Array,
       default: function _default() {
@@ -889,9 +896,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
           return item.render(h, _this5.formModel, item);
         }
         return h("el-collapse-item", {
-          "key": item.prop,
+          "key": item.prop || item.label,
           "attrs": {
-            "name": item.prop,
+            "name": item.prop || item.label,
             "title": item.label
           }
         }, [h("template", {
@@ -927,7 +934,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
     if (!filterItems.length > 0) {
       return null;
     }
-    this.openedCode = filterItems[0] && filterItems[0].prop;
+    this.openedCode = this.defaultExpandVal || filterItems[0] && filterItems[0].prop;
     return h("div", {
       "class": ["form-group", "is-" + (this.control === "Tab" ? "tab" : "collapse")]
     }, [this.control === "Tab" ? this.renderTab(h, filterItems) : this.renderCollapse(h, filterItems)]);

package/lib/components/table-operate.js

@@ -817,9 +817,13 @@ var components_form = __webpack_require__(4);
     }
   },
   created: function created() {
-    if (this.prop && this._formGroup) {
-      this._formGroup.formModel[this.prop] = this.formModel;
+    if (this._formGroup) {
+      var 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;
+    // }
   },
   mounted: function mounted() {
     if (this.prop && this._formGroup && this.$refs.form) {
@@ -899,6 +903,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         return [];
       }
     },
+    defaultExpandVal: {
+      type: Array | String
+    },
     items: {
       type: Array,
       default: function _default() {
@@ -1068,9 +1075,9 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
           return item.render(h, _this5.formModel, item);
         }
         return h("el-collapse-item", {
-          "key": item.prop,
+          "key": item.prop || item.label,
           "attrs": {
-            "name": item.prop,
+            "name": item.prop || item.label,
             "title": item.label
           }
         }, [h("template", {
@@ -1106,7 +1113,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
     if (!filterItems.length > 0) {
       return null;
     }
-    this.openedCode = filterItems[0] && filterItems[0].prop;
+    this.openedCode = this.defaultExpandVal || filterItems[0] && filterItems[0].prop;
     return h("div", {
       "class": ["form-group", "is-" + (this.control === "Tab" ? "tab" : "collapse")]
     }, [this.control === "Tab" ? this.renderTab(h, filterItems) : this.renderCollapse(h, filterItems)]);