@panpanzhao/component-ui 0.0.9 → 0.0.12

package/lib/component-ui.common.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 57);
+/******/ 	return __webpack_require__(__webpack_require__.s = 58);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -167,312 +167,334 @@ module.exports = require("@panpanzhao/component-ui/lib/components/table-column")
 /* 13 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/radio");
+module.exports = require("@panpanzhao/component-ui/lib/components/table-search");
 
 /***/ }),
 /* 14 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/table");
+module.exports = require("element-ui/lib/radio");
 
 /***/ }),
 /* 15 */
 /***/ (function(module, exports) {
 
-module.exports = require("codemirror");
+module.exports = require("element-ui/lib/table");
 
 /***/ }),
 /* 16 */
 /***/ (function(module, exports) {
 
-module.exports = require("dayjs");
+module.exports = require("element-ui/lib/message-box");
 
 /***/ }),
 /* 17 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/link");
+module.exports = require("element-ui/src/utils/popup");
 
 /***/ }),
 /* 18 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/form");
+module.exports = require("element-ui/src/mixins/emitter");
 
 /***/ }),
 /* 19 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/row");
+module.exports = require("codemirror");
 
 /***/ }),
 /* 20 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/col");
+module.exports = require("@panpanzhao/component-ui/lib/components/drawer");
 
 /***/ }),
 /* 21 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
+module.exports = require("dayjs");
 
 /***/ }),
 /* 22 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/input-number");
+module.exports = require("element-ui/lib/link");
 
 /***/ }),
 /* 23 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/select");
+module.exports = require("element-ui/lib/form");
 
 /***/ }),
 /* 24 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/option");
+module.exports = require("element-ui/lib/row");
 
 /***/ }),
 /* 25 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/option-group");
+module.exports = require("element-ui/lib/col");
 
 /***/ }),
 /* 26 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/radio-group");
+module.exports = require("@panpanzhao/component-ui/lib/components/form-item");
 
 /***/ }),
 /* 27 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/radio-button");
+module.exports = require("element-ui/lib/input-number");
 
 /***/ }),
 /* 28 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/checkbox-group");
+module.exports = require("element-ui/lib/select");
 
 /***/ }),
 /* 29 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/checkbox");
+module.exports = require("element-ui/lib/option");
 
 /***/ }),
 /* 30 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/checkbox-button");
+module.exports = require("element-ui/lib/option-group");
 
 /***/ }),
 /* 31 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/switch");
+module.exports = require("element-ui/lib/radio-group");
 
 /***/ }),
 /* 32 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/cascader");
+module.exports = require("element-ui/lib/radio-button");
 
 /***/ }),
 /* 33 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/slider");
+module.exports = require("element-ui/lib/checkbox-group");
 
 /***/ }),
 /* 34 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/transfer");
+module.exports = require("element-ui/lib/checkbox");
 
 /***/ }),
 /* 35 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/time-picker");
+module.exports = require("element-ui/lib/checkbox-button");
 
 /***/ }),
 /* 36 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/date-picker");
+module.exports = require("element-ui/lib/cascader");
 
 /***/ }),
 /* 37 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/upload");
+module.exports = require("element-ui/lib/switch");
 
 /***/ }),
 /* 38 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/form-item");
+module.exports = require("element-ui/lib/slider");
 
 /***/ }),
 /* 39 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/descriptions");
+module.exports = require("element-ui/lib/transfer");
 
 /***/ }),
 /* 40 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/descriptions-item");
+module.exports = require("element-ui/lib/time-picker");
 
 /***/ }),
 /* 41 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/pagination");
+module.exports = require("element-ui/lib/date-picker");
 
 /***/ }),
 /* 42 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/dropdown");
+module.exports = require("element-ui/lib/upload");
 
 /***/ }),
 /* 43 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/dropdown-item");
+module.exports = require("element-ui/lib/form-item");
 
 /***/ }),
 /* 44 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/dropdown-menu");
+module.exports = require("element-ui/lib/descriptions");
 
 /***/ }),
 /* 45 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/components/form");
+module.exports = require("element-ui/lib/descriptions-item");
 
 /***/ }),
 /* 46 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/components/table");
+module.exports = require("element-ui/lib/pagination");
 
 /***/ }),
 /* 47 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/popover");
+module.exports = require("element-ui/lib/dropdown");
 
 /***/ }),
 /* 48 */
 /***/ (function(module, exports) {
 
-module.exports = require("async-validator");
+module.exports = require("element-ui/lib/dropdown-item");
 
 /***/ }),
 /* 49 */
 /***/ (function(module, exports) {
 
-module.exports = require("@panpanzhao/component-ui/lib/components/table-search");
+module.exports = require("element-ui/lib/dropdown-menu");
 
 /***/ }),
 /* 50 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/message-box");
+module.exports = require("@panpanzhao/component-ui/lib/components/form");
 
 /***/ }),
 /* 51 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/tree");
+module.exports = require("@panpanzhao/component-ui/lib/components/table");
 
 /***/ }),
 /* 52 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/badge");
+module.exports = require("element-ui/lib/popover");
 
 /***/ }),
 /* 53 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/lib/message");
+module.exports = require("async-validator");
 
 /***/ }),
 /* 54 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/src/utils/popup");
+module.exports = require("element-ui/lib/tree");
 
 /***/ }),
 /* 55 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/src/mixins/migrating");
+module.exports = require("element-ui/lib/badge");
 
 /***/ }),
 /* 56 */
 /***/ (function(module, exports) {
 
-module.exports = require("element-ui/src/mixins/emitter");
+module.exports = require("element-ui/lib/message");
 
 /***/ }),
 /* 57 */
+/***/ (function(module, exports) {
+
+module.exports = require("element-ui/src/mixins/migrating");
+
+/***/ }),
+/* 58 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(62);
+module.exports = __webpack_require__(63);
 
 
 /***/ }),
-/* 58 */
+/* 59 */
 /***/ (function(module, exports) {
 
 module.exports = require("codemirror/mode/javascript/javascript");
 
 /***/ }),
-/* 59 */
+/* 60 */
 /***/ (function(module, exports) {
 
 module.exports = require("codemirror/mode/htmlmixed/htmlmixed");
 
 /***/ }),
-/* 60 */
+/* 61 */
 /***/ (function(module, exports) {
 
 module.exports = require("codemirror/addon/mode/simple");
 
 /***/ }),
-/* 61 */
+/* 62 */
 /***/ (function(module, exports) {
 
 module.exports = require("codemirror/addon/mode/multiplex");
 
 /***/ }),
-/* 62 */
+/* 63 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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=42f43bc0&
-var formvue_type_template_id_42f43bc0_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(
     "div",
-    { staticClass: "form" },
+    { class: ["form", { "is-full": _vm.isFull }] },
     [
       _vm._t("default", function () {
         return [
@@ -491,7 +513,10 @@ var formvue_type_template_id_42f43bc0_render = function render() {
                     return [
                       _c(
                         "el-col",
-                        { key: item.prop, attrs: { span: item.span } },
+                        {
+                          key: item.prop,
+                          attrs: { span: item.span || _vm.span },
+                        },
                         [
                           _c(
                             "form-item",
@@ -531,36 +556,40 @@ var formvue_type_template_id_42f43bc0_render = function render() {
   )
 }
 var staticRenderFns = []
-formvue_type_template_id_42f43bc0_render._withStripped = true
+formvue_type_template_id_dfeb985e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=42f43bc0&
+// CONCATENATED MODULE: ./src/components/form/src/form.vue?vue&type=template&id=dfeb985e&
 
 // EXTERNAL MODULE: external "element-ui/lib/form"
-var form_ = __webpack_require__(18);
+var form_ = __webpack_require__(23);
 var form_default = /*#__PURE__*/__webpack_require__.n(form_);
 
 // EXTERNAL MODULE: external "element-ui/lib/row"
-var row_ = __webpack_require__(19);
+var row_ = __webpack_require__(24);
 var row_default = /*#__PURE__*/__webpack_require__.n(row_);
 
 // EXTERNAL MODULE: external "element-ui/lib/col"
-var col_ = __webpack_require__(20);
+var col_ = __webpack_require__(25);
 var col_default = /*#__PURE__*/__webpack_require__.n(col_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-item"
-var form_item_ = __webpack_require__(21);
+var form_item_ = __webpack_require__(26);
 var form_item_default = /*#__PURE__*/__webpack_require__.n(form_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/utils/formula"
 var formula_ = __webpack_require__(2);
 
+// EXTERNAL MODULE: external "lodash"
+var external_lodash_ = __webpack_require__(1);
+
 // 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&
 
 
 
 
 
+
 /* harmony default export */ var formvue_type_script_lang_js_ = ({
   name: "Form",
   componentName: "Form",
@@ -576,7 +605,12 @@ var formula_ = __webpack_require__(2);
     };
   },
   props: {
+    isFull: {
+      type: Boolean,
+      default: true
+    },
     prop: String,
+    span: Number,
     formItems: {
       type: Array,
       default: function _default() {
@@ -623,11 +657,14 @@ var formula_ = __webpack_require__(2);
         }
         if (typeof item.show === "function" && !item.show.call(_this, {
           form: _this,
+          formModel: _this.formModel,
           config: item
         })) {
           return false;
         }
-        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel)) {
+        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel, {
+          evalMode: true
+        })) {
           return false;
         }
         return true;
@@ -647,6 +684,7 @@ var formula_ = __webpack_require__(2);
   data: function data() {
     return {
       defaultModel: {},
+      //默认值存储
       formItemLayout: {}
     };
   },
@@ -654,9 +692,34 @@ var formula_ = __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;
-      //初始化数据值
-      _this2.$set(_this2.formModel, item.prop, item.value || null);
+      //初始化值处理
+      var formVal = Object(external_lodash_["get"])(_this2.formModel, item.prop);
+      if (typeof formVal === 'undefined') {
+        //初始化数据值
+        if (item.prop && item.prop.indexOf(".") != -1) {
+          //循环设置值
+          var keyArr = item.prop.split('.');
+          var tempObj = _this2.formModel;
+          keyArr.forEach(function (key, index) {
+            if (index < keyArr.length - 1) {
+              if (typeof tempObj[key] === 'undefined') {
+                _this2.$set(tempObj, key, {});
+              }
+              tempObj = tempObj[key];
+            } else {
+              _this2.$set(tempObj, key, item.value || null);
+            }
+          });
+        } else {
+          _this2.$set(_this2.formModel, item.prop, item.value || null);
+        }
+      } else {
+        item.value = formVal;
+      }
     });
   },
   methods: {
@@ -666,6 +729,9 @@ var formula_ = __webpack_require__(2);
     validateField: function validateField(props, callback) {
       return this.$refs.form.validateField(props, callback);
     },
+    reset: function reset() {
+      this.resetFields();
+    },
     resetFields: function resetFields() {
       for (var key in this.defaultModel) {
         if (this.formItemLayout[key]) {
@@ -799,7 +865,7 @@ function normalizeComponent(
 
 var component = normalizeComponent(
   src_formvue_type_script_lang_js_,
-  formvue_type_template_id_42f43bc0_render,
+  formvue_type_template_id_dfeb985e_render,
   staticRenderFns,
   false,
   null,
@@ -976,7 +1042,7 @@ InputNumbervue_type_template_id_7a2f5f6e_render._withStripped = true
 // CONCATENATED MODULE: ./src/components/form/src/item/InputNumber.vue?vue&type=template&id=7a2f5f6e&
 
 // EXTERNAL MODULE: external "element-ui/lib/input-number"
-var input_number_ = __webpack_require__(22);
+var input_number_ = __webpack_require__(27);
 var input_number_default = /*#__PURE__*/__webpack_require__.n(input_number_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/InputNumber.vue?vue&type=script&lang=js&
@@ -1016,19 +1082,19 @@ var InputNumber_component = normalizeComponent(
 
 /* harmony default export */ var InputNumber = (InputNumber_component.exports);
 // EXTERNAL MODULE: external "element-ui/lib/select"
-var select_ = __webpack_require__(23);
+var select_ = __webpack_require__(28);
 var select_default = /*#__PURE__*/__webpack_require__.n(select_);
 
 // EXTERNAL MODULE: external "element-ui/lib/option"
-var option_ = __webpack_require__(24);
+var option_ = __webpack_require__(29);
 var option_default = /*#__PURE__*/__webpack_require__.n(option_);
 
 // EXTERNAL MODULE: external "element-ui/lib/option-group"
-var option_group_ = __webpack_require__(25);
+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(
@@ -1098,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_ = ({
@@ -1159,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;
@@ -1271,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) {
@@ -1297,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();
@@ -1338,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,
@@ -1348,9 +1432,6 @@ var SelectTree_component = normalizeComponent(
 )
 
 /* harmony default export */ var SelectTree = (SelectTree_component.exports);
-// EXTERNAL MODULE: external "lodash"
-var external_lodash_ = __webpack_require__(1);
-
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Select.vue?vue&type=script&lang=js&
 
 
@@ -1370,16 +1451,18 @@ var external_lodash_ = __webpack_require__(1);
   },
   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: {
@@ -1391,11 +1474,7 @@ var external_lodash_ = __webpack_require__(1);
     optionProps: {
       type: Object,
       default: function _default() {
-        return {
-          value: "value",
-          label: "label",
-          children: "children"
-        };
+        return {};
       }
     }
   },
@@ -1408,8 +1487,15 @@ var external_lodash_ = __webpack_require__(1);
     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;
@@ -1422,6 +1508,13 @@ var external_lodash_ = __webpack_require__(1);
       }
       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;
     }
@@ -1441,26 +1534,36 @@ var external_lodash_ = __webpack_require__(1);
   },
   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) {
@@ -1471,19 +1574,22 @@ var external_lodash_ = __webpack_require__(1);
       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]);
         })]);
       });
     },
@@ -1491,7 +1597,7 @@ var external_lodash_ = __webpack_require__(1);
       var param = {
         attrs: Object.assign({}, this.$attrs, {
           options: this.optionData,
-          optionProps: this.optionProps
+          optionProps: this._optionProps
         }),
         slots: this.$slots,
         scopedSlots: this.$slots,
@@ -1504,14 +1610,17 @@ var external_lodash_ = __webpack_require__(1);
       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]);
       });
     }
   },
@@ -1559,15 +1668,15 @@ var Select_component = normalizeComponent(
 
 /* harmony default export */ var Select = (Select_component.exports);
 // EXTERNAL MODULE: external "element-ui/lib/radio-group"
-var radio_group_ = __webpack_require__(26);
+var radio_group_ = __webpack_require__(31);
 var radio_group_default = /*#__PURE__*/__webpack_require__.n(radio_group_);
 
 // EXTERNAL MODULE: external "element-ui/lib/radio"
-var radio_ = __webpack_require__(13);
+var radio_ = __webpack_require__(14);
 var radio_default = /*#__PURE__*/__webpack_require__.n(radio_);
 
 // EXTERNAL MODULE: external "element-ui/lib/radio-button"
-var radio_button_ = __webpack_require__(27);
+var radio_button_ = __webpack_require__(32);
 var radio_button_default = /*#__PURE__*/__webpack_require__.n(radio_button_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Radio.vue?vue&type=script&lang=js&
@@ -1586,6 +1695,7 @@ var radio_button_default = /*#__PURE__*/__webpack_require__.n(radio_button_);
   },
   props: {
     size: String,
+    dictCode: String,
     border: {
       type: Boolean,
       default: function _default() {
@@ -1634,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;
@@ -1754,15 +1870,15 @@ var Radio_component = normalizeComponent(
 
 /* harmony default export */ var Radio = (Radio_component.exports);
 // EXTERNAL MODULE: external "element-ui/lib/checkbox-group"
-var checkbox_group_ = __webpack_require__(28);
+var checkbox_group_ = __webpack_require__(33);
 var checkbox_group_default = /*#__PURE__*/__webpack_require__.n(checkbox_group_);
 
 // EXTERNAL MODULE: external "element-ui/lib/checkbox"
-var checkbox_ = __webpack_require__(29);
+var checkbox_ = __webpack_require__(34);
 var checkbox_default = /*#__PURE__*/__webpack_require__.n(checkbox_);
 
 // EXTERNAL MODULE: external "element-ui/lib/checkbox-button"
-var checkbox_button_ = __webpack_require__(30);
+var checkbox_button_ = __webpack_require__(35);
 var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/src/item/Checkbox.vue?vue&type=script&lang=js&
@@ -1781,6 +1897,7 @@ var checkbox_button_default = /*#__PURE__*/__webpack_require__.n(checkbox_button
   },
   props: {
     size: String,
+    dictCode: String,
     border: {
       type: Boolean,
       default: function _default() {
@@ -1809,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 {};
       }
     }
   },
@@ -1829,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;
@@ -1843,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;
     }
@@ -1884,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) {
@@ -1899,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]]);
       });
     }
   },
@@ -2003,32 +2129,99 @@ var InputText_component = normalizeComponent(
 )
 
 /* harmony default export */ var InputText = (InputText_component.exports);
-// EXTERNAL MODULE: external "element-ui/lib/switch"
-var switch_ = __webpack_require__(31);
-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__(32);
+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__(33);
+var slider_ = __webpack_require__(38);
 var slider_default = /*#__PURE__*/__webpack_require__.n(slider_);
 
 // EXTERNAL MODULE: external "element-ui/lib/transfer"
-var transfer_ = __webpack_require__(34);
+var transfer_ = __webpack_require__(39);
 var transfer_default = /*#__PURE__*/__webpack_require__.n(transfer_);
 
 // EXTERNAL MODULE: external "element-ui/lib/time-picker"
-var time_picker_ = __webpack_require__(35);
+var time_picker_ = __webpack_require__(40);
 var time_picker_default = /*#__PURE__*/__webpack_require__.n(time_picker_);
 
 // EXTERNAL MODULE: external "element-ui/lib/date-picker"
-var date_picker_ = __webpack_require__(36);
+var date_picker_ = __webpack_require__(41);
 var date_picker_default = /*#__PURE__*/__webpack_require__.n(date_picker_);
 
 // EXTERNAL MODULE: external "element-ui/lib/upload"
-var upload_ = __webpack_require__(37);
+var upload_ = __webpack_require__(42);
 var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
 
 // CONCATENATED MODULE: ./src/components/form/src/form-input.js
@@ -2042,6 +2235,8 @@ var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
 
 
 
+// import elCascader from "element-ui/packages/cascader";
+
 
 
 
@@ -2050,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,
@@ -2060,6 +2255,7 @@ var upload_default = /*#__PURE__*/__webpack_require__.n(upload_);
     Input: Input,
     InputNumber: InputNumber,
     Select: Select,
+    SelectTree: SelectTree,
     Radio: Radio,
     Checkbox: Checkbox,
     InputText: InputText
@@ -2109,7 +2305,7 @@ form_input.install = function (Vue) {
 };
 /* harmony default export */ var components_form_input = (form_input);
 // EXTERNAL MODULE: external "element-ui/lib/form-item"
-var lib_form_item_ = __webpack_require__(38);
+var lib_form_item_ = __webpack_require__(43);
 var lib_form_item_default = /*#__PURE__*/__webpack_require__.n(lib_form_item_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/form-input"
@@ -2120,6 +2316,7 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
 
 
 
+
 /* harmony default export */ var form_item = ({
   name: "FormItem",
   components: {
@@ -2132,6 +2329,10 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
     prop: String,
     value: [String, Number, Boolean, Object, Array, Date],
     label: String,
+    labelWidth: String,
+    showMessage: Boolean,
+    inlineMessage: Boolean,
+    size: String,
     rules: [Object, Array],
     actions: Array,
     on: Object,
@@ -2141,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,
@@ -2201,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));
       }
       //联动配置事件
@@ -2224,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) {
@@ -2231,23 +2447,31 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
     if (typeof this.render === "function") {
       return this.render(h, {
         form: this.form,
+        formModel: this.form.formModel,
+        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) {
-            _this2.form.formModel[_this2.prop] = val;
-          }
         },
         change: function change(val, selectOption) {
+          _this2.setValue(val);
           _this2.execEvent("change", val, selectOption);
-          if (_this2.form) {
-            _this2.form.formModel[_this2.prop] = val;
-          }
         }
       })
     };
@@ -2255,7 +2479,9 @@ var form_input_default = /*#__PURE__*/__webpack_require__.n(form_input_);
       "attrs": {
         "label": this.label,
         "prop": this.prop,
-        "rules": this.rules
+        "rules": this.rules,
+        "labelWidth": this.labelWidth,
+        "size": this.size
       }
     }, [h("form-input", babel_helper_vue_jsx_merge_props_default()([{}, itemProp]))]);
   }
@@ -2270,7 +2496,7 @@ form_item.install = function (Vue) {
 // CONCATENATED MODULE: ./src/components/form-group/src/content.js
 
 
-/* harmony default export */ var content = ({
+/* harmony default export */ var src_content = ({
   name: "Content",
   inheritAttrs: false,
   components: {
@@ -2328,7 +2554,7 @@ form_item.install = function (Vue) {
     }
   },
   render: function render(h) {
-    if (this.slots.form) {
+    if (this.slots && this.slots.form) {
       var vForm = typeof this.slots.form === "function" ? this.slots.form.call(this, h) : this.slots.form;
       return vForm;
     }
@@ -2516,7 +2742,7 @@ var collapse_item_default = /*#__PURE__*/__webpack_require__.n(collapse_item_);
         }, form),
         on: form.on
       };
-      return h(content, babel_helper_vue_jsx_merge_props_default()([{
+      return h(src_content, babel_helper_vue_jsx_merge_props_default()([{
         "ref": form.prop,
         "key": form.prop,
         "attrs": {
@@ -2695,6 +2921,7 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
     }
   },
   props: {
+    request: Function,
     dialog: {
       type: Object,
       default: function _default() {
@@ -2707,6 +2934,10 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
       }
     },
     formMode: String,
+    noApiClose: {
+      type: Boolean,
+      default: true
+    },
     api: {
       type: Object,
       default: function _default() {
@@ -2737,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,
@@ -2755,13 +2987,20 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
     };
   },
   computed: {
-    request: function request() {
-      return this.api.request || (this.$COMPONENT || {}).request;
+    requester: function requester() {
+      return this.api.request || this.request || (this.$COMPONENT || {}).request;
     }
   },
   methods: {
-    open: function open() {
+    open: function open(model, expandModel) {
+      var _this2 = this;
       this.show = true;
+      this.expandModel = expandModel;
+      if (model) {
+        this.$nextTick(function () {
+          _this2.setFormModel(model);
+        });
+      }
     },
     close: function close() {
       this.show = false;
@@ -2769,35 +3008,69 @@ var button_default = /*#__PURE__*/__webpack_require__.n(button_);
     setFormModel: function setFormModel(model) {
       Object(external_lodash_["merge"])(this.formModel, model);
     },
+    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;
-      if (!(this.api && this.request)) {
-        return false;
-      }
+      var _this3 = this;
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
+        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 (!(_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;
-        var reqData = Object.assign(_this2.api.data, _this2.formModel);
-        _this2.request({
-          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.$emit("success", res);
+          _this3.reset();
+          _this3.show = false;
+          _this3.$emit("success", {
+            request: _this3.requester,
+            reqData: reqData,
+            resData: res,
+            expandData: _this3.expandModel
+          });
         }).catch(function (error) {
           button.loading = false;
-          _this2.$emit("error", error);
+          _this3.$emit("error", {
+            request: _this3.requester,
+            reqData: reqData,
+            resError: error,
+            expandData: _this3.expandModel
+          });
         });
       });
     },
     renderForm: function renderForm(h) {
       var param = {
         attrs: Object.assign({
-          formModel: this.formModel
+          formModel: this.formModel,
+          request: this.request
         }, this.form)
       };
       if (this.formMode === "group") {
@@ -2829,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,
@@ -2838,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;
         }
       })
     };
@@ -2879,8 +3153,283 @@ form_dialog_src.install = function (Vue) {
   Vue.component(form_dialog_src.name, form_dialog_src);
 };
 /* harmony default export */ var form_dialog = (form_dialog_src);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-view/src/index.vue?vue&type=template&id=1df6f53d&
-var srcvue_type_template_id_1df6f53d_render = function render() {
+// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/drawer"
+var drawer_ = __webpack_require__(20);
+var drawer_default = /*#__PURE__*/__webpack_require__.n(drawer_);
+
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-drawer/src/index.vue?vue&type=script&lang=js&
+
+
+
+
+
+
+
+
+
+
+
+/* harmony default export */ var form_drawer_srcvue_type_script_lang_js_ = ({
+  name: "FormDrawer",
+  componentName: "FormDrawer",
+  components: {
+    Form: components_form,
+    FormGroup: form_group,
+    Drawer: drawer_default.a,
+    Tool: {
+      components: {
+        elButton: button_default.a
+      },
+      props: {
+        label: String,
+        show: {
+          type: [Boolean, Function],
+          default: true
+        },
+        on: {
+          type: Object,
+          default: function _default() {
+            return {};
+          }
+        },
+        render: Function
+      },
+      computed: {
+        attrs: function attrs() {
+          return Object.assign({
+            size: "mini"
+          }, this.$attrs);
+        }
+      },
+      data: function data() {
+        return {
+          loading: this.$attrs.loading
+        };
+      },
+      render: function render(h) {
+        var _this = this;
+        if (this.show === false) {
+          return null;
+        }
+        if (typeof this.render === "function") {
+          return this.render(h, this);
+        }
+        var param = {
+          attrs: this.attrs,
+          on: {
+            click: function click(event) {
+              if (typeof _this.$listeners.click === "function") {
+                _this.$listeners.click.call(event, _this);
+              }
+            }
+          }
+        };
+        return h("el-button", babel_helper_vue_jsx_merge_props_default()([{}, param, {
+          "attrs": {
+            "loading": this.loading
+          }
+        }]), [this.label]);
+      }
+    }
+  },
+  props: {
+    drawer: {
+      type: Object,
+      default: function _default() {
+        return {
+          confirmButtonText: "确认",
+          confirmButtonType: "Primary",
+          cancelButtonText: "取消",
+          cancelButtonType: "Primary"
+        };
+      }
+    },
+    formMode: String,
+    api: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    form: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    tools: Array,
+    on: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    slots: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    }
+  },
+  data: function data() {
+    return {
+      show: false,
+      formModel: {},
+      defaultTools: [{
+        label: this.drawer.cancelButtonText || "取消",
+        type: this.confirmButtonType,
+        loading: false,
+        on: {
+          click: this.close
+        }
+      }, {
+        label: this.drawer.confirmButtonText || "确认",
+        type: this.confirmButtonType || "primary",
+        loading: false,
+        on: {
+          click: this.submit
+        }
+      }]
+    };
+  },
+  computed: {
+    request: function request() {
+      return this.api.request || (this.$COMPONENT || {}).request;
+    }
+  },
+  methods: {
+    open: function open(model) {
+      this.show = true;
+      if (model) {
+        this.setFormModel(model);
+      }
+    },
+    close: function close() {
+      this.show = false;
+      this.$emit("close");
+    },
+    setFormModel: function setFormModel(model) {
+      Object(external_lodash_["merge"])(this.formModel, model);
+    },
+    reset: function reset() {
+      this.$refs.form && this.$refs.form.reset();
+    },
+    submit: function submit(button) {
+      var _this2 = this;
+      this.$refs.form.validate(function (isValidate, errorMessage) {
+        if (!isValidate) {
+          return false;
+        }
+        var reqData = Object(external_lodash_["merge"])(_this2.api.data || {}, _this2.formModel);
+        if (!(_this2.api.url && _this2.request)) {
+          _this2.$emit("success", null, reqData);
+          _this2.reset();
+          _this2.close();
+          return false;
+        }
+        button.loading = true;
+        _this2.request({
+          url: Object(formula_["evaluate"])(_this2.api.url, reqData),
+          method: _this2.api.method || "POST",
+          data: reqData
+        }).then(function (res) {
+          button.loading = false;
+          _this2.$emit("success", res, reqData);
+          _this2.reset();
+          _this2.close();
+        }).catch(function (error) {
+          button.loading = false;
+          _this2.$emit("error", error, reqData);
+        });
+      });
+    },
+    renderForm: function renderForm(h) {
+      var param = {
+        attrs: Object.assign({
+          formModel: this.formModel
+        }, this.form)
+      };
+      if (this.formMode === "group") {
+        return h(form_group, babel_helper_vue_jsx_merge_props_default()([{
+          "ref": "form"
+        }, param]));
+      }
+      return h(components_form, babel_helper_vue_jsx_merge_props_default()([{
+        "ref": "form"
+      }, param]));
+    },
+    renderTitle: function renderTitle(h) {
+      if (typeof this.slots.title === "function") {
+        return this.slots.title.call(this, this.formModel);
+      }
+      return this.slots.title || this.drawer.title;
+    },
+    renderTools: function renderTools(h) {
+      if (typeof this.slots.footer === "function") {
+        return this.slots.footer.call(this, this.formModel);
+      }
+      return h("div", [(this.tools || this.defaultTools).map(function (item) {
+        var toolParam = {
+          attrs: Object.assign({}, item),
+          on: item.on
+        };
+        return h("Tool", babel_helper_vue_jsx_merge_props_default()([{}, toolParam]));
+      })]);
+    }
+  },
+  render: function render(h) {
+    var _this3 = this;
+    var param = {
+      attrs: Object.assign({
+        visible: this.show,
+        closeOnClickModal: false,
+        "customClass": "form-drawer"
+      }, this.drawer),
+      on: Object.assign(this.on, {
+        close: function close() {
+          _this3.close();
+        }
+      })
+    };
+    return h(drawer_default.a, babel_helper_vue_jsx_merge_props_default()([{}, param]), [h("template", {
+      "slot": "title",
+      "class": "drawer-title"
+    }, [h("span", [this.renderTitle(h)])]), h("template", {
+      "slot": "footer",
+      "class": "drawer-footer"
+    }, [this.renderTools(h)]), this.renderForm(h)]);
+  }
+});
+// CONCATENATED MODULE: ./src/components/form-drawer/src/index.vue?vue&type=script&lang=js&
+ /* harmony default export */ var components_form_drawer_srcvue_type_script_lang_js_ = (form_drawer_srcvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/form-drawer/src/index.vue
+var form_drawer_src_render, form_drawer_src_staticRenderFns
+
+
+
+
+/* normalize component */
+
+var form_drawer_src_component = normalizeComponent(
+  components_form_drawer_srcvue_type_script_lang_js_,
+  form_drawer_src_render,
+  form_drawer_src_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var form_drawer_src = (form_drawer_src_component.exports);
+// CONCATENATED MODULE: ./src/components/form-drawer/index.js
+
+form_drawer_src.install = function (Vue) {
+  Vue.component(form_drawer_src.name, form_drawer_src);
+};
+/* harmony default export */ var form_drawer = (form_drawer_src);
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
+var srcvue_type_template_id_720bd4fc_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c(
@@ -2922,18 +3471,18 @@ var srcvue_type_template_id_1df6f53d_render = function render() {
     2
   )
 }
-var srcvue_type_template_id_1df6f53d_staticRenderFns = []
-srcvue_type_template_id_1df6f53d_render._withStripped = true
+var srcvue_type_template_id_720bd4fc_staticRenderFns = []
+srcvue_type_template_id_720bd4fc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=1df6f53d&
+// CONCATENATED MODULE: ./src/components/form-view/src/index.vue?vue&type=template&id=720bd4fc&
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions"
-var descriptions_ = __webpack_require__(39);
+var descriptions_ = __webpack_require__(44);
 var descriptions_default = /*#__PURE__*/__webpack_require__.n(descriptions_);
 
 // EXTERNAL MODULE: external "element-ui/lib/descriptions-item"
-var descriptions_item_ = __webpack_require__(40);
+var descriptions_item_ = __webpack_require__(45);
 var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_item_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form-view/src/index.vue?vue&type=script&lang=js&
@@ -2991,7 +3540,9 @@ var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_
         })) {
           return false;
         }
-        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel)) {
+        if (typeof item.show === "string" && !Object(formula_["evaluate"])(item.show, _this.formModel, {
+          evalMode: true
+        })) {
           return false;
         }
         return true;
@@ -3029,8 +3580,8 @@ var descriptions_item_default = /*#__PURE__*/__webpack_require__.n(descriptions_
 
 var form_view_src_component = normalizeComponent(
   components_form_view_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_1df6f53d_render,
-  srcvue_type_template_id_1df6f53d_staticRenderFns,
+  srcvue_type_template_id_720bd4fc_render,
+  srcvue_type_template_id_720bd4fc_staticRenderFns,
   false,
   null,
   null,
@@ -3048,7 +3599,7 @@ form_view_src.install = function (Vue) {
 // CONCATENATED MODULE: ./src/components/form-view-group/src/content.js
 
 
-/* harmony default export */ var src_content = ({
+/* harmony default export */ var form_view_group_src_content = ({
   name: "Content",
   inheritAttrs: false,
   components: {
@@ -3166,7 +3717,7 @@ form_view_src.install = function (Vue) {
         attrs: Object.assign({}, form),
         on: form.on
       };
-      return h(src_content, babel_helper_vue_jsx_merge_props_default()([{
+      return h(form_view_group_src_content, babel_helper_vue_jsx_merge_props_default()([{
         "ref": form.prop,
         "key": form.prop,
         "attrs": {
@@ -3272,7 +3823,6 @@ form_view_group_src.install = function (Vue) {
 
 
 
-
 /* harmony default export */ var form_view_dialog_srcvue_type_script_lang_js_ = ({
   name: "FormViewDialog",
   componentName: "FormViewDialog",
@@ -3486,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=f8ac923e&
-var tablevue_type_template_id_f8ac923e_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" }, [
@@ -3565,14 +4115,14 @@ var tablevue_type_template_id_f8ac923e_render = function render() {
       : _vm._e(),
   ])
 }
-var tablevue_type_template_id_f8ac923e_staticRenderFns = []
-tablevue_type_template_id_f8ac923e_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=f8ac923e&
+// CONCATENATED MODULE: ./src/components/table/src/table.vue?vue&type=template&id=a8e62da6&
 
 // EXTERNAL MODULE: external "element-ui/lib/table"
-var table_ = __webpack_require__(14);
+var table_ = __webpack_require__(15);
 var table_default = /*#__PURE__*/__webpack_require__.n(table_);
 
 // EXTERNAL MODULE: external "element-ui/lib/table-column"
@@ -3580,7 +4130,7 @@ var table_column_ = __webpack_require__(3);
 var table_column_default = /*#__PURE__*/__webpack_require__.n(table_column_);
 
 // EXTERNAL MODULE: external "element-ui/lib/pagination"
-var pagination_ = __webpack_require__(41);
+var pagination_ = __webpack_require__(46);
 var pagination_default = /*#__PURE__*/__webpack_require__.n(pagination_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-column"
@@ -3666,22 +4216,27 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
     };
   },
   props: {
+    request: Function,
     data: {
       type: Array,
       default: function _default() {
         return null;
       }
     },
-    api: Object,
+    api: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    hasInit: {
+      type: Boolean,
+      default: true
+    },
     remoteProp: {
       type: Object,
       default: function _default() {
-        return {
-          data: "list",
-          currentPage: "page",
-          pageSize: "pageSize",
-          total: "total"
-        };
+        return {};
       }
     },
     dataSource: Object,
@@ -3691,7 +4246,6 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
         return [];
       }
     },
-    beforeSearch: Function,
     pagination: {
       type: [Boolean, Object],
       default: function _default() {
@@ -3734,6 +4288,17 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
     }
   },
   computed: {
+    requester: function requester() {
+      return this.api.request || this.request || (this.$COMPONENT || {}).request;
+    },
+    remoteDataProp: function remoteDataProp() {
+      return Object.assign({
+        data: "list",
+        currentPage: "page",
+        pageSize: "pageSize",
+        total: "total"
+      }, this.remoteProp);
+    },
     tableSource: function tableSource() {
       return this.data || this.remoteData || [];
     },
@@ -3767,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);
+          }
         }
       });
     },
@@ -3806,40 +4377,60 @@ var components_table_column_default = /*#__PURE__*/__webpack_require__.n(compone
     }
   },
   mounted: function mounted() {
-    //this.reset()
+    if (this.hasInit) {
+      this.reset();
+    }
   },
   methods: {
     reset: function reset() {
       this.currentPage = 1;
       this.search();
     },
+    reload: function reload() {
+      this.search();
+    },
     search: function search() {
       var _this4 = this;
-      if (!(this.api && this.api.url && this.api.request)) {
+      if (!(this.requester && this.api.url)) {
         return false;
       }
-      var requestData = Object.assign({}, this.api.data);
+      var reqData = Object.assign({}, this.api.data);
       if (this.pagination) {
-        Object(external_lodash_["set"])(requestData, this.remoteProp.currentPage, this.currentPage);
-        Object(external_lodash_["set"])(requestData, this.remoteProp.pageSize, this.pageSize);
+        Object(external_lodash_["set"])(reqData, this.remoteDataProp.currentPage, this.currentPage);
+        Object(external_lodash_["set"])(reqData, this.remoteDataProp.pageSize, this.pageSize);
       }
-      if (typeof this.beforeSearch === "function") {
-        requestData = this.beforeSearch.call(this, requestData);
+      if (typeof this.api.before === "function") {
+        reqData = this.api.before.call(this, reqData);
       }
-      this.$emit("loadingChange", true);
-      this.api.request({
-        url: Object(formula_["evaluate"])(this.api.url, requestData),
+      this.$emit("request", {
+        request: this.requester,
+        reqData: reqData
+      });
+      this.requester({
+        url: Object(formula_["evaluate"])(this.api.url, reqData),
         method: this.api.method || "POST",
-        data: requestData
+        headers: this.api.headers,
+        data: reqData
       }).then(function (res) {
-        _this4.$emit("loadingChange", false);
-        _this4.remoteData = Object(external_lodash_["get"])(res, _this4.remoteProp.data, []);
+        if (typeof _this4.api.after === "function") {
+          res = _this4.api.after.call(_this4, res);
+        }
+        _this4.remoteData = _this4.remoteDataProp.data ? Object(external_lodash_["get"])(res, _this4.remoteDataProp.data, []) : res;
         if (_this4.pagination) {
-          _this4.total = Object(external_lodash_["get"])(res, _this4.remoteProp.total, []);
+          _this4.total = Object(external_lodash_["get"])(res, _this4.remoteDataProp.total, 0);
         }
+        _this4.$emit("success", {
+          request: _this4.requester,
+          reqData: reqData,
+          resData: res
+        });
       }).catch(function (error) {
-        _this4.$emit("loadingChange", false);
         _this4.remoteData = [], _this4.total = 0;
+        _this4.$emit("error", {
+          request: _this4.requester,
+          reqData: reqData,
+          resError: error
+        });
       });
     }
   }
@@ -3856,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_f8ac923e_render,
-  tablevue_type_template_id_f8ac923e_staticRenderFns,
+  tablevue_type_template_id_a8e62da6_render,
+  tablevue_type_template_id_a8e62da6_staticRenderFns,
   false,
   null,
   null,
@@ -4121,7 +4712,7 @@ datevue_type_template_id_3d682315_render._withStripped = true
 // CONCATENATED MODULE: ./src/components/table/src/column/date.vue?vue&type=template&id=3d682315&
 
 // EXTERNAL MODULE: external "dayjs"
-var external_dayjs_ = __webpack_require__(16);
+var external_dayjs_ = __webpack_require__(21);
 var external_dayjs_default = /*#__PURE__*/__webpack_require__.n(external_dayjs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table/src/column/date.vue?vue&type=script&lang=js&
@@ -4183,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(
@@ -4222,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&
 
@@ -4236,6 +4827,7 @@ dictvue_type_template_id_1da75cb2_render._withStripped = true
     elTableColumn: table_column_default.a
   },
   props: {
+    dictCode: String,
     options: {
       type: Array,
       required: true
@@ -4259,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;
         });
@@ -4297,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,
@@ -4308,19 +4907,19 @@ var dict_component = normalizeComponent(
 
 /* harmony default export */ var dict = (dict_component.exports);
 // EXTERNAL MODULE: external "element-ui/lib/dropdown"
-var dropdown_ = __webpack_require__(42);
+var dropdown_ = __webpack_require__(47);
 var dropdown_default = /*#__PURE__*/__webpack_require__.n(dropdown_);
 
 // EXTERNAL MODULE: external "element-ui/lib/dropdown-item"
-var dropdown_item_ = __webpack_require__(43);
+var dropdown_item_ = __webpack_require__(48);
 var dropdown_item_default = /*#__PURE__*/__webpack_require__.n(dropdown_item_);
 
 // EXTERNAL MODULE: external "element-ui/lib/dropdown-menu"
-var dropdown_menu_ = __webpack_require__(44);
+var dropdown_menu_ = __webpack_require__(49);
 var dropdown_menu_default = /*#__PURE__*/__webpack_require__.n(dropdown_menu_);
 
 // EXTERNAL MODULE: external "element-ui/lib/link"
-var link_ = __webpack_require__(17);
+var link_ = __webpack_require__(22);
 var link_default = /*#__PURE__*/__webpack_require__.n(link_);
 
 // CONCATENATED MODULE: ./src/utils/helper.js
@@ -4669,6 +5268,7 @@ function spliceTreeSelf(tree, idx, deleteCount) {
 
 
 
+
 /* harmony default export */ var operatevue_type_script_lang_js_ = ({
   name: "Operate",
   props: {
@@ -4681,7 +5281,6 @@ function spliceTreeSelf(tree, idx, deleteCount) {
     },
     items: {
       type: Array,
-      required: true,
       default: function _default() {
         return [];
       }
@@ -4690,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() {
@@ -4705,7 +5304,7 @@ function spliceTreeSelf(tree, idx, deleteCount) {
     }
   },
   created: function created() {
-    this.items.filter(function (row) {
+    this.items.forEach(function (row) {
       if (!row.key) {
         row.key = uuid();
       }
@@ -4714,7 +5313,7 @@ function spliceTreeSelf(tree, idx, deleteCount) {
   methods: {
     renderItems: function renderItems(h, scoped) {
       var _this = this;
-      var filterItems = this.items.filter(function (row) {
+      var filterItems = Object(external_lodash_["sortBy"])(this.items, ['sort']).filter(function (row) {
         if (typeof row.show === "function") {
           return row.show.call(_this, scoped, row);
         }
@@ -4739,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);
@@ -4942,12 +5539,19 @@ function table_column_extends() { table_column_extends = Object.assign ? Object.
       required: false,
       default: "Default"
     },
+    show: {
+      type: Boolean,
+      default: true
+    },
     slots: {
       type: Object
     }
   },
   render: function render(h) {
     var _this = this;
+    if (this.show === false) {
+      return;
+    }
     var param = {
       attrs: Object.assign({}, this.$attrs),
       on: this.$listeners,
@@ -4980,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=d82821d8&
-var srcvue_type_template_id_d82821d8_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" }, [
@@ -5013,7 +5617,7 @@ var srcvue_type_template_id_d82821d8_render = function render() {
                           "el-button",
                           {
                             attrs: { icon: "el-icon-refresh-left" },
-                            on: { click: _vm.reset },
+                            on: { click: _vm.resetForm },
                           },
                           [_vm._v("重置")]
                         ),
@@ -5030,23 +5634,33 @@ var srcvue_type_template_id_d82821d8_render = function render() {
     _c(
       "div",
       { staticClass: "table-search-table" },
-      [_c("Table", _vm._b({ ref: "table" }, "Table", _vm.tableProps, false))],
+      [
+        _c(
+          "Table",
+          _vm._b(
+            { ref: "table", attrs: { request: _vm.request } },
+            "Table",
+            _vm.tableProps,
+            false
+          )
+        ),
+      ],
       1
     ),
   ])
 }
-var srcvue_type_template_id_d82821d8_staticRenderFns = []
-srcvue_type_template_id_d82821d8_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=d82821d8&
+// 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__(45);
+var components_form_ = __webpack_require__(50);
 var components_form_default = /*#__PURE__*/__webpack_require__.n(components_form_);
 
 // EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table"
-var components_table_ = __webpack_require__(46);
+var components_table_ = __webpack_require__(51);
 var components_table_default = /*#__PURE__*/__webpack_require__.n(components_table_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table-search/src/index.vue?vue&type=script&lang=js&
@@ -5074,11 +5688,7 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
       }, this.search.form);
     },
     tableProps: function tableProps() {
-      return Object(external_lodash_["merge"])({
-        api: {
-          request: this.request
-        }
-      }, this.table, {
+      return Object(external_lodash_["merge"])(this.table, {
         api: {
           data: this.searchData
         }
@@ -5095,23 +5705,29 @@ var components_table_default = /*#__PURE__*/__webpack_require__.n(components_tab
   },
   mounted: function mounted() {
     var _this = this;
-    if (this.search.hasInit) {
+    if (this.search && this.search.hasInit) {
       this.$nextTick(function () {
         _this.searchSubmit();
       });
     }
   },
   methods: {
-    reset: function reset() {
+    resetForm: function resetForm() {
       this.$refs.form.resetFields();
     },
+    resetTable: function resetTable() {
+      this.$refs.table.reset();
+    },
+    reloadTable: function reloadTable() {
+      this.$refs.table.reload();
+    },
     searchSubmit: function searchSubmit() {
       var _this2 = this;
       this.$refs.form.validate(function (isValidate, errorMessage) {
         if (!isValidate) {
           return false;
         }
-        _this2.$refs.table.reset();
+        _this2.resetTable();
       });
     }
   }
@@ -5128,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_d82821d8_render,
-  srcvue_type_template_id_d82821d8_staticRenderFns,
+  srcvue_type_template_id_36222536_render,
+  srcvue_type_template_id_36222536_staticRenderFns,
   false,
   null,
   null,
@@ -5146,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(
@@ -5189,18 +5805,18 @@ 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__(47);
+var popover_ = __webpack_require__(52);
 var popover_default = /*#__PURE__*/__webpack_require__.n(popover_);
 
 // EXTERNAL MODULE: external "async-validator"
-var external_async_validator_ = __webpack_require__(48);
+var external_async_validator_ = __webpack_require__(53);
 var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(external_async_validator_);
 
 // CONCATENATED MODULE: ./src/components/table-editable/src/form-item.js
@@ -5768,91 +6384,390 @@ var external_async_validator_default = /*#__PURE__*/__webpack_require__.n(extern
           if (typeof callback === 'function' && ++count === fields.length) {
             callback(valid, invalidFields);
           }
-        });
-      });
-      if (promise) {
-        return promise;
+        });
+      });
+      if (promise) {
+        return promise;
+      }
+    },
+    validateField: function validateField(rowIndex, props, cb) {
+      props = [].concat(props);
+      var fields = this.fields.filter(function (item) {
+        return item.row && item.row.$index === rowIndex && props.indexOf(item.prop) !== -1;
+      });
+      if (!fields.length) {
+        console.warn('[Element Warn]please pass correct props!');
+        return;
+      }
+      fields.forEach(function (field) {
+        field.validate('', cb);
+      });
+    },
+    clearValidate: function clearValidate(rowIndex, props) {
+      if (props === void 0) {
+        props = [];
+      }
+      var fields = this.fields;
+      if (typeof rowIndex === "number") {
+        fields = props.length ? this.fields.filter(function (item) {
+          return item.row && item.row.$index === rowIndex && props.indexOf(item.prop) !== -1;
+        }) : this.fields.filter(function (item) {
+          return item.row && item.row.$index === rowIndex;
+        });
+      }
+      fields.forEach(function (field) {
+        field.clearValidate();
+      });
+    },
+    getRowField: function getRowField(row) {
+      var fieldMap = {};
+      var fields = this.fields.filter(function (item) {
+        return item.row && item.row.$index === row.$index;
+      });
+      fields.forEach(function (item) {
+        fieldMap[item.prop] = item;
+      });
+      return fieldMap;
+    },
+    addRow: function addRow(data, parentRow) {
+      var _Object$assign;
+      var rowData = Object.assign((_Object$assign = {}, _Object$assign[this.rowKey] = uuid(), _Object$assign), this.rowData, data);
+      if (this.hasChildren && !rowData.children) {
+        rowData.children = [];
+      }
+      if (parentRow) {
+        if (!parentRow.children) {
+          this.$set(parentRow, "children", []);
+        }
+        parentRow.children.push(rowData);
+      } else {
+        this.data.push(rowData);
+      }
+    },
+    deleteByIndex: function deleteByIndex(index) {
+      this.data && this.data.splice(index, 1);
+    },
+    deleteByRow: function deleteByRow(row, id) {
+      var refId = row[this.rowKey] ? this.rowKey : "id";
+      spliceTreeSelf(this.data, findTreeIndex(this.data, function (item) {
+        return item[id || refId] === row[id || refId];
+      }), 1);
+    }
+  }
+});
+// CONCATENATED MODULE: ./src/components/table-editable/src/index.vue?vue&type=script&lang=js&
+ /* harmony default export */ var components_table_editable_srcvue_type_script_lang_js_ = (table_editable_srcvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/table-editable/src/index.vue
+
+
+
+
+
+/* normalize component */
+
+var table_editable_src_component = normalizeComponent(
+  components_table_editable_srcvue_type_script_lang_js_,
+  srcvue_type_template_id_aabdd8e6_render,
+  srcvue_type_template_id_aabdd8e6_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var table_editable_src = (table_editable_src_component.exports);
+// CONCATENATED MODULE: ./src/components/table-editable/index.js
+
+table_editable_src.install = function (Vue) {
+  Vue.component(table_editable_src.name, table_editable_src);
+};
+/* harmony default export */ var table_editable = (table_editable_src);
+// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-search"
+var table_search_ = __webpack_require__(13);
+var table_search_default = /*#__PURE__*/__webpack_require__.n(table_search_);
+
+// EXTERNAL MODULE: external "element-ui/lib/message-box"
+var message_box_ = __webpack_require__(16);
+var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
+
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/table-operate/src/index.vue?vue&type=script&lang=js&
+
+
+
+
+
+/* harmony default export */ var table_operate_srcvue_type_script_lang_js_ = ({
+  name: "TableOperate",
+  componentName: "TableOperate",
+  components: {
+    TableSearch: table_search_default.a,
+    FormDialog: form_dialog,
+    FormViewDialog: form_view_dialog
+  },
+  computed: {
+    tableProps: function tableProps() {
+      return {
+        request: this.request,
+        search: this.search,
+        table: this.table
+      };
+    },
+    createProps: function createProps() {
+      return Object.assign({
+        dialog: {
+          title: "添加"
+        }
+      }, this.create);
+    },
+    updateProps: function updateProps() {
+      return Object.assign({
+        dialog: {
+          title: "修改"
+        }
+      }, this.update);
+    },
+    viewProps: function viewProps() {
+      return Object.assign({
+        dialog: {
+          title: "查看"
+        }
+      }, this.view);
+    }
+  },
+  props: {
+    request: Function,
+    search: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    table: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    create: {
+      type: Object,
+      default: function _default() {
+        return null;
+      }
+    },
+    update: {
+      type: Object,
+      default: function _default() {
+        return null;
+      }
+    },
+    delete: {
+      type: Object,
+      default: function _default() {
+        return null;
+      }
+    },
+    view: {
+      type: Object,
+      default: function _default() {
+        return null;
+      }
+    },
+    on: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    slots: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    }
+  },
+  data: function data() {
+    return {};
+  },
+  mounted: function mounted() {
+    this.addTools();
+  },
+  methods: {
+    addTools: function addTools() {
+      // 添加按钮处理
+      if (this.create) {
+        var tools = this.table && this.table.tools || [];
+        tools.unshift(Object.assign({
+          label: "添加",
+          loading: false,
+          on: {
+            click: this.handleCreate
+          }
+        }, this.create.tool));
+        this.table.tools = tools;
+      }
+      //修改和删除按钮处理
+      if (!(this.update || this.delete || this.view)) {
+        return false;
+      }
+      var filterColumns = this.table.columns.filter(function (item) {
+        return item.control === "Operate";
+      });
+      var optColumn = filterColumns && filterColumns[0];
+      var items = optColumn && optColumn.items || [];
+      if (this.delete) {
+        items.unshift(Object.assign({
+          label: "删除",
+          loading: false,
+          on: {
+            click: this.handleDelete
+          }
+        }, this.delete.tool));
       }
-    },
-    validateField: function validateField(rowIndex, props, cb) {
-      props = [].concat(props);
-      var fields = this.fields.filter(function (item) {
-        return item.row && item.row.$index === rowIndex && props.indexOf(item.prop) !== -1;
-      });
-      if (!fields.length) {
-        console.warn('[Element Warn]please pass correct props!');
-        return;
+      if (this.update) {
+        items.unshift(Object.assign({
+          label: "修改",
+          loading: false,
+          on: {
+            click: this.handleUpdate
+          }
+        }, this.update.tool));
       }
-      fields.forEach(function (field) {
-        field.validate('', cb);
-      });
-    },
-    clearValidate: function clearValidate(rowIndex, props) {
-      if (props === void 0) {
-        props = [];
+      if (this.view) {
+        items.unshift(Object.assign({
+          label: "查看",
+          loading: false,
+          on: {
+            click: this.handleView
+          }
+        }, this.view.tool));
       }
-      var fields = this.fields;
-      if (typeof rowIndex === "number") {
-        fields = props.length ? this.fields.filter(function (item) {
-          return item.row && item.row.$index === rowIndex && props.indexOf(item.prop) !== -1;
-        }) : this.fields.filter(function (item) {
-          return item.row && item.row.$index === rowIndex;
+      if (optColumn) {
+        optColumn.items = items;
+      } else {
+        this.table.columns.push({
+          control: "Operate",
+          label: "操作",
+          align: "center",
+          items: items
         });
       }
-      fields.forEach(function (field) {
-        field.clearValidate();
-      });
     },
-    getRowField: function getRowField(row) {
-      var fieldMap = {};
-      var fields = this.fields.filter(function (item) {
-        return item.row && item.row.$index === row.$index;
-      });
-      fields.forEach(function (item) {
-        fieldMap[item.prop] = item;
-      });
-      return fieldMap;
+    handleCreate: function handleCreate() {
+      this.$refs.createFormDialog.open();
     },
-    addRow: function addRow(data, parentRow) {
-      var _Object$assign;
-      var rowData = Object.assign((_Object$assign = {}, _Object$assign[this.rowKey] = uuid(), _Object$assign), this.rowData, data);
-      if (this.hasChildren && !rowData.children) {
-        rowData.children = [];
-      }
-      if (parentRow) {
-        if (!parentRow.children) {
-          this.$set(parentRow, "children", []);
-        }
-        parentRow.children.push(rowData);
+    handleUpdate: function handleUpdate(rowProps, that) {
+      var _this = this;
+      var rowData = rowProps.row;
+      this.$refs.updateFormDialog.open();
+      if (this.update.detail) {
+        var request = this.update.detail.request || this.request;
+        request({
+          url: Object(formula_["evaluate"])(this.update.detail.url, rowData),
+          method: this.update.detail.method || "GET",
+          data: rowData
+        }).then(function (res) {
+          _this.$refs.updateFormDialog.setFormModel(res);
+        }).catch(function (error) {});
       } else {
-        this.data.push(rowData);
+        this.$nextTick(function () {
+          _this.$refs.updateFormDialog.setFormModel(rowData);
+        });
       }
     },
-    deleteByIndex: function deleteByIndex(index) {
-      this.data && this.data.splice(index, 1);
+    handleDelete: function handleDelete(rowProps, that) {
+      var _this2 = this;
+      message_box_default.a.confirm("是否确定删除", '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function () {
+        var request = _this2.delete.api.request || _this2.request;
+        var rowData = rowProps.row;
+        that.loading = true;
+        request({
+          url: Object(formula_["evaluate"])(_this2.delete.api.url, rowData),
+          method: _this2.delete.api.method || "GET",
+          data: rowData
+        }).then(function (res) {
+          that.loading = false;
+        }).catch(function (error) {
+          that.loading = false;
+        });
+      }).catch(function () {});
     },
-    deleteByRow: function deleteByRow(row) {
-      var _this4 = this;
-      spliceTreeSelf(this.data, findTreeIndex(this.data, function (item) {
-        return item[_this4.rowKey] === row[_this4.rowKey];
-      }), 1);
+    handleView: function handleView(rowProps, that) {
+      var _this3 = this;
+      var rowData = rowProps.row;
+      this.$refs.viewFormDialog.open();
+      if (this.view.api) {
+        var request = this.view.api.request || this.request;
+        request({
+          url: Object(formula_["evaluate"])(this.view.api.url, rowData),
+          method: this.view.api.method || "GET",
+          data: rowData
+        }).then(function (res) {
+          _this3.$refs.viewFormDialog.setFormModel(res);
+        }).catch(function (error) {});
+      } else {
+        this.$nextTick(function () {
+          _this3.$refs.viewFormDialog.setFormModel(rowData);
+        });
+      }
     }
+  },
+  render: function render() {
+    var h = arguments[0];
+    return h("div", [h("div", [h(table_search_default.a, {
+      "ref": "table",
+      "directives": [{
+        name: "bind",
+        value: "tableProps"
+      }]
+    })]), h("div", [h(form_dialog, {
+      "directives": [{
+        name: "if",
+        value: "create"
+      }, {
+        name: "bind",
+        value: "createProps"
+      }],
+      "ref": "createFormDialog"
+    }), h(form_dialog, {
+      "directives": [{
+        name: "if",
+        value: "update"
+      }, {
+        name: "bind",
+        value: "updateProps"
+      }],
+      "ref": "updateFormDialog"
+    }), h(form_view_dialog, {
+      "directives": [{
+        name: "if",
+        value: "view"
+      }, {
+        name: "bind",
+        value: "viewProps"
+      }],
+      "ref": "viewFormDialog"
+    })])]);
   }
 });
-// CONCATENATED MODULE: ./src/components/table-editable/src/index.vue?vue&type=script&lang=js&
- /* harmony default export */ var components_table_editable_srcvue_type_script_lang_js_ = (table_editable_srcvue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./src/components/table-editable/src/index.vue
-
+// CONCATENATED MODULE: ./src/components/table-operate/src/index.vue?vue&type=script&lang=js&
+ /* harmony default export */ var components_table_operate_srcvue_type_script_lang_js_ = (table_operate_srcvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/table-operate/src/index.vue
+var table_operate_src_render, table_operate_src_staticRenderFns
 
 
 
 
 /* normalize component */
 
-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,
+var table_operate_src_component = normalizeComponent(
+  components_table_operate_srcvue_type_script_lang_js_,
+  table_operate_src_render,
+  table_operate_src_staticRenderFns,
   false,
   null,
   null,
@@ -5860,15 +6775,15 @@ var table_editable_src_component = normalizeComponent(
   
 )
 
-/* harmony default export */ var table_editable_src = (table_editable_src_component.exports);
-// CONCATENATED MODULE: ./src/components/table-editable/index.js
+/* harmony default export */ var table_operate_src = (table_operate_src_component.exports);
+// CONCATENATED MODULE: ./src/components/table-operate/index.js
 
-table_editable_src.install = function (Vue) {
-  Vue.component(table_editable_src.name, table_editable_src);
+table_operate_src.install = function (Vue) {
+  Vue.component(table_operate_src.name, table_operate_src);
 };
-/* harmony default export */ var table_editable = (table_editable_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=0fa8c191&
-var srcvue_type_template_id_0fa8c191_render = function render() {
+/* 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=34fe6a3b&
+var srcvue_type_template_id_34fe6a3b_render = function render() {
   var _vm = this,
     _c = _vm._self._c
   return _c("div", [
@@ -5877,7 +6792,12 @@ var srcvue_type_template_id_0fa8c191_render = function render() {
       [
         _c(
           "TableSearch",
-          _vm._b({ ref: "table" }, "TableSearch", _vm.tableProps, false)
+          _vm._b(
+            { ref: "table", attrs: { request: _vm.request } },
+            "TableSearch",
+            _vm.tableProps,
+            false
+          )
         ),
       ],
       1
@@ -5888,22 +6808,28 @@ var srcvue_type_template_id_0fa8c191_render = function render() {
         _vm.create
           ? _c(
               "FormDialog",
-              _vm._b(
-                { ref: "createFormDialog" },
-                "FormDialog",
-                _vm.createProps,
-                false
+              _vm._g(
+                _vm._b(
+                  { ref: "createFormDialog", attrs: { request: _vm.request } },
+                  "FormDialog",
+                  _vm.createProps,
+                  false
+                ),
+                _vm.reloadTableEvent
               )
             )
           : _vm._e(),
         _vm.update
           ? _c(
               "FormDialog",
-              _vm._b(
-                { ref: "updateFormDialog" },
-                "FormDialog",
-                _vm.updateProps,
-                false
+              _vm._g(
+                _vm._b(
+                  { ref: "updateFormDialog", attrs: { request: _vm.request } },
+                  "FormDialog",
+                  _vm.updateProps,
+                  false
+                ),
+                _vm.reloadTableEvent
               )
             )
           : _vm._e(),
@@ -5911,7 +6837,7 @@ var srcvue_type_template_id_0fa8c191_render = function render() {
           ? _c(
               "FormViewDialog",
               _vm._b(
-                { ref: "viewFormDialog" },
+                { ref: "viewFormDialog", attrs: { request: _vm.request } },
                 "FormViewDialog",
                 _vm.viewProps,
                 false
@@ -5923,19 +6849,11 @@ var srcvue_type_template_id_0fa8c191_render = function render() {
     ),
   ])
 }
-var srcvue_type_template_id_0fa8c191_staticRenderFns = []
-srcvue_type_template_id_0fa8c191_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=0fa8c191&
-
-// EXTERNAL MODULE: external "@panpanzhao/component-ui/lib/components/table-search"
-var table_search_ = __webpack_require__(49);
-var table_search_default = /*#__PURE__*/__webpack_require__.n(table_search_);
 
-// EXTERNAL MODULE: external "element-ui/lib/message-box"
-var message_box_ = __webpack_require__(50);
-var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
+// 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&
 
@@ -5943,6 +6861,7 @@ var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
 
 
 
+
 /* harmony default export */ var crud_srcvue_type_script_lang_js_ = ({
   name: "CRUD",
   componentName: "CRUD",
@@ -6033,7 +6952,14 @@ var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
     }
   },
   data: function data() {
-    return {};
+    var _this = this;
+    return {
+      reloadTableEvent: {
+        success: function success() {
+          _this.reloadTable();
+        }
+      }
+    };
   },
   created: function created() {
     this.addTools();
@@ -6046,13 +6972,14 @@ var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
         tools.unshift(Object.assign({
           label: "添加",
           loading: false,
+          sort: 10,
           on: {
             click: this.handleCreate
           }
         }, this.create.tool));
         this.table.tools = tools;
       }
-      //修改和删除按钮处理
+      //修改,查看和删除按钮处理
       if (!(this.update || this.delete || this.view)) {
         return false;
       }
@@ -6062,32 +6989,35 @@ var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
       var optColumn = filterColumns && filterColumns[0];
       var items = optColumn && optColumn.items || [];
       if (this.update) {
-        items.unshift(Object.assign({
+        items.push(Object.assign({
           label: "修改",
           loading: false,
+          sort: 10,
           on: {
             click: this.handleUpdate
           }
         }, this.update.tool));
       }
-      if (this.delete) {
-        items.unshift(Object.assign({
-          label: "删除",
-          loading: false,
-          on: {
-            click: this.handleDelete
-          }
-        }, this.delete.tool));
-      }
       if (this.view) {
-        items.unshift(Object.assign({
+        items.push(Object.assign({
           label: "查看",
           loading: false,
+          sort: 20,
           on: {
             click: this.handleView
           }
         }, this.view.tool));
       }
+      if (this.delete) {
+        items.push(Object.assign({
+          label: "删除",
+          loading: false,
+          sort: 30,
+          on: {
+            click: this.handleDelete
+          }
+        }, this.delete.tool));
+      }
       if (optColumn) {
         optColumn.items = items;
       } else {
@@ -6102,62 +7032,120 @@ var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
     handleCreate: function handleCreate() {
       this.$refs.createFormDialog.open();
     },
+    resetTable: function resetTable() {
+      this.$refs.table.resetTable();
+    },
+    reloadTable: function reloadTable() {
+      this.$refs.table.reloadTable();
+    },
+    getRequest: function getRequest(request) {
+      if (request) {
+        return request;
+      }
+      return this.request || (this.$COMPONENT || {}).request;
+    },
     handleUpdate: function handleUpdate(rowProps, that) {
-      var _this = this;
+      var _this2 = this;
       var rowData = rowProps.row;
       this.$refs.updateFormDialog.open();
-      if (this.update.detail) {
-        var request = this.update.detail.request || this.request;
+      var detailApi = this.update.detail || {};
+      var request = this.getRequest(detailApi.request);
+      var reqData = Object(external_lodash_["merge"])(detailApi.data || {}, rowData);
+      if (typeof detailApi.before === "function") {
+        reqData = detailApi.before.call(this, reqData);
+      }
+      if (detailApi.url && request) {
+        that.loading = true;
         request({
-          url: Object(formula_["evaluate"])(this.update.detail.url, rowData),
-          method: this.update.detail.method || "GET",
-          data: rowData
+          url: Object(formula_["evaluate"])(detailApi.url, rowData),
+          method: detailApi.method || "GET",
+          data: reqData
         }).then(function (res) {
-          _this.$refs.updateFormDialog.setFormModel(res);
-        }).catch(function (error) {});
+          that.loading = false;
+          if (typeof detailApi.after === "function") {
+            res = detailApi.after.call(_this2, res);
+          }
+          _this2.$refs.updateFormDialog.setFormModel(res);
+        }).catch(function (error) {
+          that.loading = false;
+        });
       } else {
         this.$nextTick(function () {
-          _this.$refs.updateFormDialog.setFormModel(rowData);
+          _this2.$refs.updateFormDialog.setFormModel(typeof detailApi.after === "function" ? detailApi.after.call(_this2, reqData) : reqData);
         });
       }
     },
     handleDelete: function handleDelete(rowProps, that) {
-      var _this2 = this;
+      var _this3 = this;
+      var deleteApi = this.delete.api;
+      if (!deleteApi) {
+        console.warn("缺少删除的配置");
+        return false;
+      }
       message_box_default.a.confirm("是否确定删除", '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function () {
-        var request = _this2.delete.api.request || _this2.request;
-        var rowData = rowProps.row;
+        var request = _this3.getRequest(deleteApi.request);
+        var reqData = Object(external_lodash_["merge"])(deleteApi.data || {}, rowProps.row);
+        if (typeof deleteApi.before === "function") {
+          reqData = deleteApi.before.call(_this3, reqData);
+        }
         that.loading = true;
         request({
-          url: Object(formula_["evaluate"])(_this2.delete.api.url, rowData),
-          method: _this2.delete.api.method || "GET",
-          data: rowData
+          url: Object(formula_["evaluate"])(deleteApi.url, reqData),
+          method: deleteApi.method || "GET",
+          data: reqData
         }).then(function (res) {
           that.loading = false;
+          _this3.reloadTable();
+          _this3.$emit("deleteSuccess", {
+            request: request,
+            reqData: reqData,
+            resData: res
+          });
         }).catch(function (error) {
           that.loading = false;
+          _this3.$emit("deleteError", {
+            request: request,
+            reqData: reqData,
+            resError: error
+          });
         });
       }).catch(function () {});
     },
     handleView: function handleView(rowProps, that) {
-      var _this3 = this;
+      var _this4 = this;
       var rowData = rowProps.row;
       this.$refs.viewFormDialog.open();
-      if (this.view.api) {
-        var request = this.view.api.request || this.request;
+      var viewApi = this.view.api || {};
+      var request = this.getRequest(viewApi.request);
+      var reqData = Object(external_lodash_["merge"])(viewApi.data || {}, rowData);
+      if (typeof viewApi.before === "function") {
+        reqData = viewApi.before.call(this, reqData);
+      }
+      if (viewApi.url && request) {
+        that.loading = true;
         request({
-          url: Object(formula_["evaluate"])(this.view.api.url, rowData),
-          method: this.view.api.method || "GET",
-          data: rowData
+          url: Object(formula_["evaluate"])(viewApi.url, reqData),
+          method: viewApi.method || "GET",
+          data: reqData
         }).then(function (res) {
-          _this3.$refs.viewFormDialog.setFormModel(res);
-        }).catch(function (error) {});
+          that.loading = false;
+          if (typeof viewApi.after === "function") {
+            res = viewApi.after.call(_this4, res);
+          }
+          _this4.$refs.viewFormDialog.setFormModel(res);
+        }).catch(function (error) {
+          that.loading = false;
+        });
       } else {
+        if (typeof viewApi.after === "function") {
+          reqData = viewApi.after.call(this, reqData);
+        }
         this.$nextTick(function () {
-          _this3.$refs.viewFormDialog.setFormModel(rowData);
+          _this4.$refs.viewFormDialog.setFormModel(typeof viewApi.after === "function" ? viewApi.after.call(_this4, reqData) : reqData);
         });
       }
     }
@@ -6175,8 +7163,8 @@ var message_box_default = /*#__PURE__*/__webpack_require__.n(message_box_);
 
 var crud_src_component = normalizeComponent(
   components_crud_srcvue_type_script_lang_js_,
-  srcvue_type_template_id_0fa8c191_render,
-  srcvue_type_template_id_0fa8c191_staticRenderFns,
+  srcvue_type_template_id_34fe6a3b_render,
+  srcvue_type_template_id_34fe6a3b_staticRenderFns,
   false,
   null,
   null,
@@ -6192,20 +7180,20 @@ crud_src.install = function (Vue) {
 };
 /* harmony default export */ var crud = (crud_src);
 // EXTERNAL MODULE: external "codemirror"
-var external_codemirror_ = __webpack_require__(15);
+var external_codemirror_ = __webpack_require__(19);
 var external_codemirror_default = /*#__PURE__*/__webpack_require__.n(external_codemirror_);
 
 // EXTERNAL MODULE: external "codemirror/mode/javascript/javascript"
-var javascript_ = __webpack_require__(58);
+var javascript_ = __webpack_require__(59);
 
 // EXTERNAL MODULE: external "codemirror/mode/htmlmixed/htmlmixed"
-var htmlmixed_ = __webpack_require__(59);
+var htmlmixed_ = __webpack_require__(60);
 
 // EXTERNAL MODULE: external "codemirror/addon/mode/simple"
-var simple_ = __webpack_require__(60);
+var simple_ = __webpack_require__(61);
 
 // EXTERNAL MODULE: external "codemirror/addon/mode/multiplex"
-var multiplex_ = __webpack_require__(61);
+var multiplex_ = __webpack_require__(62);
 
 // CONCATENATED MODULE: ./src/components/formula/src/codeMirror.js
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -6424,11 +7412,11 @@ function funcList_extends() { funcList_extends = Object.assign ? Object.assign.b
   }
 });
 // EXTERNAL MODULE: external "element-ui/lib/tree"
-var tree_ = __webpack_require__(51);
+var tree_ = __webpack_require__(54);
 var tree_default = /*#__PURE__*/__webpack_require__.n(tree_);
 
 // EXTERNAL MODULE: external "element-ui/lib/badge"
-var badge_ = __webpack_require__(52);
+var badge_ = __webpack_require__(55);
 var badge_default = /*#__PURE__*/__webpack_require__.n(badge_);
 
 // CONCATENATED MODULE: ./src/components/formula/src/variableList.js
@@ -6522,7 +7510,7 @@ var badge_default = /*#__PURE__*/__webpack_require__.n(badge_);
         "attrs": {
           "value": "self"
         }
-      }, [h("label", [data.label])]), data.label && (!this.selfVariableName || data.value !== this.selfVariableName) && h("label", [data.label]), data.tag ? h("span", {
+      }, [h("label", [data.label])]), data.label && (!this.selfVariableName || data.value !== this.selfVariableName) && h("label", [data.label]), data.label && data.tag ? h("span", {
         "class": this.classPrefix + "-item-tag"
       }, [data.tag]) : null]);
     },
@@ -6622,31 +7610,11 @@ var badge_default = /*#__PURE__*/__webpack_require__.n(badge_);
     }, [this.selectMode === 'tabs' ? this.renderTab(h) : this.renderContent(h)]);
   }
 });
-// CONCATENATED MODULE: ./src/components/formula/src/plugin.js
-/**
- * @file 扩展 codemirror
- */
+// CONCATENATED MODULE: ./src/components/formula/src/plugin.js
 
 /**
- * 遍历树
- * @param tree
- * @param iterator
+ * @file 扩展 codemirror
  */
-function plugin_eachTree(tree, iterator, level, paths) {
-  if (level === void 0) {
-    level = 1;
-  }
-  if (paths === void 0) {
-    paths = [];
-  }
-  tree.map(function (item, index) {
-    var currentPath = paths.concat(item);
-    iterator(item, index, level, currentPath);
-    if (item.children && item.children.splice) {
-      plugin_eachTree(item.children, iterator, level + 1, currentPath);
-    }
-  });
-}
 function replaceStrByIndex(str, idx, key, replaceKey) {
   var from = str.slice(0, idx);
   var left = str.slice(idx);
@@ -6664,20 +7632,29 @@ function plugin_editorFactory(dom, cm, props) {
     mode: props && props.evalMode ? 'text/formula' : 'text/formula-template'
   });
 }
-var FormulaPlugin = /*#__PURE__*/function () {
+var plugin_FormulaPlugin = /*#__PURE__*/function () {
   function FormulaPlugin(editor, cm, getProps) {
+    var _this = this;
     this.editor = editor;
     this.cm = cm;
     this.getProps = getProps;
-    // editor.on('change', this.autoMarkText);
+    editor.on('change', function (editorDom) {
+      //处理第一次初始化
+      var val = editorDom.getDoc().getValue();
+      var _this$getProps = _this.getProps(),
+        value = _this$getProps.value;
+      if (val == value) {
+        _this.autoMarkText();
+      }
+    });
     this.autoMarkText();
   }
   var _proto = FormulaPlugin.prototype;
   _proto.autoMarkText = function autoMarkText() {
-    var _this$getProps = this.getProps(),
-      functions = _this$getProps.functions,
-      variables = _this$getProps.variables,
-      value = _this$getProps.value;
+    var _this$getProps2 = this.getProps(),
+      functions = _this$getProps2.functions,
+      variables = _this$getProps2.variables,
+      value = _this$getProps2.value;
     if (value) {
       // todo functions 也需要自动替换
       this.autoMark(variables);
@@ -6747,8 +7724,8 @@ var FormulaPlugin = /*#__PURE__*/function () {
   };
   _proto.insertContent = function insertContent(value, type) {
     var from = this.editor.getCursor();
-    var _this$getProps2 = this.getProps(),
-      evalMode = _this$getProps2.evalMode;
+    var _this$getProps3 = this.getProps(),
+      evalMode = _this$getProps3.evalMode;
     if (type === 'variable') {
       this.editor.replaceSelection(value.key);
       var to = this.editor.getCursor();
@@ -6790,12 +7767,12 @@ var FormulaPlugin = /*#__PURE__*/function () {
     });
   };
   _proto.autoMark = function autoMark(variables) {
-    var _this = this;
+    var _this2 = this;
     if (!Array.isArray(variables) || !variables.length) {
       return;
     }
     var varMap = {};
-    plugin_eachTree(variables, function (item) {
+    eachTree(variables, function (item) {
       if (item.value) {
         varMap[item.value] = item.label;
       }
@@ -6805,14 +7782,14 @@ var FormulaPlugin = /*#__PURE__*/function () {
     });
     var editor = this.editor;
     var lines = editor.lineCount();
-    var _this$getProps3 = this.getProps(),
-      _this$getProps3$evalM = _this$getProps3.evalMode,
-      evalMode = _this$getProps3$evalM === void 0 ? true : _this$getProps3$evalM;
+    var _this$getProps4 = this.getProps(),
+      _this$getProps4$evalM = _this$getProps4.evalMode,
+      evalMode = _this$getProps4$evalM === void 0 ? true : _this$getProps4$evalM;
     var _loop = function _loop(line) {
       var content = editor.getLine(line);
       // 标记方法调用
       content.replace(/([A-Z]+)\s*\(/g, function (_, func, pos) {
-        _this.markText({
+        _this2.markText({
           line: line,
           ch: pos
         }, {
@@ -6830,7 +7807,7 @@ var FormulaPlugin = /*#__PURE__*/function () {
           var encode = replaceStrByIndex(content, idx, v, REPLACE_KEY);
           var reg = getRegExpByMode(evalMode, REPLACE_KEY);
           if (reg.test(encode)) {
-            _this.markText({
+            _this2.markText({
               line: line,
               ch: idx
             }, {
@@ -6868,7 +7845,6 @@ function registerLaunguageMode(cm) {
   cm.defineMode('formula', function (config, parserConfig) {
     var formula = cm.getMode(config, 'javascript');
     if (!parserConfig || !parserConfig.base) return formula;
-    debugger;
     return cm.multiplexingMode(cm.getMode(config, parserConfig.base), {
       open: '${',
       close: '}',
@@ -8427,7 +9403,7 @@ function registerLaunguageMode(cm) {
   namespace: "其他"
 }]);
 // EXTERNAL MODULE: external "element-ui/lib/message"
-var message_ = __webpack_require__(53);
+var message_ = __webpack_require__(56);
 var message_default = /*#__PURE__*/__webpack_require__.n(message_);
 
 // CONCATENATED MODULE: ./src/components/formula/src/index.js
@@ -8440,6 +9416,8 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
 
 
 
+
+
 /* harmony default export */ var formula_src = ({
   name: "Formula",
   componentName: "Formula",
@@ -8505,7 +9483,7 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
     },
     handleEditorMounted: function handleEditorMounted(cm, editor) {
       var _this = this;
-      this.editorPlugin = new FormulaPlugin(editor, cm, function () {
+      this.editorPlugin = new plugin_FormulaPlugin(editor, cm, function () {
         return _this.$props;
       });
     },
@@ -8539,6 +9517,7 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
       }, 'variable');
     },
     handleChange: function handleChange(value) {
+      this.$emit("input", value);
       this.$emit("change", value);
     },
     handleFocus: function handleFocus() {
@@ -8552,6 +9531,74 @@ var message_default = /*#__PURE__*/__webpack_require__.n(message_);
         value: "name",
         label: "名称"
       });
+    },
+    validate: function validate() {
+      var value = this.value;
+      try {
+        value ? Object(formula_["parse"])(value, {
+          evalMode: this.evalMode
+        }) : null;
+      } catch (e) {
+        return "\u516C\u5F0F\u503C\u6821\u9A8C\u9519\u8BEF\uFF0C\u9519\u8BEF\u7684\u4F4D\u7F6E/\u539F\u56E0\u662F " + e.message;
+      }
+      return;
+    },
+    replaceStrByIndex: function replaceStrByIndex(str, idx, key, replaceKey) {
+      var from = str.slice(0, idx);
+      var left = str.slice(idx);
+      return from + left.replace(key, replaceKey);
+    },
+    getRegExpByMode: function getRegExpByMode(evalMode, key) {
+      var reg = evalMode ? "\\b" + key + "\\b" : "\\$\\{[^\\{\\}]*\\b" + key + "\\b[^\\{\\}]*\\}";
+      return new RegExp(reg);
+    },
+    highlightValue: function highlightValue(value, variables, evalMode) {
+      var _this2 = this;
+      if (evalMode === void 0) {
+        evalMode = true;
+      }
+      if (!Array.isArray(variables) || !variables.length || !value) {
+        return;
+      }
+      var varMap = {};
+      eachTree(variables, function (item) {
+        if (item.value) {
+          var key = item.value;
+          varMap[key] = item.label;
+        }
+      });
+      var vars = Object.keys(varMap).filter(function (item) {
+        return item;
+      }).sort(function (a, b) {
+        return b.length - a.length;
+      });
+      var content = value || '';
+      var html = '';
+
+      // 标记方法调用
+      html = content.replace(/([A-Z]+)\s*\(/g, function (_, func, pos) {
+        return _ && _.replace(func, "<span class=\"c-func\">" + func + "</span>");
+      });
+      var REPLACE_KEY = 'AMIS_FORMULA_REPLACE_KEY';
+      vars.forEach(function (v) {
+        var from = 0;
+        var idx = -1;
+        while (~(idx = content.indexOf(v, from))) {
+          var encodeHtml = _this2.replaceStrByIndex(html, idx, v, REPLACE_KEY);
+          var reg = _this2.getRegExpByMode(evalMode, REPLACE_KEY);
+
+          // 如果匹配到则高亮，没有匹配到替换成原值
+          if (reg.test(encodeHtml)) {
+            html = encodeHtml.replace(REPLACE_KEY, "<span class=\"c-field\">" + varMap[v] + "</span>");
+          } else {
+            html = encodeHtml.replace(REPLACE_KEY, v);
+          }
+          from = idx + v.length;
+        }
+      });
+      return {
+        html: html
+      };
     }
   },
   beforeDestroy: function beforeDestroy() {
@@ -8736,15 +9783,15 @@ srcvue_type_template_id_6ea89ba6_render._withStripped = true
 // CONCATENATED MODULE: ./src/components/dialog/src/index.vue?vue&type=template&id=6ea89ba6&
 
 // EXTERNAL MODULE: external "element-ui/src/utils/popup"
-var popup_ = __webpack_require__(54);
+var popup_ = __webpack_require__(17);
 var popup_default = /*#__PURE__*/__webpack_require__.n(popup_);
 
 // EXTERNAL MODULE: external "element-ui/src/mixins/migrating"
-var migrating_ = __webpack_require__(55);
+var migrating_ = __webpack_require__(57);
 var migrating_default = /*#__PURE__*/__webpack_require__.n(migrating_);
 
 // EXTERNAL MODULE: external "element-ui/src/mixins/emitter"
-var emitter_ = __webpack_require__(56);
+var emitter_ = __webpack_require__(18);
 var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/dialog/src/index.vue?vue&type=script&lang=js&
@@ -8940,6 +9987,323 @@ dialog_src.install = function (Vue) {
   Vue.component(dialog_src.name, dialog_src);
 };
 /* harmony default export */ var dialog = (dialog_src);
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--5!./node_modules/vue-loader/lib??vue-loader-options!./src/components/drawer/src/index.vue?vue&type=template&id=6565c780&
+var srcvue_type_template_id_6565c780_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c
+  return _c(
+    "transition",
+    {
+      attrs: { name: "el-drawer-fade" },
+      on: { "after-enter": _vm.afterEnter, "after-leave": _vm.afterLeave },
+    },
+    [
+      _c(
+        "div",
+        {
+          directives: [
+            {
+              name: "show",
+              rawName: "v-show",
+              value: _vm.visible,
+              expression: "visible",
+            },
+          ],
+          staticClass: "el-drawer__wrapper",
+          attrs: { tabindex: "-1" },
+        },
+        [
+          _c(
+            "div",
+            {
+              staticClass: "el-drawer__container",
+              class: _vm.visible && "el-drawer__open",
+              attrs: { role: "document", tabindex: "-1" },
+              on: {
+                click: function ($event) {
+                  if ($event.target !== $event.currentTarget) return null
+                  return _vm.handleWrapperClick.apply(null, arguments)
+                },
+              },
+            },
+            [
+              _c(
+                "div",
+                {
+                  ref: "drawer",
+                  staticClass: "el-drawer drawer",
+                  class: [_vm.direction, _vm.customClass],
+                  style: _vm.isHorizontal
+                    ? `width: ${_vm.drawerSize}`
+                    : `height: ${_vm.drawerSize}`,
+                  attrs: {
+                    "aria-modal": "true",
+                    "aria-labelledby": "el-drawer__title",
+                    "aria-label": _vm.title,
+                    role: "dialog",
+                    tabindex: "-1",
+                  },
+                },
+                [
+                  _vm.withHeader
+                    ? _c(
+                        "header",
+                        {
+                          staticClass: "el-drawer__header",
+                          attrs: { id: "el-drawer__title" },
+                        },
+                        [
+                          _vm._t("title", function () {
+                            return [
+                              _c(
+                                "span",
+                                {
+                                  attrs: { role: "heading", title: _vm.title },
+                                },
+                                [_vm._v(_vm._s(_vm.title))]
+                              ),
+                            ]
+                          }),
+                          _vm.showClose
+                            ? _c(
+                                "button",
+                                {
+                                  staticClass: "el-drawer__close-btn",
+                                  attrs: {
+                                    "aria-label": `close ${
+                                      _vm.title || "drawer"
+                                    }`,
+                                    type: "button",
+                                  },
+                                  on: { click: _vm.closeDrawer },
+                                },
+                                [
+                                  _c("i", {
+                                    staticClass:
+                                      "el-dialog__close el-icon el-icon-close",
+                                  }),
+                                ]
+                              )
+                            : _vm._e(),
+                        ],
+                        2
+                      )
+                    : _vm._e(),
+                  _vm.rendered
+                    ? _c(
+                        "section",
+                        { staticClass: "el-drawer__body" },
+                        [_vm._t("default")],
+                        2
+                      )
+                    : _vm._e(),
+                  _vm.$slots.footer
+                    ? _c(
+                        "footer",
+                        { staticClass: "el-drawer__footer" },
+                        [_vm._t("footer")],
+                        2
+                      )
+                    : _vm._e(),
+                ]
+              ),
+            ]
+          ),
+        ]
+      ),
+    ]
+  )
+}
+var srcvue_type_template_id_6565c780_staticRenderFns = []
+srcvue_type_template_id_6565c780_render._withStripped = true
+
+
+// CONCATENATED MODULE: ./src/components/drawer/src/index.vue?vue&type=template&id=6565c780&
+
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/components/drawer/src/index.vue?vue&type=script&lang=js&
+
+
+/* harmony default export */ var drawer_srcvue_type_script_lang_js_ = ({
+  name: 'Drawer',
+  mixins: [popup_default.a, emitter_default.a],
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: true
+    },
+    beforeClose: {
+      type: Function
+    },
+    customClass: {
+      type: String,
+      default: ''
+    },
+    closeOnPressEscape: {
+      type: Boolean,
+      default: true
+    },
+    destroyOnClose: {
+      type: Boolean,
+      default: false
+    },
+    modal: {
+      type: Boolean,
+      default: true
+    },
+    direction: {
+      type: String,
+      default: 'rtl',
+      validator: function validator(val) {
+        return ['ltr', 'rtl', 'ttb', 'btt'].indexOf(val) !== -1;
+      }
+    },
+    modalAppendToBody: {
+      type: Boolean,
+      default: true
+    },
+    showClose: {
+      type: Boolean,
+      default: true
+    },
+    size: {
+      type: [Number, String],
+      default: '30%'
+    },
+    title: {
+      type: String,
+      default: ''
+    },
+    visible: {
+      type: Boolean
+    },
+    wrapperClosable: {
+      type: Boolean,
+      default: true
+    },
+    withHeader: {
+      type: Boolean,
+      default: true
+    }
+  },
+  computed: {
+    isHorizontal: function isHorizontal() {
+      return this.direction === 'rtl' || this.direction === 'ltr';
+    },
+    drawerSize: function drawerSize() {
+      return typeof this.size === 'number' ? this.size + "px" : this.size;
+    }
+  },
+  data: function data() {
+    return {
+      closed: false,
+      prevActiveElement: null
+    };
+  },
+  watch: {
+    visible: function visible(val) {
+      var _this = this;
+      if (val) {
+        this.closed = false;
+        this.$emit('open');
+        if (this.appendToBody) {
+          document.body.appendChild(this.$el);
+        }
+        this.prevActiveElement = document.activeElement;
+      } else {
+        if (!this.closed) {
+          this.$emit('close');
+          if (this.destroyOnClose === true) {
+            this.rendered = false;
+          }
+        }
+        this.$nextTick(function () {
+          if (_this.prevActiveElement) {
+            _this.prevActiveElement.focus();
+          }
+        });
+      }
+    }
+  },
+  methods: {
+    afterEnter: function afterEnter() {
+      this.$emit('opened');
+    },
+    afterLeave: function afterLeave() {
+      this.$emit('closed');
+    },
+    hide: function hide(cancel) {
+      if (cancel !== false) {
+        this.$emit('update:visible', false);
+        this.$emit('close');
+        if (this.destroyOnClose === true) {
+          this.rendered = false;
+        }
+        this.closed = true;
+      }
+    },
+    handleWrapperClick: function handleWrapperClick() {
+      if (this.wrapperClosable) {
+        this.closeDrawer();
+      }
+    },
+    closeDrawer: function closeDrawer() {
+      if (typeof this.beforeClose === 'function') {
+        this.beforeClose(this.hide);
+      } else {
+        this.hide();
+      }
+    },
+    handleClose: function handleClose() {
+      // This method here will be called by PopupManger, when the `closeOnPressEscape` was set to true
+      // pressing `ESC` will call this method, and also close the drawer.
+      // This method also calls `beforeClose` if there was one.
+      this.closeDrawer();
+    }
+  },
+  mounted: function mounted() {
+    if (this.visible) {
+      this.rendered = true;
+      this.open();
+      if (this.appendToBody) {
+        document.body.appendChild(this.$el);
+      }
+    }
+  },
+  destroyed: function destroyed() {
+    // if appendToBody is true, remove DOM node after destroy
+    if (this.appendToBody && this.$el && this.$el.parentNode) {
+      this.$el.parentNode.removeChild(this.$el);
+    }
+  }
+});
+// CONCATENATED MODULE: ./src/components/drawer/src/index.vue?vue&type=script&lang=js&
+ /* harmony default export */ var components_drawer_srcvue_type_script_lang_js_ = (drawer_srcvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/drawer/src/index.vue
+
+
+
+
+
+/* normalize component */
+
+var drawer_src_component = normalizeComponent(
+  components_drawer_srcvue_type_script_lang_js_,
+  srcvue_type_template_id_6565c780_render,
+  srcvue_type_template_id_6565c780_staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var drawer_src = (drawer_src_component.exports);
+// CONCATENATED MODULE: ./src/components/drawer/index.js
+
+drawer_src.install = function (Vue) {
+  Vue.component(drawer_src.name, drawer_src);
+};
+/* harmony default export */ var drawer = (drawer_src);
 // CONCATENATED MODULE: ./src/index.js
 
 
@@ -8956,7 +10320,11 @@ dialog_src.install = function (Vue) {
 
 
 
-var components = [components_form, components_form_input, components_form_item, form_group, form_dialog, form_view, form_view_group, form_view_dialog, components_table, components_table_column, table_search, table_editable, crud, formula, dialog];
+
+
+
+
+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) {
     opts = {};
@@ -8983,6 +10351,7 @@ if (typeof window !== 'undefined' && window.Vue) {
   FormItem: components_form_item,
   FormGroup: form_group,
   FormDialog: form_dialog,
+  FormDrawer: form_drawer,
   FormView: form_view,
   FormViewGroup: form_view_group,
   FormViewDialog: form_view_dialog,
@@ -8990,9 +10359,11 @@ if (typeof window !== 'undefined' && window.Vue) {
   TableColumn: components_table_column,
   TableSearch: table_search,
   TableEditable: table_editable,
+  TableOperate: table_operate,
   Crud: crud,
   Formula: formula,
-  Dialog: dialog
+  Dialog: dialog,
+  Drawer: drawer
 });
 
 /***/ })