@vue-start/pro 0.3.0 → 0.4.0

package/dist/index.es.js

@@ -1,5 +1,5 @@
-import { defineComponent, computed, reactive, inject, h, provide, ref, createVNode, mergeProps, Fragment } from 'vue';
-import { map, isString, forEach, filter as filter$1, keys, omit, isArray, split, isFunction, get, isEmpty, isObject, mergeWith, reduce, sortBy, pick, debounce, size, some, clone, set, isBoolean, merge as merge$1 } from 'lodash';
+import { defineComponent, createVNode, mergeProps, isVNode, computed, h, inject, reactive, Fragment, provide, ref } from 'vue';
+import { map, isString, forEach, reduce, size, get, set, pick, omit, isArray, some, keys, isFunction, head, isObject, findIndex, find, filter as filter$1, split, isEmpty, mergeWith, sortBy, concat, isUndefined, debounce, clone, isBoolean } from 'lodash';
 import { filter, tap, merge, Subject } from 'rxjs';
 import { useEffect, setReactiveValue, useWatch } from '@vue-start/hooks';
 import { useRequestProvide, isFailedRequestActor, isPreRequestActor, isDoneRequestActor } from '@vue-start/request';
@@ -79,6 +79,50 @@ 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.");
 }
 
+function _isSlot$1(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !isVNode(s);
+}
+
+var proGridProps = function proGridProps() {
+  return {
+    row: {
+      type: Object,
+      "default": undefined
+    },
+    col: {
+      type: Object
+    },
+    items: {
+      type: Array
+    }
+  };
+};
+
+var createGrid = function createGrid(Row, Col) {
+  return defineComponent({
+    props: _objectSpread2({}, proGridProps()),
+    setup: function setup(props) {
+      return function () {
+        var _slot;
+
+        return createVNode(Row, props.row, _isSlot$1(_slot = map(props.items, function (item) {
+          return createVNode(Col, mergeProps({
+            "key": item.rowKey
+          }, props.col, item.col), {
+            "default": function _default() {
+              return [item.vNode];
+            }
+          });
+        })) ? _slot : {
+          "default": function _default() {
+            return [_slot];
+          }
+        });
+      };
+    }
+  });
+};
+
 var createUseRequestActor = function createUseRequestActor(filterFun) {
   return function (actors, callback) {
     var _useRequestProvide = useRequestProvide(),
@@ -151,94 +195,12 @@ var useComposeRequestActor = function useComposeRequestActor(actors, options, ca
   }, []);
 };
 
-/**
- * 剔除showState或showStateRules规则为!true的值
- * @param values
- * @param showState
- * @param showStateRules
- */
-var getValidValues = function getValidValues(values, showState, showStateRules) {
-  if (showState) {
-    var invalidKeys = filter$1(keys(showState), function (key) {
-      return !showState[key];
-    });
-    return omit(values, invalidKeys);
-  }
-
-  if (showStateRules) {
-    var _invalidKeys = filter$1(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];
-};
-/**
- * 唯一id
- */
-
-var generateId = function generateId() {
-  return Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
-};
-/**
- * 将listState 中的数据通过id merge到 list item中
- * ps：数组会替换
- * @param list
- * @param listState
- * @param id
- */
-
-var mergeStateToList = function mergeStateToList(list, listState, id) {
-  if (!listState || !id) {
-    return list;
-  }
-
-  return map(list, function (item) {
-    var idName = isFunction(id) ? id(item) : id; //如果listState中有值，merge处理
-
-    var stateData = get(listState, idName);
-
-    if (!stateData || isEmpty(stateData) || isFunction(stateData) || !isObject(stateData)) {
-      return item;
-    } //只有是对象（键值对）才合并
-
-
-    return mergeWith(item, stateData, function (objValue, srcValue) {
-      //如果是数组，替换
-      if (isArray(objValue) || isArray(srcValue)) {
-        return srcValue;
-      }
-    });
-  });
-};
+/***************************************** curd模式 *****************************************/
 
 /**
  * 获取Column的valueType，默认"text"
  * @param column
  */
-
 var getColumnValueType = function getColumnValueType(column) {
   return column.formValueType || column.valueType || "text";
 };
@@ -304,6 +266,213 @@ var getItemEl = function getItemEl(elementMap, column, value) {
     value: value
   }), (_column$formFieldProp2 = column.formFieldProps) === null || _column$formFieldProp2 === void 0 ? void 0 : _column$formFieldProp2.slots);
 };
+/***************************************** 通用模式 *****************************************/
+
+var renderElements = function renderElements(elementMap, elementConfigs) {
+  return map(elementConfigs, function (elementConfig) {
+    return renderElement(elementMap, elementConfig);
+  });
+};
+/**
+ * props转换
+ */
+
+var convertPropsEl = function convertPropsEl(elementMap, elementConfig) {
+  var _elementConfig$highCo;
+
+  var elementProps = elementConfig.elementProps;
+
+  var nextProps = _objectSpread2({}, elementConfig.elementProps);
+
+  forEach((_elementConfig$highCo = elementConfig.highConfig$) === null || _elementConfig$highCo === void 0 ? void 0 : _elementConfig$highCo.registerPropsTrans, function (item) {
+    var target = get(elementProps, item.name);
+
+    if (!target || isVNode(target)) {
+      return;
+    }
+
+    if (isArray(target)) {
+      //如果list中存在VNode，不转换
+      if (some(target, function (sub) {
+        return isVNode(sub);
+      })) {
+        return;
+      } //如果碰到特殊场景，可以替换成单个渲染模式
+
+
+      set(nextProps, item.name, renderElements(elementMap, target));
+      return;
+    }
+
+    if (!target.elementType) {
+      return;
+    }
+
+    if (item.isFun) {
+      set(nextProps, item.name, function () {
+        for (var _len = arguments.length, params$ = new Array(_len), _key = 0; _key < _len; _key++) {
+          params$[_key] = arguments[_key];
+        }
+
+        var ep = item.needParams ? _objectSpread2(_objectSpread2({}, target.elementProps), {}, {
+          params$: params$
+        }) : target.elementProps;
+        return renderElement(elementMap, _objectSpread2(_objectSpread2({}, target), {}, {
+          elementProps: ep
+        }));
+      });
+    } else {
+      set(nextProps, item.name, renderElement(elementMap, target));
+    }
+  });
+  return nextProps;
+};
+/**
+ * slots转换
+ */
+
+
+var convertSlots = function convertSlots(elementMap, elementConfig) {
+  var children = size(elementConfig.children) > 0 ? renderElements(elementMap, elementConfig.children) : undefined; //children插槽名称
+
+  var childrenSlotName = elementConfig.childrenSlotName || "default";
+  var validSlots = omit(elementConfig.slots, children ? childrenSlotName : ""); //如果slots注册的是 IElementConfig ，进行转换
+
+  forEach(keys(validSlots), function (k) {
+    var v = validSlots[k]; //IElementConfig
+
+    if (v && !isFunction(v) && v.elementType) {
+      validSlots[k] = function () {
+        for (var _len2 = arguments.length, params$ = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+          params$[_key2] = arguments[_key2];
+        }
+
+        //如果需要params，在props中注入 params$
+        var elementProps = v.needParams ? _objectSpread2(_objectSpread2({}, v.elementProps), {}, {
+          params$: params$
+        }) : v.elementProps;
+        return renderElement(elementMap, _objectSpread2(_objectSpread2({}, v), {}, {
+          elementProps: elementProps
+        }));
+      };
+    }
+  });
+  return _objectSpread2(_defineProperty({}, childrenSlotName, children ? function () {
+    return children;
+  } : undefined), validSlots);
+};
+/**
+ *
+ * @param elementMap
+ * @param elementConfig
+ */
+
+
+var renderElement = function renderElement(elementMap, elementConfig) {
+  var El = get(elementMap, elementConfig.elementType) || elementConfig.elementType; //如果有highConfig$，包裹一层Wrapper
+
+  if (elementConfig.highConfig$) {
+    return h(Wrapper, {
+      key: elementConfig.elementId,
+      elementMap: elementMap,
+      elementConfig: elementConfig
+    });
+  }
+
+  var slots = convertSlots(elementMap, elementConfig);
+  var elementProps = convertPropsEl(elementMap, elementConfig);
+  return h(El, _objectSpread2({
+    key: elementConfig.elementId
+  }, elementProps), slots);
+};
+/**
+ * 获取第一层级属性名
+ * 如：['aaa','bbb',...] 中的 'aaa'
+ * 如："aaa.bbb.ccc..." 中的 'aaa'
+ */
+
+var getFirstPropName = function getFirstPropName(name) {
+  if (isArray(name)) {
+    return head(name);
+  } else if (isString(name) && name.indexOf(".") > 0) {
+    return name.substring(0, name.indexOf("."));
+  }
+
+  return name;
+};
+/**
+ * 处理highConfig$
+ */
+
+var Wrapper = defineComponent({
+  props: {
+    elementMap: {
+      type: Object
+    },
+    elementConfig: {
+      type: Object
+    }
+  },
+  setup: function setup(props) {
+    var _useProModule = useProModule(),
+        state = _useProModule.state,
+        sendEvent = _useProModule.sendEvent;
+
+    var elementMap = props.elementMap,
+        elementConfig = props.elementConfig;
+    var highConfig$ = elementConfig.highConfig$; //转换props
+
+    var elementProps = convertPropsEl(elementMap, elementConfig); //事件订阅
+
+    var events = reduce(highConfig$.registerEventList, function (pair, item) {
+      return _objectSpread2(_objectSpread2({}, pair), {}, _defineProperty({}, item.name, function () {
+        for (var _len3 = arguments.length, params = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+          params[_key3] = arguments[_key3];
+        }
+
+        sendEvent({
+          type: item.sendEventName || elementConfig.elementId,
+          payload: params
+        });
+      }));
+    }, {}); //receiveStateList 订阅
+
+    var receiveStates = computed(function () {
+      if (!highConfig$.registerStateList || size(highConfig$.registerStateList) <= 0) {
+        return undefined;
+      }
+
+      var changeProps = _objectSpread2({}, elementProps); //赋值 && 返回一级属性名称
+
+
+      var firstPropNameList = map(highConfig$.registerStateList, function (item) {
+        var targetName = item.mapName || item.name; //从state中取值
+
+        var value = get(state, item.name); //赋值
+
+        set(changeProps, targetName, value); //返回一级属性名称
+
+        return getFirstPropName(targetName);
+      });
+      return pick(changeProps, firstPropNameList);
+    });
+    var El = get(elementMap, elementConfig.elementType) || elementConfig.elementType;
+    var slots = convertSlots(elementMap, elementConfig);
+    return function () {
+      //如果标记show$值为false，不渲染组件
+      var show$ = get(receiveStates.value, "show$");
+
+      if (show$ === false) {
+        return null;
+      }
+
+      return h(El, _objectSpread2(_objectSpread2(_objectSpread2({
+        key: elementConfig.elementId
+      }, elementProps), omit(receiveStates.value, "show$")), events), slots);
+    };
+  }
+});
+
 var ProModuleKey = Symbol("pro-module");
 var useProModule = function useProModule() {
   return inject(ProModuleKey);
@@ -326,32 +495,17 @@ var proModuleProps = function proModuleProps() {
     },
 
     /**
-     * 配置（静态）
-     */
-    columns: {
-      type: Array
-    },
-
-    /**
-     * 配置（动态）
-     * columns动态属性兼容
-     */
-    columnState: {
-      type: Object
-    },
-
-    /**
-     * 展示组件集
+     * 组件集
      */
     elementMap: {
       type: Object
     },
 
     /**
-     * 录入组件集
+     * 组件描述（树）
      */
-    formElementMap: {
-      type: Object
+    elementConfigs: {
+      type: Array
     },
 
     /**
@@ -369,25 +523,13 @@ var ProModule = defineComponent({
     var slots = _ref.slots,
         expose = _ref.expose;
 
-    /**
-     * columns columnState 合并
-     */
-    var columns = computed(function () {
-      return mergeStateToList(props.columns, props.columnState, function (item) {
-        return getColumnFormItemName(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
-
+    /*********************************** render ***************************************/
+    var render = function render(elementConfig) {
+      if (isArray(elementConfig)) {
+        return renderElements(props.elementMap, elementConfig);
+      }
 
-    var getItemVNode = function getItemVNode(column, value) {
-      return getItemEl(props.elementMap, column, value);
+      return renderElement(props.elementMap, elementConfig);
     };
     /*********************************** 事件处理 ***************************************/
 
@@ -403,13 +545,15 @@ var ProModule = defineComponent({
     var state = props.state || reactive({});
 
     var dispatch = function dispatch(action) {
-      //如果要更新的属性值是 object ，执行覆盖操作
-      if (isObject(state[action.type])) {
-        setReactiveValue(state[action.type], action.payload);
+      var prev = state[action.type];
+      var data = isFunction(action.payload) ? action.payload(prev) : action.payload; //如果要更新的属性值是 object ，执行覆盖操作
+
+      if (isObject(prev)) {
+        setReactiveValue(state[action.type], data);
         return;
       }
 
-      state[action.type] = action.payload;
+      state[action.type] = data;
     };
     /*********************************** request ***************************************/
 
@@ -513,11 +657,7 @@ var ProModule = defineComponent({
       }
     }, true);
     provideProModule({
-      columns: columns,
-      getFormItemVNode: getFormItemVNode,
-      getItemVNode: getItemVNode,
       elementMap: props.elementMap,
-      formElementMap: props.formElementMap,
       //
       subject$: subject$,
       sendEvent: sendEvent,
@@ -535,7 +675,7 @@ var ProModule = defineComponent({
     return function () {
       var _slots$default;
 
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
+      return createVNode(Fragment, null, [size(props.elementConfigs) > 0 && render(props.elementConfigs), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)]);
     };
   }
 });
@@ -593,26 +733,201 @@ var CurdSubAction;
   CurdSubAction["FAIL"] = "FAIL";
 })(CurdSubAction || (CurdSubAction = {}));
 
-/**
- * curd 操作模式
+/**
+ * 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 treeDefaultNames = {
+  children: "children",
+  label: "label",
+  value: "value"
+};
+/**
+ * 根据value从treeData中找到对象
+ * @param data
+ * @param value
+ * @param fieldNames
+ * @param cb 对象：同步   方法：回调，可以理解为异步
+ */
+
+var findTargetInTree = function findTargetInTree(data, value, fieldNames, cb) {
+  var index = findIndex(data, function (item) {
+    return get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || treeDefaultNames.value) === value;
+  });
+
+  if (index > -1) {
+    if (isFunction(cb)) {
+      cb(index, data[index], data);
+    } else {
+      cb.index = index;
+      cb.target = data[index];
+      cb.list = data;
+    }
+
+    return;
+  }
+
+  forEach(data, function (item) {
+    var children = get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || treeDefaultNames.children);
+
+    if (size(children) > 0) {
+      findTargetInTree(children, value, fieldNames, cb);
+    }
+  });
+};
+/**
+ * 根据value从treeData中找出对象及父列表
+ * @param data
+ * @param value
+ * @param fieldNames
+ * @param cb
+ * @param parent
+ */
+
+var findTargetListInTree = function findTargetListInTree(data, value, fieldNames, cb) {
+  var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+  var target = find(data, function (item) {
+    return get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || treeDefaultNames.value) === value;
+  });
+
+  if (target) {
+    if (isFunction(cb)) {
+      cb([].concat(_toConsumableArray(parent), [target]));
+    } else {
+      cb.list = [].concat(_toConsumableArray(parent), [target]);
+    }
+
+    return;
+  }
+
+  forEach(data, function (item) {
+    var children = get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || treeDefaultNames.children);
+
+    if (size(children) > 0) {
+      findTargetListInTree(children, value, fieldNames, cb, [].concat(_toConsumableArray(parent), [item]));
+    }
+  });
+};
+
+/**
+ * 剔除showState或showStateRules规则为!true的值
+ * @param values
+ * @param showState
+ * @param showStateRules
+ */
+
+var getValidValues = function getValidValues(values, showState, showStateRules) {
+  if (showState) {
+    var invalidKeys = filter$1(keys(showState), function (key) {
+      return !showState[key];
+    });
+    return omit(values, invalidKeys);
+  }
+
+  if (showStateRules) {
+    var _invalidKeys = filter$1(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];
+};
+/**
+ * 将listState 中的数据通过id merge到 list item中
+ * ps：数组会替换
+ * 注意：mergeWith 会改变原始对象
+ * @param list
+ * @param listState
+ * @param id
+ */
+
+var mergeStateToList = function mergeStateToList(list, listState, id) {
+  if (!listState || !id) {
+    return list;
+  }
+
+  return map(list, function (item) {
+    var idName = isFunction(id) ? id(item) : id; //如果listState中有值，merge处理
+
+    var stateData = get(listState, idName);
+
+    if (!stateData || isEmpty(stateData) || isFunction(stateData) || !isObject(stateData)) {
+      return item;
+    } //只有是对象（键值对）才合并
+
+
+    return mergeWith(item, stateData, function (objValue, srcValue) {
+      //如果是数组，替换
+      if (isArray(objValue) || isArray(srcValue)) {
+        return srcValue;
+      }
+    });
+  });
+};
+
+/**
+ * 唯一id
  */
-var CurdCurrentMode;
-
-(function (CurdCurrentMode) {
-  CurdCurrentMode["ADD"] = "ADD";
-  CurdCurrentMode["EDIT"] = "EDIT";
-  CurdCurrentMode["DETAIL"] = "DETAIL";
-})(CurdCurrentMode || (CurdCurrentMode = {}));
 
-/**
- * curd add 模式下 标记 "确定" "确定并继续" 触发
+var generateId = function generateId() {
+  return Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+};
+/**
+ * ref 传递
  */
-var CurdAddAction;
 
-(function (CurdAddAction) {
-  CurdAddAction["NORMAL"] = "NORMAL";
-  CurdAddAction["CONTINUE"] = "CONTINUE";
-})(CurdAddAction || (CurdAddAction = {}));
+var createExpose = function createExpose(methods, targetRef) {
+  return reduce(methods, function (pair, method) {
+    return _objectSpread2(_objectSpread2({}, pair), {}, _defineProperty({}, method, function () {
+      var _targetRef$value, _targetRef$value$meth;
+
+      for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+        params[_key] = arguments[_key];
+      }
+
+      return (_targetRef$value = targetRef.value) === null || _targetRef$value === void 0 ? void 0 : (_targetRef$value$meth = _targetRef$value[method]) === null || _targetRef$value$meth === void 0 ? void 0 : _targetRef$value$meth.call.apply(_targetRef$value$meth, [_targetRef$value].concat(params));
+    }));
+  }, {});
+};
 
 var defaultPage = {
   page: 1,
@@ -621,6 +936,28 @@ var defaultPage = {
 
 var proCurdProps = function proCurdProps() {
   return {
+    /**
+     * 配置（静态）
+     */
+    columns: {
+      type: Array
+    },
+
+    /**
+     * 配置（动态）
+     * columns动态属性兼容
+     */
+    columnState: {
+      type: Object
+    },
+
+    /**
+     * 录入组件集
+     */
+    formElementMap: {
+      type: Object
+    },
+
     /**
      * 列表 或 详情 的唯一标识
      */
@@ -659,58 +996,67 @@ var Curd = defineComponent({
         expose = _ref.expose;
 
     var _ref2 = useProModule(),
-        columns = _ref2.columns,
+        elementMap = _ref2.elementMap,
         state = _ref2.state,
         sendEvent = _ref2.sendEvent,
         sendRequest = _ref2.sendRequest;
     /**
-     * 排序
-     * @param list
-     * @param propName
+     * columns columnState 合并
      */
 
 
-    var dealSort = function dealSort(list, propName) {
-      return sortBy(list, function (item) {
-        return get(item, propName);
+    var columns = computed(function () {
+      return mergeStateToList(props.columns, props.columnState, function (item) {
+        return getColumnFormItemName(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(elementMap, column, value);
     };
     /**
-     * 非 hideInForm columns
+     * ${signName} 配置为true 会被选择
+     * @param signName
+     * @param opposite 如果为true，未配置（undefined）会被选择
      */
 
 
+    var getSignColumns = function getSignColumns(signName, opposite) {
+      var signColumns = filter$1(columns.value, function (item) {
+        var sign = get(item, ["extra", signName]) || get(item, signName);
+
+        if (opposite) {
+          //不为false 即为选中
+          return sign !== false;
+        } //只有true 才为选中
+
+
+        return sign;
+      });
+      return sortBy(signColumns, function (item) {
+        return get(item, ["extra", "".concat(signName, "Sort")]) || get(item, "".concat(signName, "Sort"));
+      });
+    };
+
     var formColumns = computed(function () {
-      return dealSort(filter$1(columns.value, function (item) {
-        return !item.hideInForm;
-      }), "formSort");
+      return getSignColumns("form", true);
     });
-    /**
-     * 非 hideInDetail columns
-     */
-
     var descColumns = computed(function () {
-      return dealSort(filter$1(columns.value, function (item) {
-        return !item.hideInDetail;
-      }), "descSort");
+      return getSignColumns("detail", true);
     });
-    /**
-     *  非 hideInTable columns
-     */
-
     var tableColumns = computed(function () {
-      return dealSort(filter$1(columns.value, function (item) {
-        return !item.hideInTable;
-      }), "tableSort");
+      return getSignColumns("table", true);
     });
-    /**
-     * search columns
-     */
-
     var searchColumns = computed(function () {
-      return dealSort(filter$1(columns.value, function (item) {
-        return !!item.search;
-      }), "searchSort");
+      return getSignColumns("search");
     });
     /******************************** 逻辑 *************************************/
     //上一次发起列表请求的参数
@@ -795,6 +1141,13 @@ var Curd = defineComponent({
       return props.modalProps;
     });
     provideProCurd({
+      columns: columns,
+      getSignColumns: getSignColumns,
+      getFormItemVNode: getFormItemVNode,
+      getItemVNode: getItemVNode,
+      elementMap: elementMap,
+      formElementMap: props.formElementMap,
+      //
       rowKey: props.rowKey,
       curdState: state,
       formColumns: formColumns,
@@ -1176,99 +1529,419 @@ var PageCurd = defineComponent({
           type: "detailData",
           payload: props.defaultAddRecord || {}
         });
-      } else if (subAction === CurdSubAction.SUCCESS) {
-        if (curdState.addAction === CurdAddAction.CONTINUE) {
-          dispatch({
-            type: "detailData",
-            payload: props.defaultAddRecord || {}
-          });
-        } else {
-          props.routeBack ? props.routeBack(CurdAction.ADD) : router.go(-1);
-        }
-      }
-    };
+      } else if (subAction === CurdSubAction.SUCCESS) {
+        if (curdState.addAction === CurdAddAction.CONTINUE) {
+          dispatch({
+            type: "detailData",
+            payload: props.defaultAddRecord || {}
+          });
+        } else {
+          props.routeBack ? props.routeBack(CurdAction.ADD) : router.go(-1);
+        }
+      }
+    };
+
+    var dealEdit = function dealEdit(subAction, _ref2) {
+      var record = _ref2.record;
+
+      if (subAction === CurdSubAction.EMIT) {
+        router.push({
+          path: "".concat(route.path, "/edit"),
+          query: pick(record, rowKey)
+        });
+      } else if (subAction === CurdSubAction.PAGE) {
+        dispatch({
+          type: "mode",
+          payload: CurdCurrentMode.EDIT
+        });
+        sendRequest(CurdAction.DETAIL, route.query, rowKey);
+      } else if (subAction === CurdSubAction.SUCCESS) {
+        props.routeBack ? props.routeBack(CurdAction.EDIT) : router.go(-1);
+      }
+    };
+
+    useModuleEvent(function (_ref3) {
+      var type = _ref3.type,
+          payload = _ref3.payload,
+          source = _ref3.source;
+
+      if (source) {
+        return;
+      }
+
+      var action = type;
+      var subAction = payload === null || payload === void 0 ? void 0 : payload.type;
+      var record = payload === null || payload === void 0 ? void 0 : payload.record;
+
+      if (action === RequestAction.Success) {
+        //覆盖
+        action = get(payload, ["requestOpts", "action"]);
+        subAction = CurdSubAction.SUCCESS;
+      }
+
+      switch (action) {
+        case CurdAction.LIST:
+          dealList(subAction);
+          break;
+
+        case CurdAction.DETAIL:
+          dealDetail(subAction, {
+            record: record
+          });
+          break;
+
+        case CurdAction.ADD:
+          dealAdd(subAction);
+          break;
+
+        case CurdAction.EDIT:
+          dealEdit(subAction, {
+            record: record
+          });
+          break;
+      }
+    });
+    return function () {
+      return null;
+    };
+  }
+});
+var ProPageCurd = defineComponent({
+  props: _objectSpread2(_objectSpread2({}, ProCurd.props), PageCurd.props),
+  setup: function setup(props, _ref4) {
+    var slots = _ref4.slots;
+    var invalidKeys = keys(PageCurd.props);
+    return function () {
+      var _slots$default;
+
+      return createVNode(ProCurd, omit(props, invalidKeys), {
+        "default": function _default() {
+          return [createVNode(PageCurd, pick(props, invalidKeys), null), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+        }
+      });
+    };
+  }
+});
+
+function _isSlot(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !isVNode(s);
+}
+
+var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
+  return defineComponent({
+    props: _objectSpread2(_objectSpread2({}, Descriptions.props), {}, {
+      //重写Item content
+      renderItem: {
+        type: Function
+      }
+    }),
+    setup: function setup(props, _ref) {
+      var slots = _ref.slots;
+
+      var _useProCurd = useProCurd(),
+          getItemVNode = _useProCurd.getItemVNode,
+          curdState = _useProCurd.curdState,
+          descColumns = _useProCurd.descColumns;
+
+      var descVNodes = computed(function () {
+        return map(descColumns.value, function (item) {
+          var _slot;
+
+          var _props$renderItem;
+
+          var vn = (_props$renderItem = props.renderItem) === null || _props$renderItem === void 0 ? void 0 : _props$renderItem.call(props, item);
+
+          if (vn) {
+            return vn;
+          }
+
+          var value = get(curdState.detailData, item.dataIndex);
+          return createVNode(DescriptionsItem, mergeProps({
+            "key": item.dataIndex,
+            "label": item.title
+          }, get(item.extra, "desc")), _isSlot(_slot = getItemVNode(item, value)) ? _slot : {
+            "default": function _default() {
+              return [_slot];
+            }
+          });
+        });
+      });
+      return function () {
+        var _slots$start, _slots$default;
+
+        return createVNode(Descriptions, props, _objectSpread2({
+          "default": function _default() {
+            return [(_slots$start = slots.start) === null || _slots$start === void 0 ? void 0 : _slots$start.call(slots), descVNodes.value, (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+          }
+        }, omit(slots, "default", "start")));
+      };
+    }
+  });
+};
+
+var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
+  return {
+    //是否使用operate bar
+    operateBar: {
+      type: Boolean,
+      "default": true
+    },
+    //显示 确定并继续 按钮
+    showContinueAdd: {
+      type: Boolean,
+      "default": false
+    },
+    //
+    okText: {
+      type: String,
+      "default": "确定"
+    },
+    okButtonProps: {
+      type: Object
+    },
+    //
+    continueText: {
+      type: String,
+      "default": "确定并继续"
+    },
+    continueButtonProps: {
+      type: Object
+    }
+  };
+};
+
+var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
+  return defineComponent({
+    props: _objectSpread2(_objectSpread2({}, Form.props), proCurdAddOrEditProps()),
+    setup: function setup(props, _ref) {
+      var slots = _ref.slots;
+
+      var _useProCurd = useProCurd(),
+          elementMap = _useProCurd.elementMap,
+          formElementMap = _useProCurd.formElementMap,
+          curdState = _useProCurd.curdState,
+          formColumns = _useProCurd.formColumns,
+          sendCurdEvent = _useProCurd.sendCurdEvent;
+
+      var formRef = ref();
+
+      var handleFinish = function handleFinish(values) {
+        if (curdState.mode === CurdCurrentMode.EDIT) {
+          //edit
+          sendCurdEvent({
+            action: CurdAction.EDIT,
+            type: CurdSubAction.EXECUTE,
+            values: values
+          });
+        } else {
+          //add
+          sendCurdEvent({
+            action: CurdAction.ADD,
+            type: CurdSubAction.EXECUTE,
+            values: values
+          });
+        }
+      };
+
+      var handleAdd = function handleAdd() {
+        var _formRef$value;
+
+        curdState.addAction = CurdAddAction.NORMAL;
+        (_formRef$value = formRef.value) === null || _formRef$value === void 0 ? void 0 : _formRef$value.submit();
+      };
+
+      var handleContinueAdd = function handleContinueAdd() {
+        var _formRef$value2;
+
+        curdState.addAction = CurdAddAction.CONTINUE;
+        (_formRef$value2 = formRef.value) === null || _formRef$value2 === void 0 ? void 0 : _formRef$value2.submit();
+      };
+
+      return function () {
+        var _slots$divide, _slots$operateStart, _slots$operateCenter, _slots$operateEnd, _slots$default;
+
+        return createVNode(Form, mergeProps({
+          "ref": formRef
+        }, props, {
+          "elementMap": props.elementMap || elementMap,
+          "formElementMap": props.formElementMap || formElementMap,
+          "columns": formColumns.value,
+          "model": curdState.detailData,
+          "readonly": curdState.mode === CurdCurrentMode.DETAIL,
+          "onFinish": handleFinish
+        }, convertFormProps === null || convertFormProps === void 0 ? void 0 : convertFormProps(curdState)), _objectSpread2({
+          "default": function _default() {
+            return [(_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), props.operateBar && createVNode("div", {
+              "class": "pro-curd-form-operate"
+            }, [(_slots$operateStart = slots.operateStart) === null || _slots$operateStart === void 0 ? void 0 : _slots$operateStart.call(slots), curdState.mode !== CurdCurrentMode.DETAIL && createVNode(Button, mergeProps({
+              "onClick": handleAdd
+            }, props.okButtonProps, {
+              "loading": curdState.operateLoading
+            }), {
+              "default": function _default() {
+                return [props.okText];
+              }
+            }), (_slots$operateCenter = slots.operateCenter) === null || _slots$operateCenter === void 0 ? void 0 : _slots$operateCenter.call(slots), props.showContinueAdd && curdState.mode === CurdCurrentMode.ADD && createVNode(Button, mergeProps({
+              "onClick": handleContinueAdd
+            }, props.continueButtonProps, {
+              "loading": curdState.operateLoading
+            }), {
+              "default": function _default() {
+                return [props.continueText];
+              }
+            }), (_slots$operateEnd = slots.operateEnd) === null || _slots$operateEnd === void 0 ? void 0 : _slots$operateEnd.call(slots)]), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+          }
+        }, omit(slots, "default", "divide", "operateStart", "operateCenter", "operateEnd")));
+      };
+    }
+  });
+};
+
+var proCurdListProps = function proCurdListProps() {
+  return {
+    /**
+     * extra 是否放到SearchForm中
+     */
+    extraInSearch: {
+      type: Boolean,
+      "default": undefined
+    },
+    //search
+    searchProps: {
+      type: Object
+    },
+    //table
+    tableProps: {
+      type: Object
+    },
+    //pageState
+    pageState: {
+      type: Object
+    }
+  };
+};
+
+var createCurdList = function createCurdList(SearchForm, Table) {
+  return defineComponent({
+    props: _objectSpread2({}, proCurdListProps()),
+    setup: function setup(props, _ref) {
+      var slots = _ref.slots;
+
+      var _useProCurd = useProCurd(),
+          elementMap = _useProCurd.elementMap,
+          formElementMap = _useProCurd.formElementMap,
+          curdState = _useProCurd.curdState,
+          searchColumns = _useProCurd.searchColumns,
+          tableColumns = _useProCurd.tableColumns,
+          getOperate = _useProCurd.getOperate,
+          sendCurdEvent = _useProCurd.sendCurdEvent;
+      /******************* search pagination ********************/
+
+
+      var pageState = props.pageState || reactive(_objectSpread2({}, defaultPage));
+      var prevValues;
+
+      var handleSearch = function handleSearch() {
+        sendCurdEvent({
+          action: CurdAction.LIST,
+          type: CurdSubAction.EMIT,
+          values: _objectSpread2(_objectSpread2({}, prevValues), pageState)
+        });
+      };
 
-    var dealEdit = function dealEdit(subAction, _ref2) {
-      var record = _ref2.record;
+      var executeSearchWithResetPage = function executeSearchWithResetPage(values) {
+        prevValues = values;
+        pageState.page = 1;
+        handleSearch();
+      };
+      /******************* table ********************/
 
-      if (subAction === CurdSubAction.EMIT) {
-        router.push({
-          path: "".concat(route.path, "/edit"),
-          query: pick(record, rowKey)
-        });
-      } else if (subAction === CurdSubAction.PAGE) {
-        dispatch({
-          type: "mode",
-          payload: CurdCurrentMode.EDIT
-        });
-        sendRequest(CurdAction.DETAIL, route.query, rowKey);
-      } else if (subAction === CurdSubAction.SUCCESS) {
-        props.routeBack ? props.routeBack(CurdAction.EDIT) : router.go(-1);
-      }
-    };
 
-    useModuleEvent(function (_ref3) {
-      var type = _ref3.type,
-          payload = _ref3.payload,
-          source = _ref3.source;
+      var createTableItem = function createTableItem(action) {
+        var operate = getOperate(action);
 
-      if (source) {
-        return;
-      }
+        var item = _objectSpread2(_objectSpread2({}, pick(operate, "label", "element", "disabled", "sort", "onClick")), {}, {
+          show: !isUndefined(operate === null || operate === void 0 ? void 0 : operate.show) ? operate === null || operate === void 0 ? void 0 : operate.show : false,
+          value: action
+        });
 
-      var action = type;
-      var subAction = payload === null || payload === void 0 ? void 0 : payload.type;
-      var record = payload === null || payload === void 0 ? void 0 : payload.record;
+        if (!item.onClick) {
+          return _objectSpread2(_objectSpread2({}, item), {}, {
+            onClick: function onClick(record) {
+              //默认发送事件
+              sendCurdEvent({
+                action: action,
+                type: CurdSubAction.EMIT,
+                record: record
+              });
+            }
+          });
+        }
 
-      if (action === RequestAction.Success) {
-        //覆盖
-        action = get(payload, ["requestOpts", "action"]);
-        subAction = CurdSubAction.SUCCESS;
-      }
+        return item;
+      }; //table操作栏 items
 
-      switch (action) {
-        case CurdAction.LIST:
-          dealList(subAction);
-          break;
 
-        case CurdAction.DETAIL:
-          dealDetail(subAction, {
-            record: record
-          });
-          break;
+      var tableOperateItems = [createTableItem(CurdAction.DETAIL), createTableItem(CurdAction.EDIT), createTableItem(CurdAction.DELETE)]; //新配置的operate item，添加默认发送事件方法
 
-        case CurdAction.ADD:
-          dealAdd(subAction);
-          break;
+      var convertOperateItems = function convertOperateItems(list) {
+        return map(list, function (item) {
+          if (!item.onClick) {
+            return _objectSpread2(_objectSpread2({}, item), {}, {
+              onClick: function onClick(record) {
+                sendCurdEvent({
+                  action: "operate",
+                  type: item.value,
+                  record: record
+                });
+              }
+            });
+          }
 
-        case CurdAction.EDIT:
-          dealEdit(subAction, {
-            record: record
-          });
-          break;
-      }
-    });
-    return function () {
-      return null;
-    };
-  }
-});
-var ProPageCurd = defineComponent({
-  props: _objectSpread2(_objectSpread2({}, ProCurd.props), PageCurd.props),
-  setup: function setup(props, _ref4) {
-    var slots = _ref4.slots;
-    var invalidKeys = keys(PageCurd.props);
-    return function () {
-      var _slots$default;
+          return item;
+        });
+      };
 
-      return createVNode(ProCurd, omit(props, invalidKeys), {
-        "default": function _default() {
-          return [createVNode(PageCurd, pick(props, invalidKeys), null), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
-        }
-      });
-    };
-  }
-});
+      return function () {
+        var _props$searchProps, _slots$divide, _curdState$listData, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd;
+
+        var tableProps = props.tableProps;
+        var extra = slots.extra ? createVNode("div", {
+          "class": "pro-curd-list-extra"
+        }, [slots.extra()]) : null;
+        return createVNode(Fragment, null, [createVNode(SearchForm, mergeProps({
+          "formElementMap": formElementMap
+        }, omit(props.searchProps, "slots"), {
+          "columns": searchColumns.value,
+          "onFinish": executeSearchWithResetPage
+        }), _objectSpread2({
+          "default": function _default() {
+            return [props.extraInSearch && extra];
+          }
+        }, (_props$searchProps = props.searchProps) === null || _props$searchProps === void 0 ? void 0 : _props$searchProps.slots)), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), !props.extraInSearch && extra, slots.table ? slots.table() : createVNode(Table, mergeProps({
+          "elementMap": elementMap
+        }, omit(tableProps, "slots", "operate"), {
+          "operate": mergeWith({
+            items: tableOperateItems
+          }, tableProps === null || tableProps === void 0 ? void 0 : tableProps.operate, function (objValue, srcValue) {
+            if (isArray(objValue) && isArray(srcValue)) {
+              return concat(objValue, convertOperateItems(srcValue));
+            }
+          }),
+          "paginationState": {
+            page: pageState.page,
+            pageSize: pageState.pageSize
+          },
+          "columns": tableColumns.value,
+          "loading": curdState.listLoading,
+          "dataSource": (_curdState$listData = curdState.listData) === null || _curdState$listData === void 0 ? void 0 : _curdState$listData.dataSource
+        }), tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), createVNode("div", {
+          "class": "pro-curd-list-footer"
+        }, [(_slots$footerStart = slots.footerStart) === null || _slots$footerStart === void 0 ? void 0 : _slots$footerStart.call(slots), (_slots$pagination = slots.pagination) === null || _slots$pagination === void 0 ? void 0 : _slots$pagination.call(slots, pageState, (_curdState$listData2 = curdState.listData) === null || _curdState$listData2 === void 0 ? void 0 : _curdState$listData2.total, handleSearch), (_slots$footerEnd = slots.footerEnd) === null || _slots$footerEnd === void 0 ? void 0 : _slots$footerEnd.call(slots)])]);
+      };
+    }
+  });
+};
 
 var ProFormKey = Symbol("pro-form");
 var useProForm = function useProForm() {
@@ -1368,65 +2041,120 @@ var proFormProps = function proFormProps() {
   };
 };
 
-var ProForm = defineComponent({
-  props: _objectSpread2({}, proFormProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-    var formState = props.model || reactive({}); //组件状态相关
+var createForm = function createForm(Form, Grid) {
+  return defineComponent({
+    inheritAttrs: false,
+    props: _objectSpread2(_objectSpread2(_objectSpread2({}, Form.props), proFormProps()), omit(Grid.props, "items")),
+    setup: function setup(props, _ref) {
+      var slots = _ref.slots,
+          emit = _ref.emit,
+          expose = _ref.expose,
+          attrs = _ref.attrs;
+      var formState = props.model || reactive({}); //组件状态相关
+
+      var showState = props.showState || reactive({});
+      var readonlyState = props.readonlyState || reactive({});
+      var disableState = props.disableState || reactive({}); //formState改变情况下，更新 showState，readonlyState，disableState状态
+
+      useEffect(function () {
+        if (props.showStateRules) {
+          forEach(props.showStateRules, function (fn, key) {
+            showState[key] = fn(formState);
+          });
+        }
 
-    var showState = props.showState || reactive({});
-    var readonlyState = props.readonlyState || reactive({});
-    var disableState = props.disableState || reactive({}); //formState改变情况下，更新 showState，readonlyState，disableState状态
+        if (props.readonlyStateRules) {
+          forEach(props.readonlyStateRules, function (fn, key) {
+            readonlyState[key] = fn(formState);
+          });
+        }
 
-    useEffect(function () {
-      if (props.showStateRules) {
-        forEach(props.showStateRules, function (fn, key) {
-          showState[key] = fn(formState);
-        });
-      }
+        if (props.disableStateRules) {
+          forEach(props.disableStateRules, function (fn, key) {
+            disableState[key] = fn(formState);
+          });
+        }
+      }, formState); //readonly
 
-      if (props.readonlyStateRules) {
-        forEach(props.readonlyStateRules, function (fn, key) {
-          readonlyState[key] = fn(formState);
-        });
-      }
+      var readonly = computed(function () {
+        return props.readonly;
+      }); //columns合并
 
-      if (props.disableStateRules) {
-        forEach(props.disableStateRules, function (fn, key) {
-          disableState[key] = fn(formState);
+      var columns = computed(function () {
+        return mergeStateToList(props.columns, props.columnState, function (item) {
+          return getColumnFormItemName(item);
         });
-      }
-    }, formState); //转换为ref对象
-
-    var readonly = computed(function () {
-      return props.readonly;
-    });
-    var columns = computed(function () {
-      return mergeStateToList(props.columns, props.columnState, function (item) {
-        return getColumnFormItemName(item);
       });
-    });
-    provideProForm(_objectSpread2({
-      formState: formState,
-      showState: showState,
-      readonlyState: readonlyState,
-      disableState: disableState,
-      //
-      elementMap: props.elementMap,
-      formElementMap: props.formElementMap,
-      //
-      readonly: readonly,
-      //
-      columns: columns
-    }, props.provideExtra));
-    return function () {
-      var _slots$default;
 
-      // console.log("########", columns.value, props.columns, props.columnState);
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
-    };
-  }
-});
+      var handleFinish = function handleFinish(values) {
+        //删除不显示的值再触发事件
+        var showValues = getValidValues(values, showState, props.showStateRules);
+        emit("finish", showValues, values);
+      };
+
+      var formRef = ref();
+      expose({
+        submit: function submit() {
+          var _formRef$value;
+
+          (_formRef$value = formRef.value) === null || _formRef$value === void 0 ? void 0 : _formRef$value.submit();
+        },
+        resetFields: function resetFields() {
+          var _formRef$value2;
+
+          for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+            params[_key] = arguments[_key];
+          }
+
+          (_formRef$value2 = formRef.value) === null || _formRef$value2 === void 0 ? void 0 : _formRef$value2.resetFields.apply(_formRef$value2, params);
+        }
+      });
+      provideProForm(_objectSpread2({
+        formState: formState,
+        showState: showState,
+        readonlyState: readonlyState,
+        disableState: disableState,
+        //
+        elementMap: props.elementMap,
+        formElementMap: props.formElementMap,
+        //
+        readonly: readonly,
+        //
+        columns: columns,
+        //
+        formRef: formRef
+      }, props.provideExtra));
+      var invalidKeys = keys(proFormProps());
+      var gridKeys = keys(omit(Grid.props, "items"));
+      return function () {
+        var _slots$start, _slots$default;
+
+        return createVNode(Form, mergeProps({
+          "ref": formRef
+        }, omit(attrs, "onFinish"), omit.apply(void 0, [props].concat(_toConsumableArray(invalidKeys), _toConsumableArray(gridKeys), ["onFinish"])), {
+          "model": formState,
+          "onFinish": handleFinish
+        }), _objectSpread2({
+          "default": function _default() {
+            return [(_slots$start = slots.start) === null || _slots$start === void 0 ? void 0 : _slots$start.call(slots), props.formElementMap && size(columns.value) > 0 && createVNode(Fragment, null, [props.row ? createVNode(Grid, {
+              "row": props.row,
+              "col": props.col,
+              "items": map(columns.value, function (item) {
+                return {
+                  rowKey: getColumnFormItemName(item),
+                  vNode: getFormItemEl(props.formElementMap, item, props.needRules),
+                  col: get(item, ["extra", "col"])
+                };
+              })
+            }, null) : map(columns.value, function (item) {
+              return getFormItemEl(props.formElementMap, item, props.needRules);
+            })]), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+          }
+        }, omit(slots, "default")));
+      };
+    }
+  });
+};
 
 var SearchMode;
 
@@ -1475,6 +2203,11 @@ var proSearchFormProps = function proSearchFormProps() {
     debounceKeys: {
       type: Array
     },
+    //默认 valueType 为 text 的控件会debounce处理
+    debounceTypes: {
+      type: Array,
+      "default": ["text"]
+    },
     debounceTime: {
       type: Number,
       "default": 800
@@ -1486,62 +2219,74 @@ var proSearchFormProps = function proSearchFormProps() {
  * 该组件只是个模式，最终返回null，不做任何渲染，应配合着ProForm的包装类一起使用
  * 针对传入的model（监听对象）做相应的finish（回调）处理
  */
-var ProSearchForm = defineComponent({
-  props: _objectSpread2({}, proSearchFormProps()),
-  setup: function setup(props, _ref) {
-    var emit = _ref.emit;
-    //根据column valueType 算出默认需要debounce处理的属性集合
-    var defaultDebounceKeys = map(filter$1(props.columns, function (column) {
-      var valueType = getColumnValueType(column); //默认input组件的触发事件需要debounce处理
-
-      return valueType === "text";
-    }), function (column) {
-      return getColumnFormItemName(column);
-    });
+var createSearchForm = function createSearchForm(Form, Props) {
+  return defineComponent({
+    props: _objectSpread2(_objectSpread2(_objectSpread2({}, Form.props), Props), proSearchFormProps()),
+    setup: function setup(props, _ref) {
+      var slots = _ref.slots;
+      var formState = props.model || reactive({});
+      var valueTypeSet = new Set(props.debounceTypes); //根据column valueType 算出默认需要debounce处理的属性集合
+
+      var defaultDebounceKeys = map(filter$1(props.columns, function (column) {
+        var valueType = getColumnValueType(column); //默认input组件的触发事件需要debounce处理
+
+        return valueTypeSet.has(valueType);
+      }), function (column) {
+        return getColumnFormItemName(column);
+      });
+      var formRef = ref();
 
-    var handleFinish = function handleFinish() {
-      emit("finish");
-    };
+      var handleFinish = function handleFinish() {
+        var _formRef$value;
 
-    var debounceFinish = debounce(function () {
-      handleFinish();
-    }, props.debounceTime); //初始化
+        (_formRef$value = formRef.value) === null || _formRef$value === void 0 ? void 0 : _formRef$value.submit();
+      };
 
-    useEffect(function () {
-      if (props.initEmit) {
+      var debounceFinish = debounce(function () {
         handleFinish();
-      }
-    }, []);
+      }, props.debounceTime); //初始化
 
-    var isDebounceDataChange = function isDebounceDataChange(state, prevState, debounceKeys) {
-      return some(debounceKeys, function (key) {
-        return get(state, key) !== get(prevState, key);
-      });
-    }; //监听
+      useEffect(function () {
+        if (props.initEmit) {
+          handleFinish();
+        }
+      }, []);
 
+      var isDebounceDataChange = function isDebounceDataChange(state, prevState, debounceKeys) {
+        return some(debounceKeys, function (key) {
+          return get(state, key) !== get(prevState, key);
+        });
+      }; //监听
 
-    useWatch(function (state, prevState) {
-      if (props.searchMode !== SearchMode.AUTO) {
-        return;
-      } //如果改变的值中包括debounceKeys中注册的 延时触发
 
+      useWatch(function (state, prevState) {
+        if (props.searchMode !== SearchMode.AUTO) {
+          return;
+        } //如果改变的值中包括debounceKeys中注册的 延时触发
 
-      var debounceKeys = size(props.debounceKeys) > 0 ? props.debounceKeys : defaultDebounceKeys;
 
-      if (size(debounceKeys) > 0 && isDebounceDataChange(state, prevState, debounceKeys)) {
-        debounceFinish();
-        return;
-      }
+        var debounceKeys = size(props.debounceKeys) > 0 ? props.debounceKeys : defaultDebounceKeys;
 
-      handleFinish();
-    }, function () {
-      return clone(props.model);
-    });
-    return function () {
-      return null;
-    };
-  }
-});
+        if (size(debounceKeys) > 0 && isDebounceDataChange(state, prevState, debounceKeys)) {
+          debounceFinish();
+          return;
+        }
+
+        handleFinish();
+      }, function () {
+        return clone(formState);
+      });
+      var invalidKeys = keys(omit(proSearchFormProps(), "columns"));
+      return function () {
+        return createVNode(Form, mergeProps({
+          "ref": formRef
+        }, omit(props, invalidKeys), {
+          "model": formState
+        }), slots);
+      };
+    }
+  });
+};
 
 /**
  * ProFormList ctx
@@ -1575,86 +2320,83 @@ var FormListProvider = defineComponent({
   }
 });
 
-var proFormListProps = function proFormListProps() {
-  return {
-    //每行默认id
-    rowKey: {
-      type: String,
-      "default": "id"
-    },
-    //name
-    name: {
-      type: [String, Number, Array],
-      required: true
-    }
-  };
-};
-
-var ProFormList = defineComponent({
-  props: _objectSpread2({}, proFormListProps()),
-  setup: function setup(props, _ref2) {
-    var slots = _ref2.slots;
-
-    var _useProForm = useProForm(),
-        formState = _useProForm.formState,
-        readonly = _useProForm.readonly;
+var createFormList = function createFormList(FormItem) {
+  return defineComponent({
+    props: _objectSpread2(_objectSpread2({}, FormItem.props), {}, {
+      //每行默认id
+      rowKey: {
+        type: String,
+        "default": "id"
+      }
+    }),
+    setup: function setup(props, _ref2) {
+      var slots = _ref2.slots;
 
-    var formListCtx = useProFormList();
-    var nameList = convertPathToList(props.name);
-    var path = formListCtx !== null && formListCtx !== void 0 && formListCtx.pathList ? [].concat(_toConsumableArray(formListCtx.pathList), _toConsumableArray(nameList)) : nameList;
+      var _useProForm = useProForm(),
+          formState = _useProForm.formState,
+          readonly = _useProForm.readonly;
 
-    var handleAdd = function handleAdd() {
-      var targetList = get(formState, path);
+      var formListCtx = useProFormList();
+      var nameList = convertPathToList(props.name);
+      var path = formListCtx !== null && formListCtx !== void 0 && formListCtx.pathList ? [].concat(_toConsumableArray(formListCtx.pathList), _toConsumableArray(nameList)) : nameList;
 
-      if (!isArray(targetList)) {
-        targetList = [];
-      }
+      var handleAdd = function handleAdd() {
+        var targetList = get(formState, path);
 
-      targetList.push(_defineProperty({}, props.rowKey, new Date().valueOf()));
-      set(formState, path, targetList);
-    };
+        if (!isArray(targetList)) {
+          targetList = [];
+        }
 
-    var handleRemove = function handleRemove(index) {
-      var targetList = get(formState, path);
+        targetList.push(_defineProperty({}, props.rowKey, new Date().valueOf()));
+        set(formState, path, targetList);
+      };
 
-      if (size(targetList) <= 0) {
-        return;
-      }
+      var handleRemove = function handleRemove(index) {
+        var targetList = get(formState, path);
 
-      targetList.splice(index, 1);
-    };
+        if (size(targetList) <= 0) {
+          return;
+        }
 
-    return function () {
-      var _slots$add;
+        targetList.splice(index, 1);
+      };
 
-      return createVNode(Fragment, null, [map(get(formState, path), function (item, index) {
-        var _slots$default2, _slots$itemAdd, _slots$itemMinus;
+      return function () {
+        var _slots$add;
 
-        return createVNode(FormListProvider, {
-          "key": index,
-          "pathList": [].concat(_toConsumableArray(path), [index])
-        }, {
+        return createVNode(FormItem, omit(props, "rowKey"), {
           "default": function _default() {
-            return [createVNode("div", {
-              "class": "pro-form-list-item"
-            }, [(_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots), !readonly.value && createVNode(Fragment, null, [createVNode("div", {
-              "class": "pro-form-list-item-add",
+            return [map(get(formState, path), function (item, index) {
+              var _slots$default2, _slots$itemAdd, _slots$itemMinus;
+
+              return createVNode(FormListProvider, {
+                "key": item[props.rowKey] || index,
+                "pathList": [].concat(_toConsumableArray(path), [index])
+              }, {
+                "default": function _default() {
+                  return [createVNode("div", {
+                    "class": "pro-form-list-item"
+                  }, [(_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots), !readonly.value && createVNode(Fragment, null, [createVNode("div", {
+                    "class": "pro-form-list-item-add",
+                    "onClick": handleAdd
+                  }, [(_slots$itemAdd = slots.itemAdd) === null || _slots$itemAdd === void 0 ? void 0 : _slots$itemAdd.call(slots)]), createVNode("div", {
+                    "class": "pro-form-list-item-minus",
+                    "onClick": function onClick() {
+                      return handleRemove(index);
+                    }
+                  }, [(_slots$itemMinus = slots.itemMinus) === null || _slots$itemMinus === void 0 ? void 0 : _slots$itemMinus.call(slots)])])])];
+                }
+              });
+            }), !readonly.value && createVNode("div", {
+              "class": "pro-form-list-add",
               "onClick": handleAdd
-            }, [(_slots$itemAdd = slots.itemAdd) === null || _slots$itemAdd === void 0 ? void 0 : _slots$itemAdd.call(slots)]), createVNode("div", {
-              "class": "pro-form-list-item-minus",
-              "onClick": function onClick() {
-                return handleRemove(index);
-              }
-            }, [(_slots$itemMinus = slots.itemMinus) === null || _slots$itemMinus === void 0 ? void 0 : _slots$itemMinus.call(slots)])])])];
+            }, [(_slots$add = slots.add) === null || _slots$add === void 0 ? void 0 : _slots$add.call(slots)])];
           }
         });
-      }), !readonly.value && createVNode("div", {
-        "class": "pro-form-list-add",
-        "onClick": handleAdd
-      }, [(_slots$add = slots.add) === null || _slots$add === void 0 ? void 0 : _slots$add.call(slots)])]);
-    };
-  }
-});
+      };
+    }
+  });
+};
 
 var proFormItemProps = function proFormItemProps() {
   return {
@@ -1780,13 +2522,6 @@ var proTableProps = function proTableProps() {
       type: Object
     },
 
-    /**
-     * loading
-     */
-    loading: {
-      type: Boolean
-    },
-
     /**
      * 序号
      */
@@ -1797,7 +2532,7 @@ var proTableProps = function proTableProps() {
     /**
      * 分页
      */
-    pagination: {
+    paginationState: {
       type: Object
     },
 
@@ -1810,62 +2545,35 @@ var proTableProps = function proTableProps() {
   };
 };
 
-var ProTable = defineComponent({
-  props: _objectSpread2({}, proTableProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-    var columns = computed(function () {
-      var mergeColumns = mergeStateToList(props.columns, props.columnState, function (item) {
-        return item.dataIndex;
-      }); //根据valueType选择对应的展示组件
-
-      var columns = map(mergeColumns, function (item) {
-        //merge公共item
-        var nextItem = merge$1(props.column, item);
-
-        if (!item.customRender) {
-          nextItem.customRender = function (_ref2) {
-            var text = _ref2.text;
-            var vn = getItemEl(props.elementMap, _objectSpread2(_objectSpread2({}, item), {}, {
-              showProps: _objectSpread2(_objectSpread2({}, item.showProps), {}, {
-                content: props.columnEmptyText
-              })
-            }), text); //如果找不到注册的组件，使用当前值 及 columnEmptyText
-
-            return vn || text || props.columnEmptyText;
-          };
-        }
-
-        return nextItem;
-      }); //处理序号
+var createTable = function createTable(Table, Props) {
+  return defineComponent({
+    props: _objectSpread2(_objectSpread2(_objectSpread2({}, Table.props), Props), proTableProps()),
+    setup: function setup(props, _ref) {
+      var slots = _ref.slots;
 
-      if (props.serialNumber) {
-        columns.unshift(_objectSpread2(_objectSpread2({
+      var createNumberColumn = function createNumberColumn() {
+        return _objectSpread2(_objectSpread2({
           title: "序号",
           dataIndex: "serialNumber",
           width: 80
         }, props.column), {}, {
-          // @ts-ignore
-          customRender: function customRender(_ref3) {
-            var _props$pagination, _props$pagination2;
+          customRender: function customRender(_ref2) {
+            var _props$paginationStat, _props$paginationStat2;
 
-            var index = _ref3.index;
+            var index = _ref2.index;
 
-            if ((_props$pagination = props.pagination) !== null && _props$pagination !== void 0 && _props$pagination.page && (_props$pagination2 = props.pagination) !== null && _props$pagination2 !== void 0 && _props$pagination2.pageSize) {
-              return props.pagination.pageSize * (props.pagination.page - 1) + index + 1;
+            if ((_props$paginationStat = props.paginationState) !== null && _props$paginationStat !== void 0 && _props$paginationStat.page && (_props$paginationStat2 = props.paginationState) !== null && _props$paginationStat2 !== void 0 && _props$paginationStat2.pageSize) {
+              return props.paginationState.pageSize * (props.paginationState.page - 1) + index + 1;
             }
 
             return index + 1;
           }
-        }));
-      }
+        });
+      };
 
-      var operate = props.operate; //处理operate
+      var createOperateColumn = function createOperateColumn() {
+        var operate = props.operate; //将itemState补充的信息拼到item中
 
-      if (operate && operate.items && some(operate.items, function (item) {
-        return item.show;
-      })) {
-        //将itemState补充的信息拼到item中
         var items = map(operate.items, function (i) {
           return _objectSpread2(_objectSpread2({}, i), get(operate.itemState, i.value));
         }); //排序
@@ -1873,14 +2581,14 @@ var ProTable = defineComponent({
         var sortedItems = sortBy(items, function (item) {
           return item.sort;
         });
-        columns.push(_objectSpread2(_objectSpread2({
+        return _objectSpread2(_objectSpread2(_objectSpread2({}, props.column), {}, {
           title: "操作",
           dataIndex: "operate",
           fixed: "right"
-        }, props.column), {}, {
-          customRender: function customRender(_ref4) {
-            var record = _ref4.record;
-            var validItems = filter$1(sortedItems, function (item) {
+        }, operate.column), {}, {
+          customRender: function customRender(_ref3) {
+            var record = _ref3.record;
+            var showItems = filter$1(sortedItems, function (item) {
               if (item.show && isFunction(item.show)) {
                 return item.show(record);
               }
@@ -1893,7 +2601,7 @@ var ProTable = defineComponent({
             });
             return createVNode("div", {
               "class": "pro-table-operate"
-            }, [map(validItems, function (item) {
+            }, [map(showItems, function (item) {
               //自定义
               if (isFunction(item.element)) {
                 return item.element(record, item);
@@ -1910,20 +2618,62 @@ var ProTable = defineComponent({
               }, [item.label]);
             })]);
           }
-        }, operate.column));
-      }
+        });
+      };
 
-      return columns;
-    });
-    provideProTable(_objectSpread2({
-      columns: columns
-    }, props.provideExtra));
-    return function () {
-      var _slots$default;
+      var columns = computed(function () {
+        var mergeColumns = mergeStateToList(props.columns, props.columnState, function (item) {
+          return item.dataIndex;
+        }); //根据valueType选择对应的展示组件
+
+        var columns = map(mergeColumns, function (item) {
+          //merge公共item
+          var nextItem = _objectSpread2(_objectSpread2({}, props.column), item);
+
+          if (!item.customRender) {
+            nextItem.customRender = function (_ref4) {
+              var text = _ref4.text;
+              var vn = getItemEl(props.elementMap, _objectSpread2(_objectSpread2({}, item), {}, {
+                showProps: _objectSpread2(_objectSpread2({}, item.showProps), {}, {
+                  content: props.columnEmptyText
+                })
+              }), text); //如果找不到注册的组件，使用当前值 及 columnEmptyText
+
+              return vn || text || props.columnEmptyText;
+            };
+          }
 
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
-    };
-  }
-});
+          return nextItem;
+        }); //处理序号
+
+        if (props.serialNumber) {
+          columns.unshift(createNumberColumn());
+        } //处理operate
+
+
+        if (props.operate && props.operate.items && some(props.operate.items, function (item) {
+          return item.show;
+        })) {
+          columns.push(createOperateColumn());
+        }
+
+        return columns;
+      });
+      var tableRef = ref();
+      provideProTable(_objectSpread2({
+        columns: columns,
+        tableRef: tableRef
+      }, props.provideExtra));
+      var invalidKeys = keys(proTableProps());
+      return function () {
+        return createVNode(Table, mergeProps({
+          "ref": tableRef
+        }, omit(props, invalidKeys), {
+          "columns": columns.value
+        }), slots);
+      };
+    }
+  });
+};
 
-export { CurdAction, CurdAddAction, CurdCurrentMode, CurdSubAction, ProCurd, ProForm, ProFormList, ProModalCurd, ProModule, ProPageCurd, ProSearchForm, ProTable, RequestAction, SearchMode, convertPathToList, createFormItemCompFn, defaultPage, generateId, getColumnFormItemName, getColumnValueType, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProModule, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };
+export { CurdAction, CurdAddAction, CurdCurrentMode, CurdSubAction, ProCurd, ProModalCurd, ProModule, ProPageCurd, RequestAction, SearchMode, Wrapper, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, findTargetInTree, findTargetListInTree, generateId, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProModule, renderElement, renderElements, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };