@vue-start/element-pro 0.1.0 → 0.1.1

package/dist/index.es.js

@@ -1,9 +1,8 @@
-import { inject, provide, defineComponent, createVNode, mergeProps, ref, reactive, computed, toRaw, Fragment, createTextVNode, isVNode, withDirectives, resolveDirective } from 'vue';
+import { inject, provide, defineComponent, createVNode, mergeProps, ref, reactive, computed, toRaw, Fragment, createTextVNode, withDirectives, isVNode, resolveDirective } from 'vue';
 import { ElFormItem, ElForm, ElSelect, ElOption, ElButton, ElInput, ElInputNumber, ElDatePicker, ElTimePicker, ElTreeSelect, ElCheckboxGroup, ElRadioGroup, ElSwitch, ElCascader, ElTable, ElTableColumn, ElPagination, ElDescriptions, ElDescriptionsItem } from 'element-plus';
-import { filter, keys, omit, isArray, isString, split, forEach, map, get, isObject, isEmpty, isFunction, mergeWith, size, debounce, some, clone, isBoolean, set, merge, sortBy, pick, camelCase, concat, isNumber } from 'lodash';
-import { useEffect, setReactiveValue, useWatch } from '@vue-start/hooks';
-import { useRequestProvide, isDoneRequestActor, isFailedRequestActor } from '@vue-start/request';
-import { filter as filter$1, tap } from 'rxjs';
+import { keys, omit, forEach, size, map, debounce, some, get, clone, isBoolean, set, isArray, merge, sortBy, filter, isFunction, isNumber, pick } from 'lodash';
+import { useEffect, useWatch } from '@vue-start/hooks';
+import { getValidValues, getFormItemEl, convertPathToList, getItemEl, useProCurd, CurdAddAction, CurdCurrentMode, useProModule, CurdAction } from '@vue-start/pro';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -101,51 +100,6 @@ var provideProFormList = function provideProFormList(ctx) {
   provide(ProFormListKey, ctx);
 };
 
-/**
- * 剔除showState或showStateRules规则为!true的值
- * @param values
- * @param showState
- * @param showStateRules
- */
-var getValidValues = function getValidValues(values, showState, showStateRules) {
-  if (showState) {
-    var invalidKeys = filter(keys(showState), function (key) {
-      return !showState[key];
-    });
-    return omit(values, invalidKeys);
-  }
-
-  if (showStateRules) {
-    var _invalidKeys = filter(keys(showStateRules), function (key) {
-      return !showStateRules[key](values);
-    });
-
-    return omit(values, _invalidKeys);
-  }
-
-  return values;
-};
-/**
- * string类型的path转为arr
- * @param path
- */
-
-var convertPathToList = function convertPathToList(path) {
-  if (!path) {
-    return undefined;
-  }
-
-  if (isArray(path)) {
-    return path;
-  }
-
-  if (path && isString(path) && path.indexOf(".") > 0) {
-    return split(path, ".");
-  }
-
-  return [path];
-};
-
 var proFormItemProps$1 = function proFormItemProps() {
   return {
     name: {
@@ -307,171 +261,6 @@ var ProForm = defineComponent({
   }
 });
 
-var ProModuleKey = Symbol("pro-module");
-var useProModule = function useProModule() {
-  return inject(ProModuleKey);
-};
-var provideProModule = function provideProModule(ctx) {
-  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 getColumnFormItemName = function getColumnFormItemName(column) {
-  var _column$formItemProps;
-
-  return ((_column$formItemProps = column.formItemProps) === null || _column$formItemProps === void 0 ? void 0 : _column$formItemProps.name) || column.dataIndex;
-};
-/**
- * 根据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 = get(formElementMap, valueType);
-
-  if (!Comp) {
-    return null;
-  }
-
-  var name = getColumnFormItemName(column);
-  var itemProps = needRules ? column.formItemProps : omit(column.formItemProps, "rules");
-  return createVNode(Comp, mergeProps({
-    "key": name,
-    "name": name,
-    "label": column.title
-  }, itemProps, {
-    "fieldProps": 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 = get(elementMap, valueType);
-
-  if (!Comp) {
-    return null;
-  }
-
-  return createVNode(Comp, mergeProps(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 = defineComponent({
-  name: "PModule",
-  props: _objectSpread2({}, proModuleProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-
-    /**
-     * columns columnState 合并
-     */
-    var columns = computed(function () {
-      return map(props.columns, function (item) {
-        //如果columnState中有值，merge处理
-        var mapData = get(props.columnState, getColumnFormItemName(item));
-
-        if (isObject(mapData) && !isEmpty(mapData) && !isArray(mapData) && !isFunction(mapData)) {
-          //合并
-          return mergeWith(item, mapData, function (objValue, srcValue) {
-            //如果是数组，替换
-            if (isArray(objValue) || 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: {
@@ -518,11 +307,11 @@ var ProSchemaForm = defineComponent({
         "ref": function ref(el) {
           return expose(el);
         }
-      }, omit(props, invalidKeys)), {
+      }, omit(props, invalidKeys)), _objectSpread2({
         "default": function _default() {
           return [formItemList.value, (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
         }
-      });
+      }, omit(slots, "default")));
     };
   }
 });
@@ -961,6 +750,14 @@ var proTableProps = function proTableProps() {
      */
     elementMap: {
       type: Object
+    },
+
+    /**
+     * loading
+     */
+    loading: {
+      type: Boolean,
+      "default": false
     }
   };
 };
@@ -1008,10 +805,14 @@ var ProTable = defineComponent({
           customRender: function customRender(_ref3) {
             var record = _ref3.record;
             var validList = filter(operateList, function (item) {
-              if (item.show && isFunction(item.show)) {
+              if (isFunction(item.show)) {
                 return item.show(record);
               }
 
+              if (item.show === false) {
+                return false;
+              }
+
               return true;
             });
             return createVNode("div", {
@@ -1024,6 +825,7 @@ var ProTable = defineComponent({
 
               return createVNode(ElButton, {
                 "key": item.value,
+                "type": "primary",
                 "link": true,
                 "disabled": isFunction(item.disabled) ? item.disabled(record) : item.disabled,
                 "onClick": function onClick() {
@@ -1047,7 +849,7 @@ var ProTable = defineComponent({
     return function () {
       var _slots$default;
 
-      return createVNode(ElTable, mergeProps({
+      return withDirectives(createVNode(ElTable, mergeProps({
         "ref": function ref(el) {
           expose(el);
         }
@@ -1083,400 +885,114 @@ var ProTable = defineComponent({
             }), null);
           }), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
         }
-      }, omit(slots, "default")));
+      }, omit(slots, "default"))), [[resolveDirective("loading"), props.loading]]);
     };
   }
 });
 
-var ProCurdModuleKey = Symbol("pro-curd-module");
-var useProCurdModule = function useProCurdModule() {
-  return inject(ProCurdModuleKey);
-};
-var provideProCurdModule = function provideProCurdModule(ctx) {
-  provide(ProCurdModuleKey, ctx);
+var defaultPage = {
+  page: 1,
+  pageSize: 10
 };
 
-/**
- * curd 操作模式
- */
-var CurdCurrentMode;
-
-(function (CurdCurrentMode) {
-  CurdCurrentMode["ADD"] = "ADD";
-  CurdCurrentMode["EDIT"] = "EDIT";
-  CurdCurrentMode["DETAIL"] = "DETAIL";
-})(CurdCurrentMode || (CurdCurrentMode = {}));
-
-/**
- * curd add 模式下 标记 "确定" "确定并继续" 触发
- */
-var CurdAddAction;
-
-(function (CurdAddAction) {
-  CurdAddAction["NORMAL"] = "NORMAL";
-  CurdAddAction["CONTINUE"] = "CONTINUE";
-})(CurdAddAction || (CurdAddAction = {}));
-
-var proCurdModuleProps = function proCurdModuleProps() {
+var proListProps = function proListProps() {
   return {
     /**
-     * 状态
-     */
-    curdState: {
-      type: Object
-    },
-
-    /**
-     * 操作配置
-     */
-    operate: {
-      type: Object
-    },
-
-    /**
-     * 列表 或 详情 的唯一标识
+     * extra 是否放到SearchForm中
      */
-    rowKey: {
-      type: String,
-      "default": "id"
+    extraInSearch: {
+      type: Boolean,
+      "default": undefined
     },
-
-    /************************* 子组件props *******************************/
-    listProps: {
+    //search
+    searchProps: {
       type: Object
     },
-    formProps: {
+    //table
+    tableProps: {
       type: Object
     },
-    descProps: {
+    //pagination
+    paginationProps: {
       type: Object
     },
-    modalProps: {
+    //pageState
+    pageState: {
       type: Object
     }
   };
 };
 
-var CurdModule = defineComponent({
-  props: _objectSpread2({}, proCurdModuleProps()),
+var ProList = defineComponent({
+  props: _objectSpread2({}, proListProps()),
   setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-
-    var _useProModule = useProModule(),
-        columns = _useProModule.columns;
-
-    var curdState = props.curdState || reactive({
-      detailData: {}
-    });
-    /**
-     * 排序
-     * @param list
-     * @param propName
-     */
-
-    var dealSort = function dealSort(list, propName) {
-      return sortBy(list, function (item) {
-        return get(item, propName);
-      });
-    };
-    /**
-     * 非 hideInForm columns
-     */
-
-
-    var formColumns = computed(function () {
-      return dealSort(filter(columns.value, function (item) {
-        return !item.hideInForm;
-      }), "formSort");
-    });
-    /**
-     * 非 hideInDetail columns
-     */
-
-    var descColumns = computed(function () {
-      return dealSort(filter(columns.value, function (item) {
-        return !item.hideInDetail;
-      }), "descSort");
-    });
-    /**
-     *  非 hideInTable columns
-     */
-
-    var tableColumns = computed(function () {
-      return dealSort(filter(columns.value, function (item) {
-        return !item.hideInTable;
-      }), "tableSort");
-    });
-    /**
-     * search columns
-     */
-
-    var searchColumns = computed(function () {
-      return dealSort(filter(columns.value, function (item) {
-        return !!item.search;
-      }), "searchSort");
-    });
+    var _props$searchProps;
 
-    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;
+    var slots = _ref.slots,
+        emit = _ref.emit;
 
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
-    };
-  }
-});
-var ProCurd = defineComponent({
-  props: _objectSpread2(_objectSpread2({}, ProModule.props), proCurdModuleProps()),
-  setup: function setup(props, _ref2) {
-    var slots = _ref2.slots;
-    var moduleKeys = keys(ProModule.props);
-    return function () {
-      var _slots$default2;
+    /******************* search pagination ********************/
+    var searchState = ((_props$searchProps = props.searchProps) === null || _props$searchProps === void 0 ? void 0 : _props$searchProps.model) || reactive({});
+    var pageState = props.pageState || reactive(_objectSpread2({}, defaultPage));
 
-      return createVNode(ProModule, pick(props, moduleKeys), {
-        "default": function _default() {
-          return [createVNode(CurdModule, omit(props, moduleKeys), {
-            "default": function _default() {
-              return [(_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)];
-            }
-          })];
-        }
-      });
-    };
-  }
-});
+    var handleSearch = function handleSearch() {
+      emit("list", _objectSpread2(_objectSpread2({}, searchState), pageState));
+    }; //页数重置1 且搜索
 
-var proCurdNetProps = function proCurdNetProps() {
-  return {
-    //发起接口参数/接口回来数据 转换
-    converts: {
-      type: Object
-    },
-    //
-    operate: {
-      type: Object
-    }
-  };
-};
 
-var ProCurdNet = defineComponent({
-  props: _objectSpread2(_objectSpread2({}, ProCurd.props), proCurdNetProps()),
-  setup: function setup(props, _ref) {
-    var _actionConvertParamsM;
+    var executeSearchWithResetPage = function executeSearchWithResetPage() {
+      pageState.page = 1;
+      handleSearch();
+    }; //无SearchForm组件 初始化 触发
 
-    var slots = _ref.slots;
 
-    var _useRequestProvide = useRequestProvide(),
-        dispatchRequest = _useRequestProvide.dispatchRequest,
-        requestSubject$ = _useRequestProvide.requestSubject$;
+    useEffect(function () {
+      var _props$searchProps2, _props$searchProps3;
 
-    var curdState = props.curdState || 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 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)
-        };
+      if (size((_props$searchProps2 = props.searchProps) === null || _props$searchProps2 === void 0 ? void 0 : _props$searchProps2.columns) <= 0 && ((_props$searchProps3 = props.searchProps) === null || _props$searchProps3 === void 0 ? void 0 : _props$searchProps3.initEmit) !== false) {
+        handleSearch();
       }
-    }, 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 = get(props.operate, "".concat(action, "Actor"));
-
-        if (!actor) {
-          return;
-        } // action he actorName 绑定
-
-
-        actorNameMap[actor.name] = action;
-        var convertParams = 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);
-    };
+    }, []); //无SearchForm组件 订阅searchState
 
-    var operate = _objectSpread2({
-      //list
-      onList: function onList(values) {
-        var _props$operate, _props$operate$onList;
+    useWatch(function () {
+      var _props$searchProps4;
 
-        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;
-        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);
+      if (size((_props$searchProps4 = props.searchProps) === null || _props$searchProps4 === void 0 ? void 0 : _props$searchProps4.columns) <= 0) {
+        executeSearchWithResetPage();
       }
-    }, props.operate); //网络请求订阅
+    }, searchState);
+    return function () {
+      var _slots$divide, _slots$divide2;
 
+      var searchProps = props.searchProps;
+      var tableProps = props.tableProps;
+      var paginationProps = props.paginationProps; //操作按钮
 
-    useEffect(function () {
-      //请求成功
-      var doneSub = requestSubject$.pipe(filter$1(isDoneRequestActor), tap(function (actor) {
-        var action = actorNameMap[actor.name];
-        var actionDone = get(operate, camelCase("on-".concat(action, "-done")));
-        actionDone === null || actionDone === void 0 ? void 0 : actionDone(actor);
-        lastRequestActors[action] = undefined;
-      })).subscribe(); //请求失败
-
-      var failSub = requestSubject$.pipe(filter$1(isFailedRequestActor), tap(function (actor) {
-        var action = actorNameMap[actor.name];
-        var actionFail = get(operate, 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请求
+      var extra = slots.extra ? createVNode("div", {
+        "class": "pro-list-search"
+      }, [slots.extra()]) : null; //分页参数
 
-        forEach(lastRequestActors, function (actor) {
-          actor && dispatchRequest(_objectSpread2(_objectSpread2({}, actor), {}, {
-            stage: "CANCEL"
-          }));
-        });
-      };
-    }, []);
-    return function () {
-      var _slots$default;
+      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 createVNode(ProCurd, omit(props, "converts"), {
+      return createVNode(Fragment, null, [size(searchProps === null || searchProps === void 0 ? void 0 : searchProps.columns) > 0 && createVNode(ProSearchForm, mergeProps(searchProps, {
+        "model": searchState,
+        "onFinish": executeSearchWithResetPage
+      }), {
         "default": function _default() {
-          return [(_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+          return [props.extraInSearch && extra];
         }
-      });
+      }), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), (size(searchProps === null || searchProps === void 0 ? void 0 : searchProps.columns) <= 0 || !props.extraInSearch) && extra, slots["default"] ? slots["default"]() : createVNode(ProTable, 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), isNumber(paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.total) && paginationProps.total > 0 && createVNode(Fragment, null, [slots.pagination ? slots.pagination(pagination) : createVNode(ElPagination, pagination, null)])]);
     };
   }
 });
@@ -1490,8 +1006,8 @@ var OkButton = defineComponent({
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
 
-    var _useProCurdModule = useProCurdModule(),
-        curdState = _useProCurdModule.curdState;
+    var _useProCurd = useProCurd(),
+        curdState = _useProCurd.curdState;
 
     return function () {
       return createVNode(ProSubmitButton, mergeProps({
@@ -1517,8 +1033,8 @@ var ContinueAddButton = defineComponent({
   setup: function setup(props, _ref2) {
     var slots = _ref2.slots;
 
-    var _useProCurdModule2 = useProCurdModule(),
-        curdState = _useProCurdModule2.curdState;
+    var _useProCurd2 = useProCurd(),
+        curdState = _useProCurd2.curdState;
 
     return function () {
       return createVNode(ProSubmitButton, mergeProps({
@@ -1567,8 +1083,8 @@ var ProOperateButton = defineComponent({
   setup: function setup(props, _ref3) {
     var slots = _ref3.slots;
 
-    var _useProCurdModule3 = useProCurdModule(),
-        curdState = _useProCurdModule3.curdState;
+    var _useProCurd3 = useProCurd(),
+        curdState = _useProCurd3.curdState;
 
     return function () {
       var _slots$left, _slots$center, _slots$right;
@@ -1598,49 +1114,52 @@ var proCurdFormProps = function proCurdFormProps() {
 };
 
 var ProCurdForm = defineComponent({
-  props: _objectSpread2(_objectSpread2({}, ProForm.props), proCurdFormProps()),
+  props: _objectSpread2(_objectSpread2({}, ProSchemaForm.props), proCurdFormProps()),
   setup: function setup(props, _ref4) {
     var slots = _ref4.slots;
 
     var _useProModule = useProModule(),
-        getFormItemVNode = _useProModule.getFormItemVNode;
+        elementMap = _useProModule.elementMap,
+        formElementMap = _useProModule.formElementMap;
 
-    var _useProCurdModule4 = useProCurdModule(),
-        curdState = _useProCurdModule4.curdState,
-        formColumns = _useProCurdModule4.formColumns,
-        operate = _useProCurdModule4.operate;
-
-    var formVNodes = computed(function () {
-      return map(formColumns.value, function (item) {
-        return getFormItemVNode(item, true);
-      });
-    });
+    var _useProCurd4 = useProCurd(),
+        curdState = _useProCurd4.curdState,
+        formColumns = _useProCurd4.formColumns,
+        sendCurdEvent = _useProCurd4.sendCurdEvent;
 
     var handleFinish = function handleFinish(values) {
       if (curdState.mode === CurdCurrentMode.EDIT) {
-        var _operate$onEditExecut;
-
         //edit
-        (_operate$onEditExecut = operate.onEditExecute) === null || _operate$onEditExecut === void 0 ? void 0 : _operate$onEditExecut.call(operate, values);
+        sendCurdEvent({
+          action: CurdAction.EDIT,
+          type: "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: CurdAction.ADD,
+          type: "execute",
+          values: values
+        });
       }
     };
 
     return function () {
-      return createVNode(ProForm, mergeProps(props, {
+      var _slots$default;
+
+      return createVNode(ProSchemaForm, mergeProps({
+        "elementMap": elementMap,
+        "formElementMap": formElementMap
+      }, props, {
+        "columns": formColumns,
         "model": curdState.detailData,
         "readonly": curdState.mode === CurdCurrentMode.DETAIL,
         "hideRequiredAsterisk": curdState.mode === CurdCurrentMode.DETAIL,
         "onFinish": handleFinish
       }), _objectSpread2({
         "default": function _default() {
-          var _slots$default;
-
-          return createVNode(Fragment, null, [formVNodes.value, curdState.mode !== CurdCurrentMode.DETAIL && createVNode(ProOperateButton, omit(props.operateButtonProps, "slots"), get(props.operateButtonProps, "slots")), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)]);
+          return [curdState.mode !== CurdCurrentMode.DETAIL && createVNode(ProOperateButton, omit(props.operateButtonProps, "slots"), get(props.operateButtonProps, "slots")), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
         }
       }, omit(slots, "default")));
     };
@@ -1648,8 +1167,8 @@ var ProCurdForm = defineComponent({
 });
 var ProCurdFormConnect = defineComponent({
   setup: function setup() {
-    var _useProCurdModule5 = useProCurdModule(),
-        formProps = _useProCurdModule5.formProps;
+    var _useProCurd5 = useProCurd(),
+        formProps = _useProCurd5.formProps;
 
     return function () {
       return createVNode(ProCurdForm, omit(formProps, "slots"), get(formProps, "slots"));
@@ -1657,172 +1176,75 @@ var ProCurdFormConnect = defineComponent({
   }
 });
 
-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 = defineComponent({
-  props: _objectSpread2({}, curdListProps()),
+  props: _objectSpread2({}, ProList.props),
   setup: function setup(props, _ref) {
-    var _props$searchProps;
-
     var slots = _ref.slots;
 
     var _useProModule = useProModule(),
         elementMap = _useProModule.elementMap,
         formElementMap = _useProModule.formElementMap;
 
-    var _useProCurdModule = useProCurdModule(),
-        curdState = _useProCurdModule.curdState,
-        searchColumns = _useProCurdModule.searchColumns,
-        tableColumns = _useProCurdModule.tableColumns,
-        operate = _useProCurdModule.operate;
+    var _useProCurd = 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: get(operate, "".concat(propName, "Label")),
-        show: get(operate, propName, false),
-        onClick: function onClick(record) {
-          var fun = get(operate, camelCase("on-".concat(propName)));
-          fun === null || fun === void 0 ? void 0 : fun(record);
-        }
-      };
+    var prepareTableItem = function prepareTableItem(action) {
+      return _objectSpread2(_objectSpread2({}, pick(getOperate(action), "label", "element", "show", "disabled", "onClick", "sort")), {}, {
+        value: action
+      });
     }; //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) || reactive({});
-    var pageState = props.pageState || reactive(_objectSpread2({}, defaultPage));
-
-    var handleSearch = function handleSearch() {
-      operate.onList && operate.onList(_objectSpread2(_objectSpread2({}, searchState), pageState));
-    };
-
-    var executeSearchWithResetPage = function executeSearchWithResetPage() {
-      pageState.page = 1;
-      handleSearch();
-    }; //无SearchForm组件 初始化
-
-
-    useEffect(function () {
-      var _props$searchProps2;
-
-      // 处理触发onList 操作
-      if (size(searchColumns.value) <= 0 && ((_props$searchProps2 = props.searchProps) === null || _props$searchProps2 === void 0 ? void 0 : _props$searchProps2.initEmit) !== false) {
-        handleSearch();
-      }
-    }, []); //无SearchForm组件 订阅searchState
-
-    useWatch(function () {
-      if (size(searchColumns.value) > 0) {
-        return;
-      }
-
-      executeSearchWithResetPage();
-    }, searchState);
+    var tableOperateItems = [prepareTableItem(CurdAction.DETAIL), prepareTableItem(CurdAction.EDIT), prepareTableItem(CurdAction.DELETE)];
     return function () {
-      var _slots$extra, _slots$divide, _curdState$listData, _props$tableProps, _slots$divide2, _curdState$listData2;
-
-      var pagination = props.paginationProps; //
-
-      var _extra = createVNode("div", {
-        "class": "pro-curd-list-search"
-      }, [operate.add && createVNode(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];
-        }
-      }), (_slots$extra = slots.extra) === null || _slots$extra === void 0 ? void 0 : _slots$extra.call(slots)]);
-
-      return createVNode(Fragment, null, [size(searchColumns.value) > 0 && createVNode(ProSearchForm, mergeProps({
-        "formElementMap": formElementMap,
-        "columns": searchColumns.value
-      }, props.searchProps, {
-        "model": searchState,
-        "onFinish": executeSearchWithResetPage
-      }), {
-        //extraInSearch 模式下放入SearchForm
-        extra: function extra() {
-          return props.extraInSearch ? _extra : null;
+      var _tableProps$operate, _tableProps$operate2, _curdState$listData, _curdState$listData2;
+
+      var tableProps = props.tableProps;
+      return createVNode(ProList, mergeProps({
+        "onList": function onList(values) {
+          sendCurdEvent({
+            action: CurdAction.LIST,
+            type: "emit",
+            values: values
+          });
         }
-      }), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), (size(searchColumns.value) <= 0 || !props.extraInSearch) && (operate.add || slots.extra) && _extra, slots["default"] ? slots["default"]() : withDirectives(createVNode(ProTable, mergeProps({
-        "elementMap": elementMap,
-        "columns": tableColumns.value,
-        "operate": mergeWith({
-          items: tableOperateItems
-        }, operate.tableOperate, function (objValue, srcValue) {
-          if (isArray(objValue) && isArray(srcValue)) {
-            return concat(objValue, srcValue);
-          }
+      }, props, {
+        "searchProps": _objectSpread2(_objectSpread2({
+          formElementMap: formElementMap
+        }, props.searchProps), {}, {
+          columns: searchColumns.value
+        }),
+        "tableProps": _objectSpread2(_objectSpread2({
+          elementMap: elementMap
+        }, tableProps), {}, {
+          operate: _objectSpread2(_objectSpread2({}, tableProps === null || tableProps === void 0 ? void 0 : tableProps.operate), {}, {
+            items: tableProps !== null && tableProps !== void 0 && (_tableProps$operate = tableProps.operate) !== null && _tableProps$operate !== void 0 && _tableProps$operate.items ? [].concat(tableOperateItems, _toConsumableArray(tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$operate2 = tableProps.operate) === null || _tableProps$operate2 === void 0 ? void 0 : _tableProps$operate2.items)) : tableOperateItems
+          }),
+          columns: tableColumns.value,
+          loading: curdState.listLoading,
+          data: (_curdState$listData = curdState.listData) === null || _curdState$listData === void 0 ? void 0 : _curdState$listData.dataSource
+        }),
+        "paginationProps": _objectSpread2(_objectSpread2({}, props.paginationProps), {}, {
+          total: (_curdState$listData2 = curdState.listData) === null || _curdState$listData2 === void 0 ? void 0 : _curdState$listData2.total
         })
-      }, 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), [[resolveDirective("loading"), curdState.listLoading]]), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), curdState.listData && isNumber((_curdState$listData2 = curdState.listData) === null || _curdState$listData2 === void 0 ? void 0 : _curdState$listData2.total) && curdState.listData.total > 0 && createVNode("div", {
-        "class": "pro-curd-list-bottom"
-      }, [createVNode(ElPagination, 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 = defineComponent({
   setup: function setup() {
-    var _useProCurdModule2 = useProCurdModule(),
-        listProps = _useProCurdModule2.listProps;
+    var _useProCurd2 = useProCurd(),
+        listProps = _useProCurd2.listProps;
 
     return function () {
       return createVNode(ProCurdList, omit(listProps, "slots"), get(listProps, "slots"));
@@ -1842,9 +1264,9 @@ var ProCurdDesc = defineComponent({
     var _useProModule = useProModule(),
         getItemVNode = _useProModule.getItemVNode;
 
-    var _useProCurdModule = useProCurdModule(),
-        curdState = _useProCurdModule.curdState,
-        descColumns = _useProCurdModule.descColumns;
+    var _useProCurd = useProCurd(),
+        curdState = _useProCurd.curdState,
+        descColumns = _useProCurd.descColumns;
 
     var descVNodes = computed(function () {
       return map(descColumns.value, function (item) {
@@ -1872,8 +1294,8 @@ var ProCurdDesc = defineComponent({
 });
 var ProCurdDescConnect = defineComponent({
   setup: function setup() {
-    var _useProCurdModule2 = useProCurdModule(),
-        descProps = _useProCurdModule2.descProps;
+    var _useProCurd2 = useProCurd(),
+        descProps = _useProCurd2.descProps;
 
     return function () {
       return createVNode(ProCurdList, omit(descProps, "slots"), get(descProps, "slots"));
@@ -1881,4 +1303,4 @@ var ProCurdDescConnect = defineComponent({
   }
 });
 
-export { ContinueAddButton, CurdAddAction, CurdCurrentMode, OkButton, ProCurd, ProCurdDesc, ProCurdDescConnect, ProCurdForm, ProCurdFormConnect, ProCurdList, ProCurdListConnect, ProCurdNet, ProForm, ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormItem, ProFormList, ProFormRadio, ProFormSelect, ProFormSwitch, ProFormText, ProFormTextNumber, ProFormTimePicker, ProFormTreeSelect, ProModule, ProOperateButton, ProSchemaForm, ProSearchForm, ProSelect, ProSubmitButton, ProTable, SearchMode, convertPathToList, createFormItemComponent, defaultPage, getColumnFormItemName, getColumnValueType, getFormItemEl, getItemEl, getValidValues, provideProCurdModule, provideProForm, provideProFormList, provideProModule, useProCurdModule, useProForm, useProFormList, useProModule };
+export { ContinueAddButton, OkButton, ProCurdDesc, ProCurdDescConnect, ProCurdForm, ProCurdFormConnect, ProCurdList, ProCurdListConnect, ProForm, ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormItem, ProFormList, ProFormRadio, ProFormSelect, ProFormSwitch, ProFormText, ProFormTextNumber, ProFormTimePicker, ProFormTreeSelect, ProList, ProOperateButton, ProSchemaForm, ProSearchForm, ProSelect, ProSubmitButton, ProTable, SearchMode, createFormItemComponent, defaultPage, provideProForm, provideProFormList, useProForm, useProFormList };