@panpanzhao/component-ui 0.0.10 → 0.0.12

package/lib/component-ui.common.js

@@ -305,13 +305,13 @@ module.exports = require("element-ui/lib/checkbox-button");
 /* 36 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/switch");
+module.exports = require("element-ui/lib/cascader");
 
 /***/ }),
 /* 37 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/cascader");
+module.exports = require("element-ui/lib/switch");
 
 /***/ }),
 /* 38 */
@@ -472,8 +472,24 @@ module.exports = require("codemirror/addon/mode/multiplex");
 // 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&
-var formvue_type_template_id_26d7095f_render = function render() {
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, "uuid", function() { return /* reexport */ uuid; });
+__webpack_require__.d(__webpack_exports__, "mapTree", function() { return /* reexport */ mapTree; });
+__webpack_require__.d(__webpack_exports__, "eachTree", function() { return /* reexport */ eachTree; });
+__webpack_require__.d(__webpack_exports__, "findTree", function() { return /* reexport */ findTree; });
+__webpack_require__.d(__webpack_exports__, "findTreeIndex", function() { return /* reexport */ findTreeIndex; });
+__webpack_require__.d(__webpack_exports__, "getTree", function() { return /* reexport */ getTree; });
+__webpack_require__.d(__webpack_exports__, "filterTree", function() { return /* reexport */ filterTree; });
+__webpack_require__.d(__webpack_exports__, "everyTree", function() { return /* reexport */ everyTree; });
+__webpack_require__.d(__webpack_exports__, "someTree", function() { return /* reexport */ someTree; });
+__webpack_require__.d(__webpack_exports__, "spliceTree", function() { return /* reexport */ spliceTree; });
+__webpack_require__.d(__webpack_exports__, "getTreeDepth", function() { return /* reexport */ getTreeDepth; });
+__webpack_require__.d(__webpack_exports__, "getTreeAncestors", function() { return /* reexport */ getTreeAncestors; });
+__webpack_require__.d(__webpack_exports__, "getTreeParent", function() { return /* reexport */ getTreeParent; });
+__webpack_require__.d(__webpack_exports__, "spliceTreeSelf", function() { return /* reexport */ spliceTreeSelf; });
+
+// 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 formvue_type_template_id_dfeb985e_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -540,10 +556,10 @@ var formvue_type_template_id_26d7095f_render = function render() {
   )
 }
 var staticRenderFns = []
-formvue_type_template_id_26d7095f_render._withStripped = true
+formvue_type_template_id_dfeb985e_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__(23);
@@ -676,6 +692,9 @@ var external_lodash_ = __webpack_require__(1);
     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);
@@ -846,7 +865,7 @@ function normalizeComponent(
 
 var component = normalizeComponent(
   src_formvue_type_script_lang_js_,
-  formvue_type_template_id_26d7095f_render,
+  formvue_type_template_id_dfeb985e_render,
   staticRenderFns,
   false,
   null,
@@ -1074,8 +1093,8 @@ var option_default = /*#__PURE__*/__webpack_require__.n(option_);
 var option_group_ = __webpack_require__(30);
 var option_group_default = /*#__PURE__*/__webpack_require__.n(option_group_);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/SelectTree.vue?vue&type=template&id=626a2185&
-var SelectTreevue_type_template_id_626a2185_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/form/src/item/SelectTree.vue?vue&type=template&id=b7fb5e4e&
+var SelectTreevue_type_template_id_b7fb5e4e_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -1145,11 +1164,11 @@ var SelectTreevue_type_template_id_626a2185_render = function render() {
     1
   )
 }
-var SelectTreevue_type_template_id_626a2185_staticRenderFns = []
-SelectTreevue_type_template_id_626a2185_render._withStripped = true
+var SelectTreevue_type_template_id_b7fb5e4e_staticRenderFns = []
+SelectTreevue_type_template_id_b7fb5e4e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/item/SelectTree.vue?vue&type=template&id=626a2185&
+// CONCATENATED MODULE: ./src/components/form/src/item/SelectTree.vue?vue&type=template&id=b7fb5e4e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/SelectTree.vue?vue&type=script&lang=js&
 /* harmony default export */ var SelectTreevue_type_script_lang_js_ = ({
@@ -1206,6 +1225,17 @@ SelectTreevue_type_template_id_626a2185_render._withStripped = true
   },
 
   watch: {
+    value: function value(val) {
+      if (!val) {
+        if (this.$refs.tree) {
+          this.$refs.tree.setCurrentKey(null);
+          this.$refs.tree.setCheckedKeys([]);
+        }
+        this.selectedData = null;
+        return;
+      }
+      this.initData();
+    },
     options: {
       handler: function handler() {
         var _this = this;
@@ -1318,9 +1348,11 @@ SelectTreevue_type_template_id_626a2185_render._withStripped = true
     },
     emitChange: function emitChange() {
       if (this.multiple) {
+        this.$emit("input", this.checkedKeys, this.checkedData);
         this.$emit("change", this.checkedKeys, this.checkedData);
         return false;
       }
+      this.$emit("input", this.checkedData && this.checkedData[this.optionProps.value], this.checkedData);
       this.$emit("change", this.checkedData && this.checkedData[this.optionProps.value], this.checkedData);
     },
     setSingleData: function setSingleData(data) {
@@ -1344,6 +1376,11 @@ SelectTreevue_type_template_id_626a2185_render._withStripped = true
       if (this.multiple) {
         return false;
       }
+      if (data.disabled) {
+        this.$refs.tree.setCurrentKey(this.value || null);
+        console.warn("该节点数据disabled为true,不能选择");
+        return false;
+      }
       this.setSingleData(data);
       this.emitChange();
       this.$refs.select.handleClose();
@@ -1385,8 +1422,8 @@ SelectTreevue_type_template_id_626a2185_render._withStripped = true
 
 var SelectTree_component = normalizeComponent(
   item_SelectTreevue_type_script_lang_js_,
-  SelectTreevue_type_template_id_626a2185_render,
-  SelectTreevue_type_template_id_626a2185_staticRenderFns,
+  SelectTreevue_type_template_id_b7fb5e4e_render,
+  SelectTreevue_type_template_id_b7fb5e4e_staticRenderFns,
   false,
   null,
   null,
@@ -1414,16 +1451,18 @@ var SelectTree_component = normalizeComponent(
   },
   props: {
     selectMode: String,
+    dictCode: String,
     options: {
       type: Array,
       default: function _default() {
         return null;
       }
     },
+    optionRender: Function,
     api: {
       type: Object,
       default: function _default() {
-        return null;
+        return {};
       }
     },
     apiOpen: {
@@ -1435,11 +1474,7 @@ var SelectTree_component = normalizeComponent(
     optionProps: {
       type: Object,
       default: function _default() {
-        return {
-          value: "value",
-          label: "label",
-          children: "children"
-        };
+        return {};
       }
     }
   },
@@ -1452,8 +1487,15 @@ var SelectTree_component = normalizeComponent(
     attrs: function attrs() {
       return Object.assign({}, this.$attrs);
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionData: function optionData() {
-      return this.options || this.apiOptions || [];
+      var options = this.options || this.apiOptions;
+      return Array.isArray(options) ? options : this.dictOption;
     },
     _form: function _form() {
       var parent = this.$parent;
@@ -1466,6 +1508,13 @@ var SelectTree_component = normalizeComponent(
       }
       return false;
     },
+    _optionProps: function _optionProps() {
+      return Object.assign({
+        value: "value",
+        label: "label",
+        children: "children"
+      }, this.optionProps);
+    },
     request: function request() {
       return this.api.request || this._form && this._form.request || (this.$COMPONENT || {}).request;
     }
@@ -1485,26 +1534,36 @@ var SelectTree_component = normalizeComponent(
   },
   methods: {
     transformOption: function transformOption(item) {
-      item.value = item[this.optionProps.value];
-      item.label = item[this.optionProps.label];
-      if (item[this.optionProps.children]) {
-        item.children = this.transformOption(item[this.optionProps.children]);
+      item.value = item[this._optionProps.value];
+      item.label = item[this._optionProps.label];
+      if (item[this._optionProps.children]) {
+        item.children = this.transformOption(item[this._optionProps.children]);
       }
       return item;
     },
     initApi: function initApi() {
       var _this = this;
-      if (!(this.api && this.request)) {
+      if (!(this.api.url && this.request)) {
         return false;
       }
+      var reqData = Object(external_lodash_["merge"])({}, this.api.data);
+      if (typeof this.api.before === "function") {
+        reqData = this.api.before.call(this, reqData, {
+          form: this._form,
+          formModel: this._form && this._form.formModel
+        });
+      }
       this.request({
-        url: Object(formula_["evaluate"])(this.api.url, this.api.data),
+        url: Object(formula_["evaluate"])(this.api.url, reqData),
         method: this.api.method || "GET",
-        data: this.api.data
+        headers: this.api.headers,
+        data: reqData
       }).then(function (res) {
-        if (typeof _this.api.transform === "function") {
-          _this.apiOptions = _this.api.transform.call(_this, resData);
-          return false;
+        if (typeof _this.api.after === "function") {
+          res = _this.api.after.call(_this, res, {
+            form: _this._form,
+            formModel: _this._form && _this._form.formModel
+          });
         }
         _this.apiOptions = _this.api.dataPath ? Object(external_lodash_["get"])(res, _this.api.dataPath, []) : res;
       }).catch(function (error) {
@@ -1515,19 +1574,22 @@ var SelectTree_component = normalizeComponent(
       var _this2 = this;
       return this.optionData.map(function (item) {
         return h("el-option-group", {
-          "key": item[_this2.optionProps.value],
+          "key": item[_this2._optionProps.value],
           "attrs": {
-            "label": item[_this2.optionProps.label]
+            "label": item[_this2._optionProps.label]
           }
-        }, [item[_this2.optionProps.children] && item[_this2.optionProps.children].map(function (itemOpt) {
+        }, [item[_this2._optionProps.children] && item[_this2._optionProps.children].map(function (itemOpt) {
           return h("el-option", {
-            "key": itemOpt[_this2.optionProps.value],
+            "key": itemOpt[_this2._optionProps.value],
             "attrs": {
-              "value": itemOpt[_this2.optionProps.value],
-              "label": itemOpt[_this2.optionProps.label],
+              "value": itemOpt[_this2._optionProps.value],
+              "label": itemOpt[_this2._optionProps.label],
               "disabled": itemOpt.disabled
             }
-          });
+          }, [_this2.optionRender ? _this2.optionRender.call(_this2, h, itemOpt, {
+            form: _this2._form,
+            formModel: _this2._form && _this2._form.formModel
+          }) : null]);
         })]);
       });
     },
@@ -1535,7 +1597,7 @@ var SelectTree_component = normalizeComponent(
       var param = {
         attrs: Object.assign({}, this.$attrs, {
           options: this.optionData,
-          optionProps: this.optionProps
+          optionProps: this._optionProps
         }),
         slots: this.$slots,
         scopedSlots: this.$slots,
@@ -1548,14 +1610,17 @@ var SelectTree_component = normalizeComponent(
       if (this.selectMode === "group") {
         return this.renderGroup(h, scoped);
       }
-      return this.optionData.map(function (item) {
+      return this.optionData.map(function (itemOpt) {
         return h("el-option", {
-          "key": item[_this3.optionProps.value],
+          "key": itemOpt[_this3._optionProps.value],
           "attrs": {
-            "value": item[_this3.optionProps.value],
-            "label": item[_this3.optionProps.label]
+            "value": itemOpt[_this3._optionProps.value],
+            "label": itemOpt[_this3._optionProps.label]
           }
-        });
+        }, [_this3.optionRender ? _this3.optionRender.call(_this3, h, itemOpt, {
+          form: _this3._form,
+          formModel: _this3._form && _this3._form.formModel
+        }) : null]);
       });
     }
   },
@@ -1630,6 +1695,7 @@ var radio_button_default = /*#__PURE__*/__webpack_require__.n(radio_button_);
   },
   props: {
     size: String,
+    dictCode: String,
     border: {
       type: Boolean,
       default: function _default() {
@@ -1678,8 +1744,14 @@ var radio_button_default = /*#__PURE__*/__webpack_require__.n(radio_button_);
         border: this.border
       });
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionData: function optionData() {
-      return this.options || this.apiOptions || [];
+      return this.options || this.apiOptions || this.dictOption;
     },
     _form: function _form() {
       var parent = this.$parent;
@@ -1825,6 +1897,7 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
   },
   props: {
     size: String,
+    dictCode: String,
     border: {
       type: Boolean,
       default: function _default() {
@@ -1853,11 +1926,7 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
     optionProps: {
       type: Object,
       default: function _default() {
-        return {
-          value: "value",
-          label: "label",
-          name: "name"
-        };
+        return {};
       }
     }
   },
@@ -1873,8 +1942,14 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
         border: this.border
       });
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionData: function optionData() {
-      return this.options || this.apiOptions || [];
+      return this.options || this.apiOptions || this.dictOption;
     },
     _form: function _form() {
       var parent = this.$parent;
@@ -1887,6 +1962,13 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
       }
       return false;
     },
+    _optionProps: function _optionProps() {
+      return Object.assign({
+        value: "value",
+        label: "label",
+        children: "children"
+      }, this.optionProps);
+    },
     request: function request() {
       return this.api.request || this._form && this._form.request || (this.$COMPONENT || {}).request;
     }
@@ -1928,12 +2010,12 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
       var _this2 = this;
       return this.optionData.map(function (item) {
         return h("el-checkbox-button", {
-          "key": item[_this2.optionProps.value],
+          "key": item[_this2._optionProps.value],
           "attrs": {
-            "label": item[_this2.optionProps.value],
-            "disabled": item[_this2.optionProps.disabled]
+            "label": item[_this2._optionProps.value],
+            "disabled": item[_this2._optionProps.disabled]
           }
-        }, [item[_this2.optionProps.label]]);
+        }, [item[_this2._optionProps.label]]);
       });
     },
     renderOptions: function renderOptions(h, scoped) {
@@ -1943,15 +2025,15 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
       }
       return this.optionData.map(function (item) {
         return h("el-checkbox", {
-          "key": item[_this3.optionProps.value],
+          "key": item[_this3._optionProps.value],
           "attrs": {
-            "value": item[_this3.optionProps.value],
-            "label": item[_this3.optionProps.value],
-            "disabled": item[_this3.optionProps.disabled],
+            "value": item[_this3._optionProps.value],
+            "label": item[_this3._optionProps.value],
+            "disabled": item[_this3._optionProps.disabled],
             "border": _this3.border,
             "size": _this3.size
           }
-        }, [item[_this3.optionProps.label]]);
+        }, [item[_this3._optionProps.label]]);
       });
     }
   },
@@ -2047,14 +2129,81 @@ var InputText_component = normalizeComponent(
 )
 
 /* harmony default export */ var InputText = (InputText_component.exports);
-// EXTERNAL MODULE: external "element-ui/lib/switch"
-var switch_ = __webpack_require__(36);
-var switch_default = /*#__PURE__*/__webpack_require__.n(switch_);
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Cascader.vue?vue&type=template&id=1306b5bf&
+var Cascadervue_type_template_id_1306b5bf_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c
+  return _c(
+    "el-cascader",
+    _vm._g(
+      _vm._b(
+        { attrs: { options: _vm.options } },
+        "el-cascader",
+        _vm.attrs,
+        false
+      ),
+      _vm.$listeners
+    )
+  )
+}
+var Cascadervue_type_template_id_1306b5bf_staticRenderFns = []
+Cascadervue_type_template_id_1306b5bf_render._withStripped = true
+
+
+// CONCATENATED MODULE: ./src/components/form/src/item/Cascader.vue?vue&type=template&id=1306b5bf&
 
 // EXTERNAL MODULE: external "element-ui/lib/cascader"
-var cascader_ = __webpack_require__(37);
+var cascader_ = __webpack_require__(36);
 var cascader_default = /*#__PURE__*/__webpack_require__.n(cascader_);
 
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Cascader.vue?vue&type=script&lang=js&
+
+/* harmony default export */ var Cascadervue_type_script_lang_js_ = ({
+  name: "Cascader",
+  components: {
+    elCascader: cascader_default.a
+  },
+  props: {
+    size: String,
+    options: {
+      type: Array,
+      default: function _default() {
+        return null;
+      }
+    }
+  },
+  computed: {
+    attrs: function attrs() {
+      return Object.assign({}, this.$attrs);
+    }
+  }
+});
+// CONCATENATED MODULE: ./src/components/form/src/item/Cascader.vue?vue&type=script&lang=js&
+ /* harmony default export */ var item_Cascadervue_type_script_lang_js_ = (Cascadervue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/form/src/item/Cascader.vue
+
+
+
+
+
+/* normalize component */
+
+var Cascader_component = normalizeComponent(
+  item_Cascadervue_type_script_lang_js_,
+  Cascadervue_type_template_id_1306b5bf_render,
+  Cascadervue_type_template_id_1306b5bf_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var Cascader = (Cascader_component.exports);
+// EXTERNAL MODULE: external "element-ui/lib/switch"
+var switch_ = __webpack_require__(37);
+var switch_default = /*#__PURE__*/__webpack_require__.n(switch_);
+
 // EXTERNAL MODULE: external "element-ui/lib/slider"
 var slider_ = __webpack_require__(38);
 var slider_default = /*#__PURE__*/__webpack_require__.n(slider_);
@@ -2086,6 +2235,7 @@ var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
 
 
 
+// import elCascader from "element-ui/packages/cascader";
 
 
 
@@ -2095,7 +2245,7 @@ var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
   name: "FormInput",
   inheritAttrs: false,
   components: {
-    Cascader: cascader_default.a,
+    Cascader: Cascader,
     Slider: slider_default.a,
     Transfer: transfer_default.a,
     Switchs: switch_default.a,
@@ -2192,7 +2342,11 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
   watch: {
     value: function value(val) {
       //监听form的formModel变化,处理config的value变化
-      this.config.value = val;
+      if (this.config.value === val) {
+        return false;
+      }
+      this.setValue(val);
+      this.execEvent("input", val);
       if (this.form && this.form.formModel) {
         this.$emit("formItemChange", {
           itemConfig: this.config,
@@ -2252,8 +2406,9 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       if (this.on && this.on[eventName]) {
         this.$emit.apply(this, [eventName, {
           trigger: this.form,
+          triggerConfig: this.form.formItemLayout[this.prop],
           triggerForm: this.form.formModel,
-          triggerConfig: this.form.formItemLayout[this.prop]
+          triggerFormConfig: this.form.formItemLayout
         }].concat(arg));
       }
       //联动配置事件
@@ -2275,6 +2430,16 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
         triggerConfig: this.form.formItemLayout[this.prop],
         targetConfig: targetConfig
       }].concat(arg));
+    },
+    setValue: function setValue(val) {
+      if (this.form) {
+        if (this.prop && this.prop.indexOf(".") != -1) {
+          Object(external_lodash_["set"])(this.form.formModel, this.prop, val);
+        } else {
+          this.form.formModel[this.prop] = val;
+        }
+      }
+      this.config.value = val;
     }
   },
   render: function render(h) {
@@ -2286,30 +2451,27 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
         config: this.config
       });
     }
+    // disabled用的多，特殊处理下支持函数
+    var disabled = this.config.disabled;
+    if (typeof this.config.disabled === "function") {
+      disabled = this.config.disabled.call(this, {
+        form: this.form,
+        formModel: this.form.formModel,
+        config: this.config
+      });
+    }
     var itemProp = {
-      attrs: Object.assign({}, this.config),
+      attrs: Object.assign({}, this.config, {
+        disabled: disabled
+      }),
       on: Object.assign({}, this.eventOn, this.actionEventOn, {
         input: function input(val) {
+          _this2.setValue(val);
           _this2.execEvent("input", val);
-          if (_this2.form) {
-            if (_this2.prop && _this2.prop.indexOf(".") != -1) {
-              Object(external_lodash_["set"])(_this2.form.formModel, _this2.prop, val);
-            } else {
-              _this2.form.formModel[_this2.prop] = val;
-            }
-          }
-          _this2.config.value = val;
         },
         change: function change(val, selectOption) {
+          _this2.setValue(val);
           _this2.execEvent("change", val, selectOption);
-          if (_this2.form) {
-            if (_this2.prop && _this2.prop.indexOf(".") != -1) {
-              Object(external_lodash_["set"])(_this2.form.formModel, _this2.prop, val);
-            } else {
-              _this2.form.formModel[_this2.prop] = val;
-            }
-          }
-          _this2.config.value = val;
         }
       })
     };
@@ -2772,6 +2934,10 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
       }
     },
     formMode: String,
+    noApiClose: {
+      type: Boolean,
+      default: true
+    },
     api: {
       type: Object,
       default: function _default() {
@@ -2802,6 +2968,7 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
     return {
       show: false,
       formModel: {},
+      expandModel: null,
       defaultTools: [{
         label: this.dialog.cancelButtonText || "取消",
         type: this.confirmButtonType,
@@ -2825,10 +2992,14 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
     }
   },
   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() {
@@ -2840,45 +3011,57 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
     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
           });
         });
       });
@@ -2886,7 +3069,8 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
     renderForm: function renderForm(h) {
       var param = {
         attrs: Object.assign({
-          formModel: this.formModel
+          formModel: this.formModel,
+          request: this.request
         }, this.form)
       };
       if (this.formMode === "group") {
@@ -2918,7 +3102,7 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
     }
   },
   render: function render(h) {
-    var _this3 = this;
+    var _this4 = this;
     var param = {
       attrs: Object.assign({
         visible: this.show,
@@ -2927,7 +3111,8 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
       }, this.dialog),
       on: Object.assign(this.on, {
         close: function close() {
-          _this3.close();
+          _this4.reset();
+          _this4.show = false;
         }
       })
     };
@@ -3851,8 +4036,8 @@ form_view_dialog_src.install = function (Vue) {
   Vue.component(form_view_dialog_src.name, form_view_dialog_src);
 };
 /* harmony default export */ var form_view_dialog = (form_view_dialog_src);
-// 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" }, [
@@ -3930,11 +4115,11 @@ var tablevue_type_template_id_189ef3b0_render = function render() {
       : _vm._e(),
   ])
 }
-var tablevue_type_template_id_189ef3b0_staticRenderFns = []
-tablevue_type_template_id_189ef3b0_render._withStripped = true
+var tablevue_type_template_id_a8e62da6_staticRenderFns = []
+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 "element-ui/lib/table"
 var table_ = __webpack_require__(15);
@@ -4044,7 +4229,10 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
         return {};
       }
     },
-    hasInit: Boolean,
+    hasInit: {
+      type: Boolean,
+      default: true
+    },
     remoteProp: {
       type: Object,
       default: function _default() {
@@ -4144,10 +4332,16 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
           }
 
           _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);
+          }
         }
       });
     },
@@ -4197,7 +4391,7 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
     },
     search: function search() {
       var _this4 = this;
-      if (!this.requester) {
+      if (!(this.requester && this.api.url)) {
         return false;
       }
       var reqData = Object.assign({}, this.api.data);
@@ -4215,6 +4409,7 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
       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") {
@@ -4252,8 +4447,8 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
 
 var table_component = normalizeComponent(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_189ef3b0_render,
-  tablevue_type_template_id_189ef3b0_staticRenderFns,
+  tablevue_type_template_id_a8e62da6_render,
+  tablevue_type_template_id_a8e62da6_staticRenderFns,
   false,
   null,
   null,
@@ -4579,8 +4774,8 @@ var date_component = normalizeComponent(
 )
 
 /* harmony default export */ var date = (date_component.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/column/dict.vue?vue&type=template&id=1da75cb2&
-var dictvue_type_template_id_1da75cb2_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/column/dict.vue?vue&type=template&id=512d00c0&
+var dictvue_type_template_id_512d00c0_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -4618,11 +4813,11 @@ var dictvue_type_template_id_1da75cb2_render = function render() {
     )
   )
 }
-var dictvue_type_template_id_1da75cb2_staticRenderFns = []
-dictvue_type_template_id_1da75cb2_render._withStripped = true
+var dictvue_type_template_id_512d00c0_staticRenderFns = []
+dictvue_type_template_id_512d00c0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=1da75cb2&
+// CONCATENATED MODULE: ./src/components/table/src/column/dict.vue?vue&type=template&id=512d00c0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/dict.vue?vue&type=script&lang=js&
 
@@ -4632,6 +4827,7 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
     elTableColumn: table_column_default.a
   },
   props: {
+    dictCode: String,
     options: {
       type: Array,
       required: true
@@ -4655,11 +4851,18 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
         "show-overflow-tooltip": true
       }, this.$attrs);
     },
+    dictOption: function dictOption() {
+      if (this.dictCode && this.$COMPONENT.dataSource && this.$COMPONENT.dataSource.dict) {
+        return this.$COMPONENT.dataSource.dict[this.dictCode];
+      }
+      return [];
+    },
     optionMap: function optionMap() {
       var _this = this;
-      if (Array.isArray(this.options)) {
+      var options = this.options || this.dictOption;
+      if (Array.isArray(options)) {
         var map = {};
-        this.options.forEach(function (item) {
+        options.forEach(function (item) {
           var valueKey = item[_this.optionProp.value || "value"];
           map[valueKey] = item;
         });
@@ -4693,8 +4896,8 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
 
 var dict_component = normalizeComponent(
   column_dictvue_type_script_lang_js_,
-  dictvue_type_template_id_1da75cb2_render,
-  dictvue_type_template_id_1da75cb2_staticRenderFns,
+  dictvue_type_template_id_512d00c0_render,
+  dictvue_type_template_id_512d00c0_staticRenderFns,
   false,
   null,
   null,
@@ -5086,7 +5289,7 @@ function spliceTreeSelf(tree, idx, deleteCount) {
   computed: {
     attrs: function attrs() {
       return Object.assign({
-        "show-overflow-tooltip": true
+        "show-overflow-tooltip": false
       }, this.$attrs, this.$props);
     },
     defaultItem: function defaultItem() {
@@ -5135,9 +5338,7 @@ function spliceTreeSelf(tree, idx, deleteCount) {
       return template;
     },
     itemVNode: function itemVNode(h, itemRow, scoped) {
-      var cloneItem = Object.assign({
-        control: this.defaultItem.control
-      }, itemRow);
+      var cloneItem = Object(external_lodash_["merge"])({}, this.defaultItem, itemRow);
       cloneItem.parentData = scoped;
       if (typeof cloneItem.render === "function") {
         return cloneItem.render.call(this, h, scoped, cloneItem);
@@ -5383,8 +5584,8 @@ table_column.install = function (Vue) {
   Vue.component(table_column.name, table_column);
 };
 /* harmony default export */ var components_table_column = (table_column);
-// 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&
-var srcvue_type_template_id_08925b81_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-search/src/index.vue?vue&type=template&id=36222536&
+var srcvue_type_template_id_36222536_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", { staticClass: "table-search" }, [
@@ -5416,7 +5617,7 @@ var srcvue_type_template_id_08925b81_render = function render() {
                           "el-button",
                           {
                             attrs: { icon: "el-icon-refresh-left" },
-                            on: { click: _vm.reset },
+                            on: { click: _vm.resetForm },
                           },
                           [_vm._v("重置")]
                         ),
@@ -5448,11 +5649,11 @@ var srcvue_type_template_id_08925b81_render = function render() {
     ),
   ])
 }
-var srcvue_type_template_id_08925b81_staticRenderFns = []
-srcvue_type_template_id_08925b81_render._withStripped = true
+var srcvue_type_template_id_36222536_staticRenderFns = []
+srcvue_type_template_id_36222536_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 "@panpanzhao/component-ui/lib/components/form"
 var components_form_ = __webpack_require__(50);
@@ -5543,8 +5744,8 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
 
 var table_search_src_component = normalizeComponent(
   components_table_search_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_08925b81_render,
-  srcvue_type_template_id_08925b81_staticRenderFns,
+  srcvue_type_template_id_36222536_render,
+  srcvue_type_template_id_36222536_staticRenderFns,
   false,
   null,
   null,
@@ -5561,8 +5762,8 @@ table_search_src.install = function (Vue) {
   Vue.component(table_search_src.name, table_search_src);
 };
 /* harmony default export */ var table_search = (table_search_src);
-// 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(
@@ -5604,11 +5805,11 @@ var srcvue_type_template_id_2cd18efc_render = function render() {
     1
   )
 }
-var srcvue_type_template_id_2cd18efc_staticRenderFns = []
-srcvue_type_template_id_2cd18efc_render._withStripped = true
+var srcvue_type_template_id_aabdd8e6_staticRenderFns = []
+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/popover"
 var popover_ = __webpack_require__(52);
@@ -6246,10 +6447,10 @@ var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(extern
     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";
       spliceTreeSelf(this.data, findTreeIndex(this.data, function (item) {
-        return item[_this4.rowKey] === row[_this4.rowKey];
+        return item[id || refId] === row[id || refId];
       }), 1);
     }
   }
@@ -6266,8 +6467,8 @@ var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(extern
 
 var table_editable_src_component = normalizeComponent(
   components_table_editable_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_2cd18efc_render,
-  srcvue_type_template_id_2cd18efc_staticRenderFns,
+  srcvue_type_template_id_aabdd8e6_render,
+  srcvue_type_template_id_aabdd8e6_staticRenderFns,
   false,
   null,
   null,
@@ -6581,8 +6782,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=39c4f843&
-var srcvue_type_template_id_39c4f843_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=34fe6a3b&
+var srcvue_type_template_id_34fe6a3b_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", [
@@ -6648,11 +6849,11 @@ var srcvue_type_template_id_39c4f843_render = function render() {
     ),
   ])
 }
-var srcvue_type_template_id_39c4f843_staticRenderFns = []
-srcvue_type_template_id_39c4f843_render._withStripped = true
+var srcvue_type_template_id_34fe6a3b_staticRenderFns = []
+srcvue_type_template_id_34fe6a3b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=39c4f843&
+// CONCATENATED MODULE: ./src/components/crud/src/index.vue?vue&type=template&id=34fe6a3b&
 
 // 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&
 
@@ -6831,6 +7032,9 @@ srcvue_type_template_id_39c4f843_render._withStripped = true
     handleCreate: function handleCreate() {
       this.$refs.createFormDialog.open();
     },
+    resetTable: function resetTable() {
+      this.$refs.table.resetTable();
+    },
     reloadTable: function reloadTable() {
       this.$refs.table.reloadTable();
     },
@@ -6959,8 +7163,8 @@ srcvue_type_template_id_39c4f843_render._withStripped = true
 
 var crud_src_component = normalizeComponent(
   components_crud_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_39c4f843_render,
-  srcvue_type_template_id_39c4f843_staticRenderFns,
+  srcvue_type_template_id_34fe6a3b_render,
+  srcvue_type_template_id_34fe6a3b_staticRenderFns,
   false,
   null,
   null,
@@ -10119,6 +10323,7 @@ drawer_src.install = function (Vue) {
 
 
 
+
 var components = [components_form, components_form_input, components_form_item, form_group, form_dialog, form_drawer, form_view, form_view_group, form_view_dialog, components_table, components_table_column, table_search, table_editable, table_operate, crud, formula, dialog, drawer];
 var install = function install(Vue, opts) {
   if (opts === void 0) {