@panpanzhao/component-ui 0.0.10 → 0.0.12

package/lib/components/table-editable.js

@@ -589,8 +589,8 @@ module.exports = require("async-validator");
 // 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/table-editable/src/index.vue?vue&type=template&id=2cd18efc&
-var srcvue_type_template_id_2cd18efc_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/table-editable/src/index.vue?vue&type=template&id=aabdd8e6&
+var srcvue_type_template_id_aabdd8e6_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -633,10 +633,10 @@ var srcvue_type_template_id_2cd18efc_render = function render() {
   )
 }
 var staticRenderFns = []
-srcvue_type_template_id_2cd18efc_render._withStripped = true
+srcvue_type_template_id_aabdd8e6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table-editable/src/index.vue?vue&type=template&id=2cd18efc&
+// CONCATENATED MODULE: ./src/components/table-editable/src/index.vue?vue&type=template&id=aabdd8e6&
 
 // EXTERNAL MODULE: external "element-ui/lib/table"
 var table_ = __webpack_require__(29);
@@ -1293,10 +1293,10 @@ var utils = __webpack_require__(20);
     deleteByIndex: function deleteByIndex(index) {
       this.data && this.data.splice(index, 1);
     },
-    deleteByRow: function deleteByRow(row) {
-      var _this4 = this;
+    deleteByRow: function deleteByRow(row, id) {
+      var refId = row[this.rowKey] ? this.rowKey : "id";
       Object(utils["d" /* spliceTreeSelf */])(this.data, Object(utils["c" /* findTreeIndex */])(this.data, function (item) {
-        return item[_this4.rowKey] === row[_this4.rowKey];
+        return item[id || refId] === row[id || refId];
       }), 1);
     }
   }
@@ -1316,7 +1316,7 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   table_editable_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_2cd18efc_render,
+  srcvue_type_template_id_aabdd8e6_render,
   staticRenderFns,
   false,
   null,

package/lib/components/table-operate.js

@@ -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=26d7095f&
+// 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=dfeb985e&
 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=26d7095f&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
 var form_ = __webpack_require__(12);
@@ -419,6 +419,9 @@ var external_lodash_ = __webpack_require__(2);
     var _this2 = this;
     this.formItems.forEach(function (item) {
       _this2.formItemLayout[item.prop] = item;
+      if (typeof item.value === "function") {
+        item.value = item.value.call(_this2);
+      }
       _this2.defaultModel[item.prop] = item.value;
       //初始化值处理
       var formVal = Object(external_lodash_["get"])(_this2.formModel, item.prop);
@@ -1504,6 +1507,10 @@ var external_lodash_ = __webpack_require__(2);
       }
     },
     formMode: String,
+    noApiClose: {
+      type: Boolean,
+      default: true
+    },
     api: {
       type: Object,
       default: function _default() {
@@ -1534,6 +1541,7 @@ var external_lodash_ = __webpack_require__(2);
     return {
       show: false,
       formModel: {},
+      expandModel: null,
       defaultTools: [{
         label: this.dialog.cancelButtonText || "取消",
         type: this.confirmButtonType,
@@ -1557,10 +1565,14 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   methods: {
-    open: function open(model) {
+    open: function open(model, expandModel) {
+      var _this2 = this;
       this.show = true;
+      this.expandModel = expandModel;
       if (model) {
-        this.setFormModel(model);
+        this.$nextTick(function () {
+          _this2.setFormModel(model);
+        });
       }
     },
     close: function close() {
@@ -1572,45 +1584,57 @@ var external_lodash_ = __webpack_require__(2);
     reset: function reset() {
       this.$refs.form && this.$refs.form.reset();
     },
+    closed: function closed() {
+      this.reset();
+      this.show = false;
+    },
     submit: function submit(button) {
-      var _this2 = this;
+      var _this3 = this;
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
-        var reqData = Object(external_lodash_["merge"])(_this2.api.data || {}, _this2.formModel);
-        if (typeof _this2.api.before === "function") {
-          reqData = _this2.api.before.call(_this2, reqData);
+        var reqData = Object(external_lodash_["merge"])(_this3.api.data || {}, _this3.formModel);
+        if (typeof _this3.api.before === "function") {
+          reqData = _this3.api.before.call(_this3, reqData);
         }
-        if (!(_this2.api.url && _this2.requester)) {
-          _this2.close();
-          _this2.reset();
-          _this2.$emit("success", {
-            request: _this2.requester,
-            reqData: reqData
+        if (!(_this3.api.url && _this3.requester)) {
+          if (_this3.noApiClose) {
+            _this3.reset();
+            _this3.show = false;
+          }
+          _this3.$emit("success", {
+            request: _this3.requester,
+            reqData: reqData,
+            expandData: _this3.expandModel
+          }, {
+            button: button
           });
           return false;
         }
         button.loading = true;
-        _this2.requester({
-          url: Object(formula_["evaluate"])(_this2.api.url, reqData),
-          method: _this2.api.method || "POST",
+        _this3.requester({
+          url: Object(formula_["evaluate"])(_this3.api.url, reqData),
+          method: _this3.api.method || "POST",
+          headers: _this3.api.headers,
           data: reqData
         }).then(function (res) {
           button.loading = false;
-          _this2.close();
-          _this2.reset();
-          _this2.$emit("success", {
-            request: _this2.requester,
+          _this3.reset();
+          _this3.show = false;
+          _this3.$emit("success", {
+            request: _this3.requester,
             reqData: reqData,
-            resData: res
+            resData: res,
+            expandData: _this3.expandModel
           });
         }).catch(function (error) {
           button.loading = false;
-          _this2.$emit("error", {
-            request: _this2.requester,
+          _this3.$emit("error", {
+            request: _this3.requester,
             reqData: reqData,
-            resError: error
+            resError: error,
+            expandData: _this3.expandModel
           });
         });
       });
@@ -1618,7 +1642,8 @@ var external_lodash_ = __webpack_require__(2);
     renderForm: function renderForm(h) {
       var param = {
         attrs: Object.assign({
-          formModel: this.formModel
+          formModel: this.formModel,
+          request: this.request
         }, this.form)
       };
       if (this.formMode === "group") {
@@ -1650,7 +1675,7 @@ var external_lodash_ = __webpack_require__(2);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this4 = this;
     var param = {
       attrs: Object.assign({
         visible: this.show,
@@ -1659,7 +1684,8 @@ var external_lodash_ = __webpack_require__(2);
       }, this.dialog),
       on: Object.assign(this.on, {
         close: function close() {
-          _this3.close();
+          _this4.reset();
+          _this4.show = false;
         }
       })
     };

package/lib/components/table-search.js

@@ -227,7 +227,7 @@ module.exports = require("@panpanzhao/component-ui/lib/components/table");
 // 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/table-search/src/index.vue?vue&type=template&id=08925b81&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table-search/src/index.vue?vue&type=template&id=36222536&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c
@@ -260,7 +260,7 @@ var render = function render() {
                           "el-button",
                           {
                             attrs: { icon: "el-icon-refresh-left" },
-                            on: { click: _vm.reset },
+                            on: { click: _vm.resetForm },
                           },
                           [_vm._v("重置")]
                         ),
@@ -296,7 +296,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=08925b81&
+// CONCATENATED MODULE: ./src/components/table-search/src/index.vue?vue&type=template&id=36222536&
 
 // EXTERNAL MODULE: external "element-ui/lib/button"
 var button_ = __webpack_require__(5);

package/lib/components/table.js

@@ -255,8 +255,8 @@ module.exports = require("element-ui/lib/pagination");
 // 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/table/src/table.vue?vue&type=template&id=189ef3b0&
-var tablevue_type_template_id_189ef3b0_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/table/src/table.vue?vue&type=template&id=a8e62da6&
+var tablevue_type_template_id_a8e62da6_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "table" }, [
@@ -335,10 +335,10 @@ var tablevue_type_template_id_189ef3b0_render = function render() {
   ])
 }
 var staticRenderFns = []
-tablevue_type_template_id_189ef3b0_render._withStripped = true
+tablevue_type_template_id_a8e62da6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=189ef3b0&
+// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=a8e62da6&
 
 // EXTERNAL MODULE: external "@vue/babel-helper-vue-jsx-merge-props"
 var babel_helper_vue_jsx_merge_props_ = __webpack_require__(0);
@@ -462,7 +462,10 @@ var external_lodash_ = __webpack_require__(2);
         return {};
       }
     },
-    hasInit: Boolean,
+    hasInit: {
+      type: Boolean,
+      default: true
+    },
     remoteProp: {
       type: Object,
       default: function _default() {
@@ -562,10 +565,16 @@ var external_lodash_ = __webpack_require__(2);
           }
 
           _this2.$emit("row-click", row);
+          if (typeof _this2.on["row-click"] === "function") {
+            _this2.on["row-click"].call(_this2, row);
+          }
         },
         "selection-change": function selectionChange(selection) {
           _this2.selection = selection;
           _this2.$emit("selection-change", selection);
+          if (typeof _this2.on["selection-change"] === "function") {
+            _this2.on["selection-change"].call(_this2, row);
+          }
         }
       });
     },
@@ -615,7 +624,7 @@ var external_lodash_ = __webpack_require__(2);
     },
     search: function search() {
       var _this4 = this;
-      if (!this.requester) {
+      if (!(this.requester && this.api.url)) {
         return false;
       }
       var reqData = Object.assign({}, this.api.data);
@@ -633,6 +642,7 @@ var external_lodash_ = __webpack_require__(2);
       this.requester({
         url: Object(formula_["evaluate"])(this.api.url, reqData),
         method: this.api.method || "POST",
+        headers: this.api.headers,
         data: reqData
       }).then(function (res) {
         if (typeof _this4.api.after === "function") {
@@ -673,7 +683,7 @@ var componentNormalizer = __webpack_require__(1);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_189ef3b0_render,
+  tablevue_type_template_id_a8e62da6_render,
   staticRenderFns,
   false,
   null,