@vue-start/element-pro 0.1.0 → 0.2.0

package/dist/index.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var vue = require('vue');
 var elementPlus = require('element-plus');
 var lodash = require('lodash');
+var pro = require('@vue-start/pro');
 var hooks = require('@vue-start/hooks');
-var request = require('@vue-start/request');
-var rxjs = require('rxjs');
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -83,201 +82,389 @@ function _nonIterableSpread() {
   throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-/**
- * ProForm ctx
- */
-var ProFormKey = Symbol("pro-form");
-var useProForm = function useProForm() {
-  return vue.inject(ProFormKey);
+var createLoadingId = function createLoadingId() {
+  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "comp";
+  return prefix + "-" + pro.generateId();
 };
-var provideProForm = function provideProForm(ctx) {
-  vue.provide(ProFormKey, ctx);
-};
-/**
- * ProFormList ctx
- */
 
-var ProFormListKey = Symbol("pro-form-list");
-var useProFormList = function useProFormList() {
-  return vue.inject(ProFormListKey);
-};
-var provideProFormList = function provideProFormList(ctx) {
-  vue.provide(ProFormListKey, ctx);
+var proLoadingProps = function proLoadingProps() {
+  return {
+    loading: {
+      type: Boolean
+    },
+    target: {
+      type: [String, Object]
+    },
+    body: {
+      type: Boolean
+    },
+    fullscreen: {
+      type: Boolean
+    },
+    lock: {
+      type: Boolean
+    },
+    text: {
+      type: String
+    },
+    spinner: {
+      type: String
+    },
+    background: {
+      type: String
+    },
+    customClass: {
+      type: String
+    }
+  };
 };
 
-/**
- * 剔除showState或showStateRules规则为!true的值
- * @param values
- * @param showState
- * @param showStateRules
- */
-var getValidValues = function getValidValues(values, showState, showStateRules) {
-  if (showState) {
-    var invalidKeys = lodash.filter(lodash.keys(showState), function (key) {
-      return !showState[key];
-    });
-    return lodash.omit(values, invalidKeys);
-  }
+var ProLoading = vue.defineComponent({
+  props: _objectSpread2({}, proLoadingProps()),
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots;
+    var id = createLoadingId();
+    hooks.useEffect(function () {
+      if (!props.loading) {
+        return;
+      }
 
-  if (showStateRules) {
-    var _invalidKeys = lodash.filter(lodash.keys(showStateRules), function (key) {
-      return !showStateRules[key](values);
-    });
+      var element = props.target;
 
-    return lodash.omit(values, _invalidKeys);
-  }
+      if (!slots["default"]) {
+        //监听
+        if (props.target && lodash.isString(props.target)) {
+          element = document.querySelector("#" + props.target);
+        }
+      } else {
+        //包裹
+        element = document.getElementById(id);
+      }
 
-  return values;
-};
-/**
- * string类型的path转为arr
- * @param path
- */
+      if (!element) {
+        return;
+      }
 
-var convertPathToList = function convertPathToList(path) {
-  if (!path) {
-    return undefined;
-  }
+      var instance = elementPlus.ElLoading.service({
+        target: element,
+        body: props.body,
+        fullscreen: props.fullscreen,
+        lock: props.lock,
+        text: props.text,
+        spinner: props.spinner,
+        background: props.background,
+        customClass: props.customClass
+      });
+      return function () {
+        instance && instance.close();
+      };
+    }, function () {
+      return props.loading;
+    });
+    return function () {
+      if (!slots["default"]) {
+        return null;
+      }
 
-  if (lodash.isArray(path)) {
-    return path;
+      return vue.createVNode("div", {
+        "id": id
+      }, [slots["default"]()]);
+    };
   }
+});
 
-  if (path && lodash.isString(path) && path.indexOf(".") > 0) {
-    return lodash.split(path, ".");
-  }
+var Content$1 = vue.defineComponent(function () {
+  var _useProTable = pro.useProTable(),
+      columns = _useProTable.columns;
+
+  return function () {
+    return vue.createVNode(vue.Fragment, null, [lodash.map(columns.value, function (item) {
+      var formatter = function formatter(record, column, value, index) {
+        if (item.customRender) {
+          return item.customRender({
+            value: value,
+            text: value,
+            record: record,
+            column: column,
+            index: index
+          });
+        }
 
-  return [path];
-};
+        return value;
+      };
 
-var proFormItemProps$1 = function proFormItemProps() {
-  return {
-    name: {
-      type: [String, Array]
-    }
+      return vue.createVNode(elementPlus.ElTableColumn, vue.mergeProps({
+        "key": item.dataIndex
+      }, lodash.omit(item, "title", "label", "renderHeader", "prop", "dataIndex", "formatter", "customRender"), {
+        "label": vue.isVNode(item.title) ? undefined : item.title || lodash.get(item, "label"),
+        "renderHeader": vue.isVNode(item.title) ? function () {
+          return item.title;
+        } : undefined,
+        "prop": item.dataIndex,
+        "formatter": formatter
+      }), null);
+    })]);
   };
-};
-
-var ProFormItem = vue.defineComponent({
-  props: _objectSpread2(_objectSpread2({}, elementPlus.ElFormItem.props), proFormItemProps$1()),
+});
+var ProTable = vue.defineComponent({
+  inheritAttrs: false,
+  props: _objectSpread2(_objectSpread2({}, elementPlus.ElTable.props), pro.ProTable.props),
   setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-    var invalidKeys = lodash.keys(proFormItemProps$1());
+    var slots = _ref.slots,
+        expose = _ref.expose,
+        attrs = _ref.attrs;
+    var id = createLoadingId("table");
+    var tableRef = vue.ref();
+    expose({
+      tableRef: tableRef
+    });
+    var originKeys = lodash.keys(pro.ProTable.props);
     return function () {
-      return vue.createVNode(elementPlus.ElFormItem, vue.mergeProps(lodash.omit.apply(void 0, [props].concat(_toConsumableArray(invalidKeys), ["name", "prop"])), {
-        "prop": props.prop || props.name
-      }), slots);
+      var _slots$top, _slots$default;
+
+      return vue.createVNode(pro.ProTable, vue.mergeProps(lodash.pick.apply(void 0, [props].concat(_toConsumableArray(originKeys), ["provideExtra"])), {
+        "provideExtra": _objectSpread2({
+          tableRef: tableRef
+        }, props.provideExtra)
+      }), {
+        "default": function _default() {
+          return [vue.createVNode(elementPlus.ElTable, vue.mergeProps({
+            "ref": tableRef,
+            "id": id
+          }, attrs, lodash.omit(props, originKeys)), _objectSpread2({
+            "default": function _default() {
+              return [(_slots$top = slots.top) === null || _slots$top === void 0 ? void 0 : _slots$top.call(slots), vue.createVNode(Content$1, null, null), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots), props.loading && vue.createVNode(ProLoading, {
+                "target": id,
+                "loading": true
+              }, null)];
+            }
+          }, lodash.omit(slots, "default")))];
+        }
+      });
     };
   }
 });
 
-var proFormProps = function proFormProps() {
+var defaultPage = {
+  page: 1,
+  pageSize: 10
+};
+
+var proListProps = function proListProps() {
   return {
     /**
-     *  子组件是否只读样式
+     * extra 是否放到SearchForm中
      */
-    readonly: {
+    extraInSearch: {
       type: Boolean,
       "default": undefined
     },
-
-    /**
-     *  FormComponent 根据此项来确定组件是否显示
-     *  rules 根据rules中方法生成showState对象
-     */
-    showState: {
+    //search
+    searchProps: {
       type: Object
     },
-    showStateRules: {
+    //table
+    tableProps: {
       type: Object
     },
-
-    /**
-     * 是否只读
-     */
-    readonlyState: {
+    //pagination
+    paginationProps: {
       type: Object
     },
-    readonlyStateRules: {
+    //pageState
+    pageState: {
       type: Object
-    },
+    }
+  };
+};
+
+var ProList = vue.defineComponent({
+  props: _objectSpread2({}, proListProps()),
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots,
+        emit = _ref.emit;
+
+    /******************* search pagination ********************/
+    var pageState = props.pageState || vue.reactive(_objectSpread2({}, defaultPage));
+    var prevValues;
+
+    var handleSearch = function handleSearch() {
+      emit("list", _objectSpread2(_objectSpread2({}, prevValues), pageState));
+    }; //页数重置1 且搜索
+
+
+    var executeSearchWithResetPage = function executeSearchWithResetPage(values) {
+      prevValues = values;
+      pageState.page = 1;
+      handleSearch();
+    };
+
+    return function () {
+      var _slots$divide, _slots$divide2, _slots$footerLeft, _slots$footerRight;
+
+      var searchProps = props.searchProps;
+      var tableProps = props.tableProps;
+      var paginationProps = props.paginationProps; //操作按钮
+
+      var extra = slots.extra ? vue.createVNode("div", {
+        "class": "pro-list-search"
+      }, [slots.extra()]) : null; //分页参数
+
+      var pagination = _objectSpread2(_objectSpread2({}, paginationProps), {}, {
+        currentPage: pageState.page,
+        pageSize: pageState.pageSize,
+        onSizeChange: function onSizeChange(pageSize) {
+          pageState.pageSize = pageSize;
+          handleSearch();
+        },
+        onCurrentChange: function onCurrentChange(current) {
+          pageState.page = current;
+          handleSearch();
+        }
+      });
+
+      return vue.createVNode(vue.Fragment, null, [vue.createVNode(ProSearchForm, vue.mergeProps(searchProps, {
+        "onFinish": executeSearchWithResetPage
+      }), {
+        "default": function _default() {
+          return [props.extraInSearch && extra];
+        }
+      }), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), !props.extraInSearch && extra, slots["default"] ? slots["default"]() : vue.createVNode(ProTable, vue.mergeProps({
+        "pagination": {
+          page: pageState.page,
+          pageSize: pageState.pageSize
+        }
+      }, lodash.omit(tableProps, "slots")), tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), vue.createVNode("div", {
+        "class": "pro-list-footer"
+      }, [(_slots$footerLeft = slots.footerLeft) === null || _slots$footerLeft === void 0 ? void 0 : _slots$footerLeft.call(slots), lodash.isNumber(paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.total) && paginationProps.total > 0 && vue.createVNode(vue.Fragment, null, [slots.pagination ? slots.pagination(pagination) : vue.createVNode(elementPlus.ElPagination, pagination, null)]), (_slots$footerRight = slots.footerRight) === null || _slots$footerRight === void 0 ? void 0 : _slots$footerRight.call(slots)])]);
+    };
+  }
+});
+
+function _isSlot$1(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !vue.isVNode(s);
+}
 
+var proGridProps = function proGridProps() {
+  return {
     /**
-     * 是否disabled
+     * row属性
      */
-    disableState: {
-      type: Object
-    },
-    disableStateRules: {
-      type: Object
+    row: {
+      type: Object,
+      "default": undefined
     },
 
     /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+     * 公共col属性
      */
-    elementMap: {
+    col: {
       type: Object
     },
 
     /**
-     * provide传递
+     *
      */
-    provideExtra: {
-      type: Object
+    items: {
+      type: Array
     }
   };
 };
 
-//emit;
-var ProForm = vue.defineComponent({
-  props: _objectSpread2(_objectSpread2({}, elementPlus.ElForm.props), proFormProps()),
-  setup: function setup(props, _ref2) {
-    var slots = _ref2.slots,
-        expose = _ref2.expose,
-        emit = _ref2.emit;
-    var form = vue.ref();
-    var formState = props.model || vue.reactive({}); //组件状态相关
-
-    var showState = props.showState || vue.reactive({});
-    var readonlyState = props.readonlyState || vue.reactive({});
-    var disableState = props.disableState || vue.reactive({}); //formState改变情况下，更新 showState，readonlyState，disableState状态
+var ProGrid = vue.defineComponent({
+  props: _objectSpread2({}, proGridProps()),
+  setup: function setup(props) {
+    return function () {
+      var _slot;
 
-    hooks.useEffect(function () {
-      if (props.showStateRules) {
-        lodash.forEach(props.showStateRules, function (fn, key) {
-          showState[key] = fn(formState);
+      return vue.createVNode(elementPlus.ElRow, props.row, _isSlot$1(_slot = lodash.map(props.items, function (item) {
+        return vue.createVNode(elementPlus.ElCol, vue.mergeProps({
+          "key": item.rowKey
+        }, props.col, item.col), {
+          "default": function _default() {
+            return [item.vNode];
+          }
         });
-      }
+      })) ? _slot : {
+        "default": function _default() {
+          return [_slot];
+        }
+      });
+    };
+  }
+});
 
-      if (props.readonlyStateRules) {
-        lodash.forEach(props.readonlyStateRules, function (fn, key) {
-          readonlyState[key] = fn(formState);
-        });
+var proFormItemProps = function proFormItemProps() {
+  return {
+    name: {
+      type: [String, Array]
+    }
+  };
+};
+
+var ProFormItem = vue.defineComponent({
+  props: _objectSpread2(_objectSpread2({}, elementPlus.ElFormItem.props), proFormItemProps()),
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots;
+    var invalidKeys = lodash.keys(proFormItemProps());
+    return function () {
+      return vue.createVNode(elementPlus.ElFormItem, vue.mergeProps(lodash.omit.apply(void 0, [props].concat(_toConsumableArray(invalidKeys), ["name", "prop"])), {
+        "prop": props.prop || props.name
+      }), slots);
+    };
+  }
+});
+//emit;
+var Content = vue.defineComponent({
+  props: _objectSpread2(_objectSpread2({}, ProGrid.props), {}, {
+    needRules: {
+      type: Boolean
+    }
+  }),
+  setup: function setup(props) {
+    var _useProForm = pro.useProForm(),
+        formElementMap = _useProForm.formElementMap,
+        columns = _useProForm.columns;
+
+    return function () {
+      if (!formElementMap || lodash.size(columns.value) <= 0) {
+        return null;
       }
 
-      if (props.disableStateRules) {
-        lodash.forEach(props.disableStateRules, function (fn, key) {
-          disableState[key] = fn(formState);
+      if (!props.row) {
+        return lodash.map(columns.value, function (item) {
+          return pro.getFormItemEl(formElementMap, item, props.needRules);
         });
       }
-    }, formState); //转换为ref对象
 
-    var readonly = vue.computed(function () {
-      return props.readonly;
-    });
-    provideProForm(_objectSpread2({
-      formRef: form,
-      formState: formState,
-      showState: showState,
-      readonlyState: readonlyState,
-      disableState: disableState,
-      //
-      elementMap: props.elementMap,
-      //
-      readonly: readonly
-    }, props.provideExtra));
-
-    var formRef = function formRef(el) {
+      return vue.createVNode(ProGrid, {
+        "row": props.row,
+        "col": props.col,
+        "items": lodash.map(columns.value, function (item) {
+          var vNode = pro.getFormItemEl(formElementMap, item, props.needRules);
+          return {
+            rowKey: pro.getColumnFormItemName(item),
+            vNode: vNode,
+            col: lodash.get(item, ["extra", "col"])
+          };
+        })
+      }, null);
+    };
+  }
+});
+var ProForm = vue.defineComponent({
+  inheritAttrs: false,
+  props: _objectSpread2(_objectSpread2(_objectSpread2({}, elementPlus.ElForm.props), lodash.omit(pro.ProForm.props, "model")), lodash.omit(ProGrid.props, "items")),
+  setup: function setup(props, _ref2) {
+    var slots = _ref2.slots,
+        expose = _ref2.expose,
+        emit = _ref2.emit,
+        attrs = _ref2.attrs;
+    var formRef = vue.ref();
+    var formState = props.model || vue.reactive({});
+    var showState = props.showState || vue.reactive({});
+
+    var handleRef = function handleRef(el) {
       var nexEl = _objectSpread2(_objectSpread2({}, el), {}, {
         submit: function submit() {
           var _el$validate;
@@ -286,7 +473,7 @@ var ProForm = vue.defineComponent({
             if (isValid) {
               //验证成功
               //删除不显示的值再触发事件
-              var _showValues = getValidValues(formState, showState, props.showStateRules);
+              var _showValues = pro.getValidValues(formState, showState, props.showStateRules);
 
               emit("finish", _showValues, vue.toRaw(formState));
             } else {
@@ -297,440 +484,96 @@ var ProForm = vue.defineComponent({
       });
 
       expose(nexEl);
-      form.value = nexEl;
+      formRef.value = nexEl;
     };
 
-    var invalidKeys = lodash.keys(proFormProps());
+    var originKeys = lodash.keys(lodash.omit(pro.ProForm.props, "model"));
+    var gridKeys = lodash.keys(ProGrid.props);
     return function () {
-      return vue.createVNode(elementPlus.ElForm, vue.mergeProps({
-        "ref": formRef
-      }, lodash.omit.apply(void 0, [props].concat(_toConsumableArray(invalidKeys), ["model"])), {
-        "model": formState
-      }), slots);
+      var _slots$top, _slots$default;
+
+      return vue.createVNode(pro.ProForm, vue.mergeProps(lodash.pick.apply(void 0, [props].concat(_toConsumableArray(originKeys), ["provideExtra"])), {
+        "model": formState,
+        "showState": showState,
+        "provideExtra": _objectSpread2({
+          formRef: formRef
+        }, props.provideExtra)
+      }), {
+        "default": function _default() {
+          return [vue.createVNode(elementPlus.ElForm, vue.mergeProps({
+            "ref": handleRef
+          }, attrs, lodash.omit.apply(void 0, [props].concat(_toConsumableArray(originKeys), ["model"], _toConsumableArray(gridKeys))), {
+            "model": formState
+          }), {
+            "default": function _default() {
+              return [(_slots$top = slots.top) === null || _slots$top === void 0 ? void 0 : _slots$top.call(slots), vue.createVNode(Content, vue.mergeProps(lodash.pick(props, gridKeys), {
+                "needRules": props.needRules
+              }), null), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+            }
+          })];
+        }
+      });
     };
   }
 });
 
-var ProModuleKey = Symbol("pro-module");
-var useProModule = function useProModule() {
-  return vue.inject(ProModuleKey);
-};
-var provideProModule = function provideProModule(ctx) {
-  vue.provide(ProModuleKey, ctx);
-};
-
-/**
- * 获取Column的valueType，默认"text"
- * @param column
- */
-
-var getColumnValueType = function getColumnValueType(column) {
-  return column.formValueType || column.valueType || "text";
-};
-/**
- *获取Column的FormItem name
- * @param column
- */
+var ProSearchForm = vue.defineComponent({
+  inheritAttrs: false,
+  props: _objectSpread2(_objectSpread2(_objectSpread2({}, lodash.omit(ProForm.props, "inline")), lodash.omit(pro.ProSearchForm.props, "model", "columns")), {}, {
+    inline: {
+      type: Boolean,
+      "default": true
+    }
+  }),
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots,
+        attrs = _ref.attrs;
+    var formRef = vue.ref();
+    var formState = props.model || vue.reactive({});
+    var originKeys = lodash.keys(lodash.omit(pro.ProSearchForm.props, "model", "columns"));
+    return function () {
+      return vue.createVNode(vue.Fragment, null, [vue.createVNode(ProForm, vue.mergeProps({
+        "ref": formRef
+      }, attrs, lodash.omit.apply(void 0, [props].concat(_toConsumableArray(originKeys), ["needRules", "model"])), {
+        "model": formState,
+        "needRules": false
+      }), slots), vue.createVNode(pro.ProSearchForm, vue.mergeProps(lodash.pick(props, originKeys), {
+        "model": formState,
+        "columns": props.columns,
+        "onFinish": function onFinish() {
+          var _formRef$value;
+
+          (_formRef$value = formRef.value) === null || _formRef$value === void 0 ? void 0 : _formRef$value.submit();
+        }
+      }), null)]);
+    };
+  }
+});
 
-var getColumnFormItemName = function getColumnFormItemName(column) {
-  var _column$formItemProps;
+var createFormItemComponent = pro.createFormItemCompFn(ProFormItem, function (value, setValue, disabled) {
+  return {
+    modelValue: value,
+    "onUpdate:modelValue": setValue,
+    clearable: true,
+    disabled: disabled
+  };
+});
 
-  return ((_column$formItemProps = column.formItemProps) === null || _column$formItemProps === void 0 ? void 0 : _column$formItemProps.name) || column.dataIndex;
+var proSelectProps = function proSelectProps() {
+  return {
+    options: Array
+  };
 };
-/**
- * 根据Column生成FormItem VNode
- * formFieldProps中的slots参数会以v-slots的形式传递到FormItem的录入组件（子组件）中
- * @param formElementMap
- * @param column
- * @param needRules
- */
 
-var getFormItemEl = function getFormItemEl(formElementMap, column) {
-  var _column$formFieldProp;
-
-  var needRules = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var valueType = getColumnValueType(column);
-  var Comp = lodash.get(formElementMap, valueType);
-
-  if (!Comp) {
-    return null;
-  }
-
-  var name = getColumnFormItemName(column);
-  var itemProps = needRules ? column.formItemProps : lodash.omit(column.formItemProps, "rules");
-  return vue.createVNode(Comp, vue.mergeProps({
-    "key": name,
-    "name": name,
-    "label": column.title
-  }, itemProps, {
-    "fieldProps": lodash.omit(column.formFieldProps, "slots"),
-    "showProps": column.showProps
-  }), (_column$formFieldProp = column.formFieldProps) === null || _column$formFieldProp === void 0 ? void 0 : _column$formFieldProp.slots);
-};
-/**
- *  根据Column生成Item VNode
- * @param elementMap
- * @param column
- * @param value
- */
-
-var getItemEl = function getItemEl(elementMap, column, value) {
-  var _column$formFieldProp2;
-
-  var valueType = column.valueType || "text";
-  var Comp = lodash.get(elementMap, valueType);
-
-  if (!Comp) {
-    return null;
-  }
-
-  return vue.createVNode(Comp, vue.mergeProps(lodash.omit(column.formFieldProps, "slots"), {
-    "showProps": column.showProps,
-    "value": value
-  }), (_column$formFieldProp2 = column.formFieldProps) === null || _column$formFieldProp2 === void 0 ? void 0 : _column$formFieldProp2.slots);
-};
-
-var proModuleProps = function proModuleProps() {
-  return {
-    /**
-     * 配置（静态）
-     */
-    columns: {
-      type: Array
-    },
-
-    /**
-     * 配置（动态）
-     * columns动态属性兼容
-     */
-    columnState: {
-      type: Object
-    },
-
-    /**
-     * 展示组件集
-     */
-    elementMap: {
-      type: Object
-    },
-
-    /**
-     * 录入组件集
-     */
-    formElementMap: {
-      type: Object
-    }
-  };
-};
-
-var ProModule = vue.defineComponent({
-  name: "PModule",
-  props: _objectSpread2({}, proModuleProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-
-    /**
-     * columns columnState 合并
-     */
-    var columns = vue.computed(function () {
-      return lodash.map(props.columns, function (item) {
-        //如果columnState中有值，merge处理
-        var mapData = lodash.get(props.columnState, getColumnFormItemName(item));
-
-        if (lodash.isObject(mapData) && !lodash.isEmpty(mapData) && !lodash.isArray(mapData) && !lodash.isFunction(mapData)) {
-          //合并
-          return lodash.mergeWith(item, mapData, function (objValue, srcValue) {
-            //如果是数组，替换
-            if (lodash.isArray(objValue) || lodash.isArray(srcValue)) {
-              return srcValue;
-            }
-          });
-        }
-
-        return item;
-      });
-    }); // 获取FormItem VNode
-
-    var getFormItemVNode = function getFormItemVNode(column) {
-      var needRules = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      return getFormItemEl(props.formElementMap, column, needRules);
-    }; // 获取Item VNode
-
-
-    var getItemVNode = function getItemVNode(column, value) {
-      return getItemEl(props.elementMap, column, value);
-    };
-
-    provideProModule({
-      columns: columns,
-      getFormItemVNode: getFormItemVNode,
-      getItemVNode: getItemVNode,
-      elementMap: props.elementMap,
-      formElementMap: props.formElementMap
-    });
-    return function () {
-      var _slots$default;
-
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
-    };
-  }
-});
-
-var proSchemaFormProps = function proSchemaFormProps() {
-  return {
-    columns: {
-      type: Array
-    },
-
-    /**
-     * 录入控件集合，通过column->valueType 查找对应的录入组件
-     */
-    formElementMap: {
-      type: Object
-    },
-
-    /**
-     * 是否启用rules验证
-     */
-    needRules: {
-      type: Boolean,
-      "default": true
-    }
-  };
-};
-
-var ProSchemaForm = vue.defineComponent({
-  name: "PSchemaForm",
-  props: _objectSpread2(_objectSpread2({}, ProForm.props), proSchemaFormProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        expose = _ref.expose;
-    var formItemList = vue.computed(function () {
-      if (!props.formElementMap || lodash.size(props.formElementMap) <= 0) {
-        return null;
-      }
-
-      return lodash.map(props.columns, function (item) {
-        return getFormItemEl(props.formElementMap, item, props.needRules);
-      });
-    });
-    var invalidKeys = lodash.keys(proSchemaFormProps());
-    return function () {
-      var _slots$default;
-
-      return vue.createVNode(ProForm, vue.mergeProps({
-        "ref": function ref(el) {
-          return expose(el);
-        }
-      }, lodash.omit(props, invalidKeys)), {
-        "default": function _default() {
-          return [formItemList.value, (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
-        }
-      });
-    };
-  }
-});
-
-exports.SearchMode = void 0;
-
-(function (SearchMode) {
-  SearchMode["AUTO"] = "AUTO";
-  SearchMode["MANUAL"] = "MANUAL";
-})(exports.SearchMode || (exports.SearchMode = {}));
-
-var proSearchFormProps = function proSearchFormProps() {
-  return {
-    /**
-     * 初始化触发 onFinish
-     */
-    initEmit: {
-      type: Boolean,
-      "default": true
-    },
-
-    /**
-     *  模式 自动触发或者手动触发 onFinish
-     */
-    searchMode: {
-      type: String,
-      "default": exports.SearchMode.AUTO
-    },
-
-    /**
-     * 需要debounce处理的字段
-     */
-    debounceKeys: {
-      type: Array
-    },
-    debounceTime: {
-      type: Number,
-      "default": 800
-    },
-    //
-    inline: {
-      type: Boolean,
-      "default": true
-    }
-  };
-};
-
-var ProSearchForm = vue.defineComponent({
-  name: "PSearchForm",
-  props: _objectSpread2(_objectSpread2({}, lodash.omit(ProSchemaForm.props, "inline")), proSearchFormProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        emit = _ref.emit,
-        expose = _ref.expose;
-    var formState = props.model || vue.reactive({});
-
-    var handleFinish = function handleFinish() {
-      var values = vue.toRaw(formState);
-      var showValues = getValidValues(values, props.showState, props.showStateRules);
-      emit("finish", showValues, values);
-    };
-
-    var debounceFinish = lodash.debounce(function () {
-      handleFinish();
-    }, props.debounceTime); //初始化
-
-    hooks.useEffect(function () {
-      if (props.initEmit) {
-        handleFinish();
-      }
-    }, []);
-
-    var isDebounceDataChange = function isDebounceDataChange(state, prevState, debounceKeys) {
-      return lodash.some(debounceKeys, function (key) {
-        return lodash.get(state, key) !== lodash.get(prevState, key);
-      });
-    }; //监听
-
-
-    hooks.useEffect(function (state, prevState) {
-      if (props.searchMode !== exports.SearchMode.AUTO) {
-        return;
-      } //如果改变的值中包括debounceKeys中注册的 延时触发
-
-
-      if (props.debounceKeys && lodash.size(props.debounceKeys) > 0 && isDebounceDataChange(state, prevState, props.debounceKeys)) {
-        debounceFinish();
-        return;
-      }
-
-      handleFinish();
-    }, function () {
-      return lodash.clone(formState);
-    });
-    var invalidKeys = lodash.keys(proSearchFormProps());
-    return function () {
-      return vue.createVNode(ProSchemaForm, vue.mergeProps({
-        "ref": function ref(el) {
-          return expose(el);
-        },
-        "inline": props.inline
-      }, lodash.omit.apply(void 0, [props].concat(_toConsumableArray(invalidKeys), ["model"])), {
-        "needRules": false,
-        "model": formState
-      }), slots);
-    };
-  }
-});
-
-var proFormItemProps = function proFormItemProps() {
-  return {
-    readonly: {
-      type: Boolean,
-      "default": undefined
-    },
-    fieldProps: {
-      type: Object
-    },
-    showProps: {
-      type: Object
-    }
-  };
-};
-
-var createFormItemComponent = function createFormItemComponent(_ref) {
-  var InputComp = _ref.InputComp,
-      valueType = _ref.valueType,
-      name = _ref.name;
-  return vue.defineComponent({
-    name: name,
-    props: _objectSpread2(_objectSpread2({}, ProFormItem.props), proFormItemProps()),
-    setup: function setup(props, _ref2) {
-      var slots = _ref2.slots;
-
-      var _useProForm = useProForm(),
-          formState = _useProForm.formState,
-          showState = _useProForm.showState,
-          readonlyState = _useProForm.readonlyState,
-          disableState = _useProForm.disableState,
-          formReadonly = _useProForm.readonly,
-          elementMap = _useProForm.elementMap;
-
-      var formListCtx = useProFormList(); //优先级 props.readonly > readonlyState > formContext.readonly
-
-      var readonly = vue.computed(function () {
-        if (lodash.isBoolean(props.readonly)) {
-          return props.readonly;
-        } else if (lodash.isBoolean(readonlyState[props.name])) {
-          return readonlyState[props.name];
-        }
-
-        return formReadonly.value;
-      });
-      var nameList = convertPathToList(props.name);
-      var path = formListCtx !== null && formListCtx !== void 0 && formListCtx.pathList ? [].concat(_toConsumableArray(formListCtx.pathList), _toConsumableArray(nameList)) : nameList;
-      var invalidKeys = lodash.keys(proFormItemProps());
-      return function () {
-        var show = lodash.get(showState, props.name);
-
-        if (lodash.isBoolean(show) && !show) {
-          return null;
-        }
-
-        var value = lodash.get(formState, path); //valueType对应的展示组件
-
-        var ShowComp = lodash.get(elementMap, valueType);
-        return vue.createVNode(ProFormItem, vue.mergeProps(lodash.omit.apply(void 0, [props].concat(_toConsumableArray(invalidKeys), ["name"])), {
-          "name": path
-        }), {
-          "default": function _default() {
-            return [readonly.value ? vue.createVNode(vue.Fragment, null, [ShowComp ? vue.createVNode(ShowComp, vue.mergeProps({
-              "value": value
-            }, props.fieldProps, {
-              "showProps": props.showProps
-            }), slots) : vue.createVNode("span", null, [value])]) : vue.createVNode(InputComp, vue.mergeProps({
-              "modelValue": value,
-              "onUpdate:modelValue": function onUpdateModelValue(v) {
-                lodash.set(formState, path, v);
-              },
-              "clearable": true,
-              "disabled": lodash.get(disableState, props.name)
-            }, props.fieldProps), slots)];
-          }
-        });
-      };
-    }
-  });
-};
-
-var proSelectProps = function proSelectProps() {
-  return {
-    options: Array
-  };
-};
-
-var ProSelect = vue.defineComponent({
-  name: "PSelect",
-  props: _objectSpread2(_objectSpread2({}, elementPlus.ElSelect.props), proSelectProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        emit = _ref.emit;
-    var invalidKeys = lodash.keys(proSelectProps());
-    return function () {
-      var _slots$default;
+var ProSelect = vue.defineComponent({
+  name: "PSelect",
+  props: _objectSpread2(_objectSpread2({}, elementPlus.ElSelect.props), proSelectProps()),
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots,
+        emit = _ref.emit;
+    var invalidKeys = lodash.keys(proSelectProps());
+    return function () {
+      var _slots$default;
 
       return vue.createVNode(elementPlus.ElSelect, vue.mergeProps(lodash.omit(props, invalidKeys), {
         "onUpdate:modelValue": function onUpdateModelValue(v) {
@@ -765,720 +608,117 @@ var ProFormDatePicker = createFormItemComponent({
   name: "PFormDate"
 });
 var ProFormTimePicker = createFormItemComponent({
-  InputComp: elementPlus.ElTimePicker,
-  valueType: "time",
-  name: "PFormTime"
-});
-var ProFormSelect = createFormItemComponent({
-  InputComp: ProSelect,
-  valueType: "select",
-  name: "PFormSelect"
-});
-var ProFormTreeSelect = createFormItemComponent({
-  InputComp: elementPlus.ElTreeSelect,
-  valueType: "treeSelect",
-  name: "PFormTreeSelect"
-});
-var ProFormCheckbox = createFormItemComponent({
-  InputComp: elementPlus.ElCheckboxGroup,
-  valueType: "checkbox",
-  name: "PFromCheckbox"
-});
-var ProFormRadio = createFormItemComponent({
-  InputComp: elementPlus.ElRadioGroup,
-  valueType: "radio",
-  name: "PFromRadio"
-});
-var ProFormSwitch = createFormItemComponent({
-  InputComp: elementPlus.ElSwitch,
-  valueType: "switch",
-  name: "PFromSwitch"
-});
-var ProFormCascader = createFormItemComponent({
-  InputComp: elementPlus.ElCascader,
-  valueType: "cascader",
-  name: "PFormCascader"
-});
-var ProSubmitButton = vue.defineComponent({
-  props: _objectSpread2({}, elementPlus.ElButton.props),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        emit = _ref.emit;
-
-    var _useProForm = useProForm(),
-        formRef = _useProForm.formRef;
-
-    var handleClick = function handleClick(e) {
-      var _formRef$value, _formRef$value$submit;
-
-      emit("click", e);
-      (_formRef$value = formRef.value) === null || _formRef$value === void 0 ? void 0 : (_formRef$value$submit = _formRef$value.submit) === null || _formRef$value$submit === void 0 ? void 0 : _formRef$value$submit.call(_formRef$value);
-    };
-
-    return function () {
-      return vue.createVNode(elementPlus.ElButton, vue.mergeProps({
-        "onClick": handleClick
-      }, props), slots);
-    };
-  }
-});
-
-var FormListProvider = vue.defineComponent({
-  props: {
-    pathList: {
-      type: Array
-    }
-  },
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-    provideProFormList({
-      pathList: props.pathList
-    });
-    return function () {
-      var _slots$default;
-
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
-    };
-  }
-});
-
-var proFormListProps = function proFormListProps() {
-  return {
-    addButtonText: {
-      type: String,
-      "default": "添加一项"
-    },
-    addButtonProps: {
-      type: Object
-    },
-    //每行默认id
-    rowKey: {
-      type: String,
-      "default": "id"
-    }
-  };
-};
-
-var ProFormList = vue.defineComponent({
-  name: "PFormList",
-  props: _objectSpread2(_objectSpread2({}, ProFormItem.props), proFormListProps()),
-  setup: function setup(props, _ref2) {
-    var slots = _ref2.slots;
-
-    var _useProForm = useProForm(),
-        formState = _useProForm.formState,
-        readonly = _useProForm.readonly;
-
-    var formListCtx = useProFormList();
-    var nameList = convertPathToList(props.prop);
-    var path = formListCtx !== null && formListCtx !== void 0 && formListCtx.pathList ? [].concat(_toConsumableArray(formListCtx.pathList), _toConsumableArray(nameList)) : nameList;
-
-    var handleAdd = function handleAdd() {
-      var targetList = lodash.get(formState, path);
-
-      if (!lodash.isArray(targetList)) {
-        targetList = [];
-      }
-
-      targetList.push(_defineProperty({}, props.rowKey, new Date().valueOf()));
-      lodash.set(formState, path, targetList);
-    };
-
-    var handleRemove = function handleRemove(index) {
-      var targetList = lodash.get(formState, path);
-
-      if (lodash.size(targetList) <= 0) {
-        return;
-      }
-
-      targetList.splice(index, 1);
-    };
-
-    var invalidKeys = lodash.keys(proFormListProps());
-    return function () {
-      return vue.createVNode(ProFormItem, lodash.omit(props, invalidKeys), {
-        "default": function _default() {
-          return [lodash.map(lodash.get(formState, path), function (item, index) {
-            var _slots$default2;
-
-            return vue.createVNode(FormListProvider, {
-              "key": index,
-              "pathList": [].concat(_toConsumableArray(path), [index])
-            }, {
-              "default": function _default() {
-                return [vue.createVNode("div", {
-                  "class": "pro-form-list-item"
-                }, [(_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots), !readonly.value && vue.createVNode("div", {
-                  "class": "pro-form-list-item-minus",
-                  "onClick": function onClick() {
-                    return handleRemove(index);
-                  }
-                }, [slots.minus ? slots.minus() : vue.createVNode(elementPlus.ElButton, {
-                  "link": true
-                }, {
-                  "default": function _default() {
-                    return [vue.createTextVNode("\u5220\u9664")];
-                  }
-                })])])];
-              }
-            });
-          }), !readonly.value && vue.createVNode("div", {
-            "class": "pro-form-list-item-add",
-            "onClick": handleAdd
-          }, [slots.add ? slots.add() : vue.createVNode(elementPlus.ElButton, vue.mergeProps({
-            "type": "primary"
-          }, props.addButtonProps), {
-            "default": function _default() {
-              return [props.addButtonText];
-            }
-          })])];
-        }
-      });
-    };
-  }
-});
-
-var proTableProps = function proTableProps() {
-  return {
-    //操作栏
-    operate: {
-      type: Object
-    },
-    //默认空字符串
-    columnEmptyText: {
-      type: String
-    },
-
-    /**
-     * 公共column，会merge到columns item中
-     */
-    column: {
-      type: Object
-    },
-    //
-    columns: {
-      type: Array
-    },
-
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
-     */
-    elementMap: {
-      type: Object
-    }
-  };
-};
-
-var ProTable = vue.defineComponent({
-  props: _objectSpread2(_objectSpread2({}, elementPlus.ElTable.props), proTableProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        expose = _ref.expose;
-    var columns = vue.computed(function () {
-      //根据valueType选择对应的展示组件
-      var columns = lodash.map(props.columns, function (item) {
-        //merge从共item
-        var nextItem = lodash.merge(props.column, item);
-
-        if (!item.customRender || !item.formatter) {
-          nextItem.customRender = function (_ref2) {
-            var text = _ref2.text;
-            return getItemEl(props.elementMap, _objectSpread2(_objectSpread2({}, item), {}, {
-              showProps: _objectSpread2(_objectSpread2({}, item.showProps), {}, {
-                content: props.columnEmptyText
-              })
-            }), text) || text || props.columnEmptyText;
-          };
-        }
-
-        return nextItem;
-      });
-      var operate = props.operate; //处理operate
-
-      if (operate && lodash.size(operate.items) > 0) {
-        //将itemState补充的信息拼到item中
-        var completeItems = lodash.map(operate.items, function (i) {
-          return _objectSpread2(_objectSpread2({}, i), lodash.get(operate.itemState, i.value));
-        }); //排序
-
-        var operateList = lodash.sortBy(completeItems, function (item) {
-          return item.sort;
-        });
-        columns.push(_objectSpread2(_objectSpread2({
-          title: "操作",
-          valueType: "option",
-          fixed: "right"
-        }, props.column), {}, {
-          customRender: function customRender(_ref3) {
-            var record = _ref3.record;
-            var validList = lodash.filter(operateList, function (item) {
-              if (item.show && lodash.isFunction(item.show)) {
-                return item.show(record);
-              }
-
-              return true;
-            });
-            return vue.createVNode("div", {
-              "class": "pro-table-operate"
-            }, [lodash.map(validList, function (item) {
-              // 自定义
-              if (lodash.isFunction(item.element)) {
-                return item.element(record, item);
-              }
-
-              return vue.createVNode(elementPlus.ElButton, {
-                "key": item.value,
-                "link": true,
-                "disabled": lodash.isFunction(item.disabled) ? item.disabled(record) : item.disabled,
-                "onClick": function onClick() {
-                  var _item$onClick;
-
-                  (_item$onClick = item.onClick) === null || _item$onClick === void 0 ? void 0 : _item$onClick.call(item, record);
-                }
-              }, {
-                "default": function _default() {
-                  return [item.label];
-                }
-              });
-            })]);
-          }
-        }, operate.column));
-      }
-
-      return columns;
-    });
-    var invalidKeys = lodash.keys(proTableProps());
-    return function () {
-      var _slots$default;
-
-      return vue.createVNode(elementPlus.ElTable, vue.mergeProps({
-        "ref": function ref(el) {
-          expose(el);
-        }
-      }, lodash.omit(props, invalidKeys)), _objectSpread2({
-        "default": function _default() {
-          return [lodash.map(columns.value, function (item) {
-            var formatter = function formatter(record, column, value, index) {
-              if (item.formatter) {
-                return item.formatter(record, column, value, index);
-              }
-
-              if (item.customRender) {
-                return item.customRender({
-                  value: value,
-                  text: value,
-                  record: record,
-                  column: column
-                });
-              }
-
-              return null;
-            };
-
-            return vue.createVNode(elementPlus.ElTableColumn, vue.mergeProps({
-              "key": item.dataIndex || item.prop
-            }, lodash.omit(item, "title", "label", "renderHeader", "prop", "dataIndex", "formatter", "customRender"), {
-              "label": vue.isVNode(item.title) ? undefined : item.title || item.label,
-              "renderHeader": vue.isVNode(item.title) ? function () {
-                return item.title;
-              } : undefined,
-              "prop": item.dataIndex || item.prop,
-              "formatter": item.formatter || item.customRender ? formatter : undefined
-            }), null);
-          }), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
-        }
-      }, lodash.omit(slots, "default")));
-    };
-  }
-});
-
-var ProCurdModuleKey = Symbol("pro-curd-module");
-var useProCurdModule = function useProCurdModule() {
-  return vue.inject(ProCurdModuleKey);
-};
-var provideProCurdModule = function provideProCurdModule(ctx) {
-  vue.provide(ProCurdModuleKey, ctx);
-};
-
-/**
- * curd 操作模式
- */
-exports.CurdCurrentMode = void 0;
-
-(function (CurdCurrentMode) {
-  CurdCurrentMode["ADD"] = "ADD";
-  CurdCurrentMode["EDIT"] = "EDIT";
-  CurdCurrentMode["DETAIL"] = "DETAIL";
-})(exports.CurdCurrentMode || (exports.CurdCurrentMode = {}));
-
-/**
- * curd add 模式下 标记 "确定" "确定并继续" 触发
- */
-exports.CurdAddAction = void 0;
-
-(function (CurdAddAction) {
-  CurdAddAction["NORMAL"] = "NORMAL";
-  CurdAddAction["CONTINUE"] = "CONTINUE";
-})(exports.CurdAddAction || (exports.CurdAddAction = {}));
-
-var proCurdModuleProps = function proCurdModuleProps() {
-  return {
-    /**
-     * 状态
-     */
-    curdState: {
-      type: Object
-    },
-
-    /**
-     * 操作配置
-     */
-    operate: {
-      type: Object
-    },
-
-    /**
-     * 列表 或 详情 的唯一标识
-     */
-    rowKey: {
-      type: String,
-      "default": "id"
-    },
-
-    /************************* 子组件props *******************************/
-    listProps: {
-      type: Object
-    },
-    formProps: {
-      type: Object
-    },
-    descProps: {
-      type: Object
-    },
-    modalProps: {
-      type: Object
-    }
-  };
-};
-
-var CurdModule = vue.defineComponent({
-  props: _objectSpread2({}, proCurdModuleProps()),
+  InputComp: elementPlus.ElTimePicker,
+  valueType: "time",
+  name: "PFormTime"
+});
+var ProFormSelect = createFormItemComponent({
+  InputComp: ProSelect,
+  valueType: "select",
+  name: "PFormSelect"
+});
+var ProFormTreeSelect = createFormItemComponent({
+  InputComp: elementPlus.ElTreeSelect,
+  valueType: "treeSelect",
+  name: "PFormTreeSelect"
+});
+var ProFormCheckbox = createFormItemComponent({
+  InputComp: elementPlus.ElCheckboxGroup,
+  valueType: "checkbox",
+  name: "PFromCheckbox"
+});
+var ProFormRadio = createFormItemComponent({
+  InputComp: elementPlus.ElRadioGroup,
+  valueType: "radio",
+  name: "PFromRadio"
+});
+var ProFormSwitch = createFormItemComponent({
+  InputComp: elementPlus.ElSwitch,
+  valueType: "switch",
+  name: "PFromSwitch"
+});
+var ProFormCascader = createFormItemComponent({
+  InputComp: elementPlus.ElCascader,
+  valueType: "cascader",
+  name: "PFormCascader"
+});
+var ProSubmitButton = vue.defineComponent({
+  props: _objectSpread2({}, elementPlus.ElButton.props),
   setup: function setup(props, _ref) {
-    var slots = _ref.slots;
+    var slots = _ref.slots,
+        emit = _ref.emit;
 
-    var _useProModule = useProModule(),
-        columns = _useProModule.columns;
+    var _useProForm = pro.useProForm(),
+        formRef = _useProForm.formRef;
 
-    var curdState = props.curdState || vue.reactive({
-      detailData: {}
-    });
-    /**
-     * 排序
-     * @param list
-     * @param propName
-     */
+    var handleClick = function handleClick(e) {
+      var _formRef$value, _formRef$value$submit;
 
-    var dealSort = function dealSort(list, propName) {
-      return lodash.sortBy(list, function (item) {
-        return lodash.get(item, propName);
-      });
+      emit("click", e);
+      (_formRef$value = formRef.value) === null || _formRef$value === void 0 ? void 0 : (_formRef$value$submit = _formRef$value.submit) === null || _formRef$value$submit === void 0 ? void 0 : _formRef$value$submit.call(_formRef$value);
     };
-    /**
-     * 非 hideInForm columns
-     */
-
-
-    var formColumns = vue.computed(function () {
-      return dealSort(lodash.filter(columns.value, function (item) {
-        return !item.hideInForm;
-      }), "formSort");
-    });
-    /**
-     * 非 hideInDetail columns
-     */
-
-    var descColumns = vue.computed(function () {
-      return dealSort(lodash.filter(columns.value, function (item) {
-        return !item.hideInDetail;
-      }), "descSort");
-    });
-    /**
-     *  非 hideInTable columns
-     */
-
-    var tableColumns = vue.computed(function () {
-      return dealSort(lodash.filter(columns.value, function (item) {
-        return !item.hideInTable;
-      }), "tableSort");
-    });
-    /**
-     * search columns
-     */
-
-    var searchColumns = vue.computed(function () {
-      return dealSort(lodash.filter(columns.value, function (item) {
-        return !!item.search;
-      }), "searchSort");
-    });
-
-    var operate = _objectSpread2({
-      detailLabel: "详情",
-      editLabel: "编辑",
-      addLabel: "添加",
-      deleteLabel: "删除"
-    }, props.operate);
-
-    provideProCurdModule({
-      rowKey: props.rowKey,
-      curdState: curdState,
-      formColumns: formColumns,
-      descColumns: descColumns,
-      tableColumns: tableColumns,
-      searchColumns: searchColumns,
-      operate: operate,
-      //
-      listProps: props.listProps,
-      formProps: props.formProps,
-      descProps: props.descProps,
-      modalProps: props.modalProps
-    });
-    return function () {
-      var _slots$default;
 
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
-    };
-  }
-});
-var ProCurd = vue.defineComponent({
-  props: _objectSpread2(_objectSpread2({}, ProModule.props), proCurdModuleProps()),
-  setup: function setup(props, _ref2) {
-    var slots = _ref2.slots;
-    var moduleKeys = lodash.keys(ProModule.props);
     return function () {
-      var _slots$default2;
-
-      return vue.createVNode(ProModule, lodash.pick(props, moduleKeys), {
-        "default": function _default() {
-          return [vue.createVNode(CurdModule, lodash.omit(props, moduleKeys), {
-            "default": function _default() {
-              return [(_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
-            }
-          })];
-        }
-      });
+      return vue.createVNode(elementPlus.ElButton, vue.mergeProps({
+        "onClick": handleClick
+      }, props), slots);
     };
   }
 });
 
-var proCurdNetProps = function proCurdNetProps() {
+var proFormListProps = function proFormListProps() {
   return {
-    //发起接口参数/接口回来数据 转换
-    converts: {
+    addButtonText: {
+      type: String,
+      "default": "添加一项"
+    },
+    addButtonProps: {
       type: Object
     },
-    //
-    operate: {
+    minusButtonText: {
+      type: String,
+      "default": "删除"
+    },
+    minusButtonProps: {
       type: Object
     }
   };
 };
 
-var ProCurdNet = vue.defineComponent({
-  props: _objectSpread2(_objectSpread2({}, ProCurd.props), proCurdNetProps()),
+var ProFormList = vue.defineComponent({
+  name: "PFormList",
+  props: _objectSpread2(_objectSpread2({}, ProFormItem.props), proFormListProps()),
   setup: function setup(props, _ref) {
-    var _actionConvertParamsM;
-
     var slots = _ref.slots;
-
-    var _useRequestProvide = request.useRequestProvide(),
-        dispatchRequest = _useRequestProvide.dispatchRequest,
-        requestSubject$ = _useRequestProvide.requestSubject$;
-
-    var curdState = props.curdState || vue.reactive({
-      detailData: {}
-    });
-    /********************************** 网络请求相关 ***************************************/
-    //默认converts
-
-    var converts = _objectSpread2({
-      convertListParams: function convertListParams(values) {
-        return values;
-      },
-      convertListData: function convertListData(actor) {
-        var _actor$res;
-
-        return (_actor$res = actor.res) === null || _actor$res === void 0 ? void 0 : _actor$res.data;
-      },
-      convertDetailParams: function convertDetailParams(record, rowKey) {
-        return lodash.pick(record, rowKey);
-      },
-      convertDetailData: function convertDetailData(actor) {
-        var _actor$res2;
-
-        return (_actor$res2 = actor.res) === null || _actor$res2 === void 0 ? void 0 : _actor$res2.data;
-      },
-      convertAddParams: function convertAddParams(values, record) {
-        return {
-          body: _objectSpread2(_objectSpread2({}, record), values)
-        };
-      },
-      convertEditParams: function convertEditParams(values, record) {
-        return {
-          body: _objectSpread2(_objectSpread2({}, record), values)
-        };
-      }
-    }, props.converts);
-
-    var Action = {
-      List: "list",
-      Detail: "detail",
-      Add: "add",
-      Edit: "edit",
-      Delete: "delete"
-    }; //接口map {`${actorName}`:action}
-
-    var actorNameMap = {};
-    var lastRequestActors = {};
-    var actionConvertParamsMap = (_actionConvertParamsM = {}, _defineProperty(_actionConvertParamsM, Action.List, converts.convertListParams), _defineProperty(_actionConvertParamsM, Action.Detail, converts.convertDetailParams), _defineProperty(_actionConvertParamsM, Action.Add, converts.convertAddParams), _defineProperty(_actionConvertParamsM, Action.Edit, converts.convertEditParams), _defineProperty(_actionConvertParamsM, Action.Delete, converts.convertDeleteParams), _actionConvertParamsM);
-
-    var createRequestFun = function createRequestFun(action) {
-      return function () {
-        var actor = lodash.get(props.operate, "".concat(action, "Actor"));
-
-        if (!actor) {
-          return;
-        } // action he actorName 绑定
-
-
-        actorNameMap[actor.name] = action;
-        var convertParams = lodash.get(actionConvertParamsMap, action); // @ts-ignore
-
-        var nextParams = convertParams ? convertParams.apply(void 0, arguments) : undefined;
-        lastRequestActors[action] = dispatchRequest(actor, nextParams);
-      };
-    };
-
-    var actions = {
-      executeList: createRequestFun(Action.List),
-      executeDetail: createRequestFun(Action.Detail),
-      executeAdd: createRequestFun(Action.Add),
-      executeEdit: createRequestFun(Action.Edit),
-      executeDelete: createRequestFun(Action.Delete)
-    };
-    /********************************** operate ***************************************/
-
-    var prevListParams;
-
-    var handleSearch = function handleSearch() {
-      actions.executeList(prevListParams);
-    };
-
-    var operate = _objectSpread2({
-      //list
-      onList: function onList(values) {
-        var _props$operate, _props$operate$onList;
-
-        prevListParams = values;
-        handleSearch();
-        (_props$operate = props.operate) === null || _props$operate === void 0 ? void 0 : (_props$operate$onList = _props$operate.onListBubble) === null || _props$operate$onList === void 0 ? void 0 : _props$operate$onList.call(_props$operate, "emit", values);
-      },
-      onListDone: function onListDone(actor) {
-        var _converts$convertList, _props$operate2, _props$operate2$onLis;
-
-        curdState.listLoading = false;
-        curdState.listData = (_converts$convertList = converts.convertListData) === null || _converts$convertList === void 0 ? void 0 : _converts$convertList.call(converts, actor);
-        (_props$operate2 = props.operate) === null || _props$operate2 === void 0 ? void 0 : (_props$operate2$onLis = _props$operate2.onListBubble) === null || _props$operate2$onLis === void 0 ? void 0 : _props$operate2$onLis.call(_props$operate2, "done", actor);
-      },
-      onListFail: function onListFail(actor) {
-        var _props$operate3, _props$operate3$onLis;
-
-        curdState.listLoading = false;
-        (_props$operate3 = props.operate) === null || _props$operate3 === void 0 ? void 0 : (_props$operate3$onLis = _props$operate3.onListBubble) === null || _props$operate3$onLis === void 0 ? void 0 : _props$operate3$onLis.call(_props$operate3, "fail", actor);
-      },
-      //detail
-      onDetailDone: function onDetailDone(actor) {
-        var _converts$convertDeta, _props$operate4, _props$operate4$onDet;
-
-        curdState.detailLoading = false;
-        hooks.setReactiveValue(curdState.detailData, (_converts$convertDeta = converts.convertDetailData) === null || _converts$convertDeta === void 0 ? void 0 : _converts$convertDeta.call(converts, actor));
-        (_props$operate4 = props.operate) === null || _props$operate4 === void 0 ? void 0 : (_props$operate4$onDet = _props$operate4.onDetailBubble) === null || _props$operate4$onDet === void 0 ? void 0 : _props$operate4$onDet.call(_props$operate4, "done", actor);
-      },
-      onDetailFail: function onDetailFail(actor) {
-        var _props$operate5, _props$operate5$onDet;
-
-        curdState.detailLoading = false;
-        (_props$operate5 = props.operate) === null || _props$operate5 === void 0 ? void 0 : (_props$operate5$onDet = _props$operate5.onDetailBubble) === null || _props$operate5$onDet === void 0 ? void 0 : _props$operate5$onDet.call(_props$operate5, "fail", actor);
-      },
-      //add
-      onAddExecute: function onAddExecute(values) {
-        var _props$operate6, _props$operate6$onAdd;
-
-        curdState.operateLoading = true;
-        actions.executeAdd(values, curdState.detailData);
-        (_props$operate6 = props.operate) === null || _props$operate6 === void 0 ? void 0 : (_props$operate6$onAdd = _props$operate6.onAddBubble) === null || _props$operate6$onAdd === void 0 ? void 0 : _props$operate6$onAdd.call(_props$operate6, "execute", values);
-      },
-      onAddFail: function onAddFail(actor) {
-        var _props$operate7, _props$operate7$onAdd;
-
-        curdState.operateLoading = false;
-        (_props$operate7 = props.operate) === null || _props$operate7 === void 0 ? void 0 : (_props$operate7$onAdd = _props$operate7.onAddBubble) === null || _props$operate7$onAdd === void 0 ? void 0 : _props$operate7$onAdd.call(_props$operate7, "fail", actor);
-      },
-      //edit
-      onEditExecute: function onEditExecute(values) {
-        var _props$operate8, _props$operate8$onEdi;
-
-        curdState.operateLoading = true;
-        actions.executeEdit(values, curdState.detailData);
-        (_props$operate8 = props.operate) === null || _props$operate8 === void 0 ? void 0 : (_props$operate8$onEdi = _props$operate8.onEditBubble) === null || _props$operate8$onEdi === void 0 ? void 0 : _props$operate8$onEdi.call(_props$operate8, "execute", values);
-      },
-      onEditFail: function onEditFail(actor) {
-        var _props$operate9, _props$operate9$onEdi;
-
-        curdState.operateLoading = false;
-        (_props$operate9 = props.operate) === null || _props$operate9 === void 0 ? void 0 : (_props$operate9$onEdi = _props$operate9.onEditBubble) === null || _props$operate9$onEdi === void 0 ? void 0 : _props$operate9$onEdi.call(_props$operate9, "fail", actor);
-      },
-      //delete
-      onDelete: function onDelete(record) {
-        var _props$operate10, _props$operate10$onDe;
-
-        actions.executeDelete(record, props.rowKey);
-        (_props$operate10 = props.operate) === null || _props$operate10 === void 0 ? void 0 : (_props$operate10$onDe = _props$operate10.onDeleteBubble) === null || _props$operate10$onDe === void 0 ? void 0 : _props$operate10$onDe.call(_props$operate10, "emit", record);
-      }
-    }, props.operate); //网络请求订阅
-
-
-    hooks.useEffect(function () {
-      //请求成功
-      var doneSub = requestSubject$.pipe(rxjs.filter(request.isDoneRequestActor), rxjs.tap(function (actor) {
-        var action = actorNameMap[actor.name];
-        var actionDone = lodash.get(operate, lodash.camelCase("on-".concat(action, "-done")));
-        actionDone === null || actionDone === void 0 ? void 0 : actionDone(actor);
-        lastRequestActors[action] = undefined;
-      })).subscribe(); //请求失败
-
-      var failSub = requestSubject$.pipe(rxjs.filter(request.isFailedRequestActor), rxjs.tap(function (actor) {
-        var action = actorNameMap[actor.name];
-        var actionFail = lodash.get(operate, lodash.camelCase("on-".concat(action, "-fail")));
-        actionFail === null || actionFail === void 0 ? void 0 : actionFail(actor);
-        lastRequestActors[action] = undefined;
-      })).subscribe();
-      return function () {
-        doneSub.unsubscribe();
-        failSub.unsubscribe(); //组件销毁的时候cancel请求
-
-        lodash.forEach(lastRequestActors, function (actor) {
-          actor && dispatchRequest(_objectSpread2(_objectSpread2({}, actor), {}, {
-            stage: "CANCEL"
-          }));
-        });
-      };
-    }, []);
+    var originKeys = lodash.keys(pro.ProFormList.props);
+    var invalidKeys = lodash.keys(proFormListProps());
     return function () {
-      var _slots$default;
-
-      return vue.createVNode(ProCurd, lodash.omit(props, "converts"), {
+      return vue.createVNode(ProFormItem, vue.mergeProps(lodash.omit.apply(void 0, [props].concat(_toConsumableArray(originKeys), _toConsumableArray(invalidKeys))), {
+        "name": props.name
+      }), {
         "default": function _default() {
-          return [(_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+          return [vue.createVNode(pro.ProFormList, vue.mergeProps(lodash.pick(props, originKeys), {
+            "name": props.name
+          }), _objectSpread2({
+            itemMinus: function itemMinus() {
+              return vue.createVNode(elementPlus.ElButton, vue.mergeProps({
+                "link": true
+              }, props.minusButtonProps), {
+                "default": function _default() {
+                  return [props.minusButtonText];
+                }
+              });
+            },
+            add: function add() {
+              return vue.createVNode(elementPlus.ElButton, vue.mergeProps({
+                "type": "primary"
+              }, props.addButtonProps), {
+                "default": function _default() {
+                  return [props.addButtonText];
+                }
+              });
+            }
+          }, slots))];
         }
       });
     };
@@ -1494,13 +734,13 @@ var OkButton = vue.defineComponent({
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
 
-    var _useProCurdModule = useProCurdModule(),
-        curdState = _useProCurdModule.curdState;
+    var _useProCurd = pro.useProCurd(),
+        curdState = _useProCurd.curdState;
 
     return function () {
       return vue.createVNode(ProSubmitButton, vue.mergeProps({
         "onClick": function onClick() {
-          curdState.addAction = exports.CurdAddAction.NORMAL;
+          curdState.addAction = pro.CurdAddAction.NORMAL;
         }
       }, props, {
         "loading": curdState.operateLoading
@@ -1521,13 +761,13 @@ var ContinueAddButton = vue.defineComponent({
   setup: function setup(props, _ref2) {
     var slots = _ref2.slots;
 
-    var _useProCurdModule2 = useProCurdModule(),
-        curdState = _useProCurdModule2.curdState;
+    var _useProCurd2 = pro.useProCurd(),
+        curdState = _useProCurd2.curdState;
 
     return function () {
       return vue.createVNode(ProSubmitButton, vue.mergeProps({
         "onClick": function onClick() {
-          curdState.addAction = exports.CurdAddAction.CONTINUE;
+          curdState.addAction = pro.CurdAddAction.CONTINUE;
         }
       }, props, {
         "loading": curdState.operateLoading
@@ -1571,8 +811,8 @@ var ProOperateButton = vue.defineComponent({
   setup: function setup(props, _ref3) {
     var slots = _ref3.slots;
 
-    var _useProCurdModule3 = useProCurdModule(),
-        curdState = _useProCurdModule3.curdState;
+    var _useProCurd3 = pro.useProCurd(),
+        curdState = _useProCurd3.curdState;
 
     return function () {
       var _slots$left, _slots$center, _slots$right;
@@ -1583,7 +823,7 @@ var ProOperateButton = vue.defineComponent({
         "default": function _default() {
           return [props.okText];
         }
-      }), (_slots$center = slots.center) === null || _slots$center === void 0 ? void 0 : _slots$center.call(slots), curdState.mode === exports.CurdCurrentMode.ADD && props.showContinueAdd && vue.createVNode(ContinueAddButton, props.continueButtonProps, {
+      }), (_slots$center = slots.center) === null || _slots$center === void 0 ? void 0 : _slots$center.call(slots), curdState.mode === pro.CurdCurrentMode.ADD && props.showContinueAdd && vue.createVNode(ContinueAddButton, props.continueButtonProps, {
         "default": function _default() {
           return [props.continueText];
         }
@@ -1606,45 +846,47 @@ var ProCurdForm = vue.defineComponent({
   setup: function setup(props, _ref4) {
     var slots = _ref4.slots;
 
-    var _useProModule = useProModule(),
-        getFormItemVNode = _useProModule.getFormItemVNode;
-
-    var _useProCurdModule4 = useProCurdModule(),
-        curdState = _useProCurdModule4.curdState,
-        formColumns = _useProCurdModule4.formColumns,
-        operate = _useProCurdModule4.operate;
+    var _useProModule = pro.useProModule(),
+        elementMap = _useProModule.elementMap,
+        formElementMap = _useProModule.formElementMap;
 
-    var formVNodes = vue.computed(function () {
-      return lodash.map(formColumns.value, function (item) {
-        return getFormItemVNode(item, true);
-      });
-    });
+    var _useProCurd4 = pro.useProCurd(),
+        curdState = _useProCurd4.curdState,
+        formColumns = _useProCurd4.formColumns,
+        sendCurdEvent = _useProCurd4.sendCurdEvent;
 
     var handleFinish = function handleFinish(values) {
-      if (curdState.mode === exports.CurdCurrentMode.EDIT) {
-        var _operate$onEditExecut;
-
+      if (curdState.mode === pro.CurdCurrentMode.EDIT) {
         //edit
-        (_operate$onEditExecut = operate.onEditExecute) === null || _operate$onEditExecut === void 0 ? void 0 : _operate$onEditExecut.call(operate, values);
+        sendCurdEvent({
+          action: pro.CurdAction.EDIT,
+          type: pro.CurdSubAction.EXECUTE,
+          values: values
+        });
       } else {
-        var _operate$onAddExecute;
-
         //add
-        (_operate$onAddExecute = operate.onAddExecute) === null || _operate$onAddExecute === void 0 ? void 0 : _operate$onAddExecute.call(operate, values);
+        sendCurdEvent({
+          action: pro.CurdAction.ADD,
+          type: pro.CurdSubAction.EXECUTE,
+          values: values
+        });
       }
     };
 
     return function () {
-      return vue.createVNode(ProForm, vue.mergeProps(props, {
+      var _slots$default;
+
+      return vue.createVNode(ProForm, vue.mergeProps(lodash.omit(props, "elementMap", "formElementMap"), {
+        "elementMap": props.elementMap || elementMap,
+        "formElementMap": props.formElementMap || formElementMap,
+        "columns": formColumns.value,
         "model": curdState.detailData,
-        "readonly": curdState.mode === exports.CurdCurrentMode.DETAIL,
-        "hideRequiredAsterisk": curdState.mode === exports.CurdCurrentMode.DETAIL,
+        "readonly": curdState.mode === pro.CurdCurrentMode.DETAIL,
+        "hideRequiredAsterisk": curdState.mode === pro.CurdCurrentMode.DETAIL,
         "onFinish": handleFinish
       }), _objectSpread2({
         "default": function _default() {
-          var _slots$default;
-
-          return vue.createVNode(vue.Fragment, null, [formVNodes.value, curdState.mode !== exports.CurdCurrentMode.DETAIL && vue.createVNode(ProOperateButton, lodash.omit(props.operateButtonProps, "slots"), lodash.get(props.operateButtonProps, "slots")), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)]);
+          return [curdState.mode !== pro.CurdCurrentMode.DETAIL && vue.createVNode(ProOperateButton, lodash.omit(props.operateButtonProps, "slots"), lodash.get(props.operateButtonProps, "slots")), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
         }
       }, lodash.omit(slots, "default")));
     };
@@ -1652,184 +894,126 @@ var ProCurdForm = vue.defineComponent({
 });
 var ProCurdFormConnect = vue.defineComponent({
   setup: function setup() {
-    var _useProCurdModule5 = useProCurdModule(),
-        formProps = _useProCurdModule5.formProps;
+    var _useProCurd5 = pro.useProCurd(),
+        formProps = _useProCurd5.formProps;
 
     return function () {
-      return vue.createVNode(ProCurdForm, lodash.omit(formProps, "slots"), lodash.get(formProps, "slots"));
+      return vue.createVNode(ProCurdForm, lodash.omit(formProps === null || formProps === void 0 ? void 0 : formProps.value, "slots"), lodash.get(formProps === null || formProps === void 0 ? void 0 : formProps.value, "slots"));
     };
   }
 });
 
-var defaultPage = {
-  page: 1,
-  pageSize: 10
-};
-
-var curdListProps = function curdListProps() {
-  return {
-    /**
-     * extra 是否放到SearchForm中
-     */
-    extraInSearch: {
-      type: Boolean,
-      "default": undefined
-    },
-    //search
-    searchProps: {
-      type: Object
-    },
-    //table
-    tableProps: {
-      type: Object
-    },
-    //pagination
-    paginationProps: {
-      type: Object
-    },
-    //pageState
-    pageState: {
-      type: Object
-    }
-  };
-};
-
 /**
  * 组合列表
  * SearchForm + Table + Pagination
  */
 var ProCurdList = vue.defineComponent({
-  props: _objectSpread2({}, curdListProps()),
+  props: _objectSpread2({}, ProList.props),
   setup: function setup(props, _ref) {
-    var _props$searchProps;
-
     var slots = _ref.slots;
 
-    var _useProModule = useProModule(),
+    var _useProModule = pro.useProModule(),
         elementMap = _useProModule.elementMap,
         formElementMap = _useProModule.formElementMap;
 
-    var _useProCurdModule = useProCurdModule(),
-        curdState = _useProCurdModule.curdState,
-        searchColumns = _useProCurdModule.searchColumns,
-        tableColumns = _useProCurdModule.tableColumns,
-        operate = _useProCurdModule.operate;
+    var _useProCurd = pro.useProCurd(),
+        curdState = _useProCurd.curdState,
+        searchColumns = _useProCurd.searchColumns,
+        tableColumns = _useProCurd.tableColumns,
+        getOperate = _useProCurd.getOperate,
+        sendCurdEvent = _useProCurd.sendCurdEvent;
     /******************* table ********************/
 
 
-    var prepareTableItem = function prepareTableItem(propName) {
-      return {
-        value: propName,
-        label: lodash.get(operate, "".concat(propName, "Label")),
-        show: lodash.get(operate, propName, false),
+    var prepareTableItem = function prepareTableItem(action) {
+      var item = getOperate(action);
+      return _objectSpread2(_objectSpread2({}, lodash.pick(item, "label", "element", "disabled", "sort")), {}, {
+        show: !lodash.isUndefined(item === null || item === void 0 ? void 0 : item.show) ? item === null || item === void 0 ? void 0 : item.show : false,
         onClick: function onClick(record) {
-          var fun = lodash.get(operate, lodash.camelCase("on-".concat(propName)));
-          fun === null || fun === void 0 ? void 0 : fun(record);
-        }
-      };
-    }; //table操作栏 items
-
-
-    var tableOperateItems = [prepareTableItem("detail"), prepareTableItem("edit"), prepareTableItem("delete")];
-    /******************* search pagination ********************/
-
-    var searchState = ((_props$searchProps = props.searchProps) === null || _props$searchProps === void 0 ? void 0 : _props$searchProps.model) || vue.reactive({});
-    var pageState = props.pageState || vue.reactive(_objectSpread2({}, defaultPage));
-
-    var handleSearch = function handleSearch() {
-      operate.onList && operate.onList(_objectSpread2(_objectSpread2({}, searchState), pageState));
-    };
-
-    var executeSearchWithResetPage = function executeSearchWithResetPage() {
-      pageState.page = 1;
-      handleSearch();
-    }; //无SearchForm组件 初始化
-
-
-    hooks.useEffect(function () {
-      var _props$searchProps2;
+          if (item !== null && item !== void 0 && item.onClick) {
+            item.onClick(record);
+            return;
+          }
 
-      // 处理触发onList 操作
-      if (lodash.size(searchColumns.value) <= 0 && ((_props$searchProps2 = props.searchProps) === null || _props$searchProps2 === void 0 ? void 0 : _props$searchProps2.initEmit) !== false) {
-        handleSearch();
-      }
-    }, []); //无SearchForm组件 订阅searchState
+          sendCurdEvent({
+            action: action,
+            type: pro.CurdSubAction.EMIT,
+            record: record
+          });
+        },
+        value: action
+      });
+    }; //table操作栏 items
 
-    hooks.useWatch(function () {
-      if (lodash.size(searchColumns.value) > 0) {
-        return;
-      }
 
-      executeSearchWithResetPage();
-    }, searchState);
+    var tableOperateItems = [prepareTableItem(pro.CurdAction.DETAIL), prepareTableItem(pro.CurdAction.EDIT), prepareTableItem(pro.CurdAction.DELETE)];
     return function () {
-      var _slots$extra, _slots$divide, _curdState$listData, _props$tableProps, _slots$divide2, _curdState$listData2;
-
-      var pagination = props.paginationProps; //
-
-      var _extra = vue.createVNode("div", {
-        "class": "pro-curd-list-search"
-      }, [operate.add && vue.createVNode(elementPlus.ElButton, {
-        "type": "primary",
-        "onClick": function onClick() {
-          var _operate$onAdd;
-
-          (_operate$onAdd = operate.onAdd) === null || _operate$onAdd === void 0 ? void 0 : _operate$onAdd.call(operate);
-        }
-      }, {
-        "default": function _default() {
-          return [operate.addLabel];
+      var _curdState$listData, _curdState$listData2;
+
+      var tableProps = props.tableProps;
+      var paginationProps = props.paginationProps;
+      return vue.createVNode(ProList, vue.mergeProps({
+        "onList": function onList(values) {
+          sendCurdEvent({
+            action: pro.CurdAction.LIST,
+            type: pro.CurdSubAction.EMIT,
+            values: values
+          });
         }
-      }), (_slots$extra = slots.extra) === null || _slots$extra === void 0 ? void 0 : _slots$extra.call(slots)]);
+      }, props, {
+        "searchProps": _objectSpread2(_objectSpread2({
+          formElementMap: formElementMap
+        }, props.searchProps), {}, {
+          columns: searchColumns.value
+        }),
+        "tableProps": _objectSpread2(_objectSpread2({
+          elementMap: elementMap
+        }, tableProps), {}, {
+          operate: lodash.mergeWith({
+            items: tableOperateItems
+          }, tableProps === null || tableProps === void 0 ? void 0 : tableProps.operate, function (objValue, srcValue) {
+            if (lodash.isArray(objValue)) {
+              if (lodash.isArray(srcValue)) {
+                //合并
+                return lodash.concat(objValue, lodash.map(srcValue, function (item) {
+                  var nextItem = _objectSpread2({}, item);
+
+                  if (!item.onClick) {
+                    nextItem.onClick = function (record) {
+                      sendCurdEvent({
+                        action: "operate",
+                        type: item.value,
+                        record: record
+                      });
+                    };
+                  }
 
-      return vue.createVNode(vue.Fragment, null, [lodash.size(searchColumns.value) > 0 && vue.createVNode(ProSearchForm, vue.mergeProps({
-        "formElementMap": formElementMap,
-        "columns": searchColumns.value
-      }, props.searchProps, {
-        "model": searchState,
-        "onFinish": executeSearchWithResetPage
-      }), {
-        //extraInSearch 模式下放入SearchForm
-        extra: function extra() {
-          return props.extraInSearch ? _extra : null;
-        }
-      }), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), (lodash.size(searchColumns.value) <= 0 || !props.extraInSearch) && (operate.add || slots.extra) && _extra, slots["default"] ? slots["default"]() : vue.withDirectives(vue.createVNode(ProTable, vue.mergeProps({
-        "elementMap": elementMap,
-        "columns": tableColumns.value,
-        "operate": lodash.mergeWith({
-          items: tableOperateItems
-        }, operate.tableOperate, function (objValue, srcValue) {
-          if (lodash.isArray(objValue) && lodash.isArray(srcValue)) {
-            return lodash.concat(objValue, srcValue);
-          }
+                  return nextItem;
+                }));
+              } else {
+                //使用curd默认
+                return objValue;
+              }
+            }
+          }),
+          columns: tableColumns.value,
+          loading: curdState.listLoading,
+          data: (_curdState$listData = curdState.listData) === null || _curdState$listData === void 0 ? void 0 : _curdState$listData.dataSource
+        }),
+        "paginationProps": _objectSpread2(_objectSpread2({}, paginationProps), {}, {
+          total: (_curdState$listData2 = curdState.listData) === null || _curdState$listData2 === void 0 ? void 0 : _curdState$listData2.total
         })
-      }, lodash.omit(props.tableProps, "slots", "operate"), {
-        "data": (_curdState$listData = curdState.listData) === null || _curdState$listData === void 0 ? void 0 : _curdState$listData.dataSource
-      }), (_props$tableProps = props.tableProps) === null || _props$tableProps === void 0 ? void 0 : _props$tableProps.slots), [[vue.resolveDirective("loading"), curdState.listLoading]]), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), curdState.listData && lodash.isNumber((_curdState$listData2 = curdState.listData) === null || _curdState$listData2 === void 0 ? void 0 : _curdState$listData2.total) && curdState.listData.total > 0 && vue.createVNode("div", {
-        "class": "pro-curd-list-bottom"
-      }, [vue.createVNode(elementPlus.ElPagination, vue.mergeProps(pagination, {
-        "total": curdState.listData.total,
-        "currentPage": pageState.page,
-        "pageSize": pageState.pageSize,
-        "onSizeChange": function onSizeChange(pageSize) {
-          pageState.pageSize = pageSize;
-          handleSearch();
-        },
-        "onCurrentChange": function onCurrentChange(current) {
-          pageState.page = current;
-          handleSearch();
-        }
-      }), null)])]);
+      }), slots);
     };
   }
 });
 var ProCurdListConnect = vue.defineComponent({
   setup: function setup() {
-    var _useProCurdModule2 = useProCurdModule(),
-        listProps = _useProCurdModule2.listProps;
+    var _useProCurd2 = pro.useProCurd(),
+        listProps = _useProCurd2.listProps;
 
     return function () {
-      return vue.createVNode(ProCurdList, lodash.omit(listProps, "slots"), lodash.get(listProps, "slots"));
+      return vue.createVNode(ProCurdList, lodash.omit(listProps === null || listProps === void 0 ? void 0 : listProps.value, "slots"), lodash.get(listProps === null || listProps === void 0 ? void 0 : listProps.value, "slots"));
     };
   }
 });
@@ -1843,12 +1027,12 @@ var ProCurdDesc = vue.defineComponent({
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
 
-    var _useProModule = useProModule(),
+    var _useProModule = pro.useProModule(),
         getItemVNode = _useProModule.getItemVNode;
 
-    var _useProCurdModule = useProCurdModule(),
-        curdState = _useProCurdModule.curdState,
-        descColumns = _useProCurdModule.descColumns;
+    var _useProCurd = pro.useProCurd(),
+        curdState = _useProCurd.curdState,
+        descColumns = _useProCurd.descColumns;
 
     var descVNodes = vue.computed(function () {
       return lodash.map(descColumns.value, function (item) {
@@ -1876,25 +1060,82 @@ var ProCurdDesc = vue.defineComponent({
 });
 var ProCurdDescConnect = vue.defineComponent({
   setup: function setup() {
-    var _useProCurdModule2 = useProCurdModule(),
-        descProps = _useProCurdModule2.descProps;
+    var _useProCurd2 = pro.useProCurd(),
+        descProps = _useProCurd2.descProps;
+
+    return function () {
+      return vue.createVNode(ProCurdList, lodash.omit(descProps === null || descProps === void 0 ? void 0 : descProps.value, "slots"), lodash.get(descProps === null || descProps === void 0 ? void 0 : descProps.value, "slots"));
+    };
+  }
+});
+
+var ProCurdModal = vue.defineComponent({
+  props: _objectSpread2({}, elementPlus.ElDialog.props),
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots;
+
+    var _useProCurd = pro.useProCurd(),
+        curdState = _useProCurd.curdState,
+        getOperate = _useProCurd.getOperate; //根据当前模式展示不同的Title
+
+
+    var getTitle = function getTitle() {
+      var _getOperate, _getOperate2, _getOperate3;
+
+      switch (curdState.mode) {
+        case pro.CurdAction.ADD:
+          return (_getOperate = getOperate(pro.CurdAction.ADD)) === null || _getOperate === void 0 ? void 0 : _getOperate.label;
+
+        case pro.CurdAction.EDIT:
+          return (_getOperate2 = getOperate(pro.CurdAction.EDIT)) === null || _getOperate2 === void 0 ? void 0 : _getOperate2.label;
+
+        case pro.CurdAction.DETAIL:
+          return (_getOperate3 = getOperate(pro.CurdAction.DETAIL)) === null || _getOperate3 === void 0 ? void 0 : _getOperate3.label;
+      }
+    };
+
+    var handleCancel = function handleCancel() {
+      curdState.mode = undefined;
+      hooks.setReactiveValue(curdState.detailData, {});
+      curdState.detailLoading = false;
+      curdState.addAction = undefined;
+    };
+
+    return function () {
+      return vue.createVNode(elementPlus.ElDialog, vue.mergeProps({
+        "destroyOnClose": true,
+        "title": getTitle(),
+        "modelValue": !!curdState.mode,
+        "onClose": handleCancel
+      }, props), slots);
+    };
+  }
+});
+var ProCurdModalConnect = vue.defineComponent({
+  setup: function setup() {
+    var _useProCurd2 = pro.useProCurd(),
+        modalProps = _useProCurd2.modalProps;
 
     return function () {
-      return vue.createVNode(ProCurdList, lodash.omit(descProps, "slots"), lodash.get(descProps, "slots"));
+      return vue.createVNode(ProCurdModal, lodash.omit(modalProps === null || modalProps === void 0 ? void 0 : modalProps.value, "slots"), _objectSpread2({
+        "default": function _default() {
+          return [vue.createVNode(ProCurdFormConnect, null, null)];
+        }
+      }, lodash.get(modalProps === null || modalProps === void 0 ? void 0 : modalProps.value, "slots")));
     };
   }
 });
 
 exports.ContinueAddButton = ContinueAddButton;
 exports.OkButton = OkButton;
-exports.ProCurd = ProCurd;
 exports.ProCurdDesc = ProCurdDesc;
 exports.ProCurdDescConnect = ProCurdDescConnect;
 exports.ProCurdForm = ProCurdForm;
 exports.ProCurdFormConnect = ProCurdFormConnect;
 exports.ProCurdList = ProCurdList;
 exports.ProCurdListConnect = ProCurdListConnect;
-exports.ProCurdNet = ProCurdNet;
+exports.ProCurdModal = ProCurdModal;
+exports.ProCurdModalConnect = ProCurdModalConnect;
 exports.ProForm = ProForm;
 exports.ProFormCascader = ProFormCascader;
 exports.ProFormCheckbox = ProFormCheckbox;
@@ -1908,26 +1149,14 @@ exports.ProFormText = ProFormText;
 exports.ProFormTextNumber = ProFormTextNumber;
 exports.ProFormTimePicker = ProFormTimePicker;
 exports.ProFormTreeSelect = ProFormTreeSelect;
-exports.ProModule = ProModule;
+exports.ProGrid = ProGrid;
+exports.ProList = ProList;
+exports.ProLoading = ProLoading;
 exports.ProOperateButton = ProOperateButton;
-exports.ProSchemaForm = ProSchemaForm;
 exports.ProSearchForm = ProSearchForm;
 exports.ProSelect = ProSelect;
 exports.ProSubmitButton = ProSubmitButton;
 exports.ProTable = ProTable;
-exports.convertPathToList = convertPathToList;
 exports.createFormItemComponent = createFormItemComponent;
+exports.createLoadingId = createLoadingId;
 exports.defaultPage = defaultPage;
-exports.getColumnFormItemName = getColumnFormItemName;
-exports.getColumnValueType = getColumnValueType;
-exports.getFormItemEl = getFormItemEl;
-exports.getItemEl = getItemEl;
-exports.getValidValues = getValidValues;
-exports.provideProCurdModule = provideProCurdModule;
-exports.provideProForm = provideProForm;
-exports.provideProFormList = provideProFormList;
-exports.provideProModule = provideProModule;
-exports.useProCurdModule = useProCurdModule;
-exports.useProForm = useProForm;
-exports.useProFormList = useProFormList;
-exports.useProModule = useProModule;