@vue-start/pro 0.3.1 → 0.3.2

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 } from 'lodash';
+import { defineComponent, createVNode, mergeProps, isVNode, computed, reactive, inject, h, provide, ref, Fragment } from 'vue';
+import { map, isString, forEach, findIndex, get, isFunction, size, find, filter as filter$1, keys, omit, isArray, split, isEmpty, isObject, mergeWith, reduce, sortBy, pick, concat, isUndefined, debounce, some, clone, set, 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,12 +195,85 @@ var useComposeRequestActor = function useComposeRequestActor(actors, options, ca
   }, []);
 };
 
+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) {
@@ -195,16 +312,10 @@ var convertPathToList = function convertPathToList(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：数组会替换
+ * 注意：mergeWith 会改变原始对象
  * @param list
  * @param listState
  * @param id
@@ -234,6 +345,31 @@ var mergeStateToList = function mergeStateToList(list, listState, id) {
   });
 };
 
+/**
+ * 唯一id
+ */
+
+var generateId = function generateId() {
+  return Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+};
+/**
+ * ref 传递
+ */
+
+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));
+    }));
+  }, {});
+};
+
 /**
  * 获取Column的valueType，默认"text"
  * @param column
@@ -621,16 +757,16 @@ var defaultPage = {
 
 var proCurdProps = function proCurdProps() {
   return {
-    /**
-     * 列表 或 详情 的唯一标识
+    /**
+     * 列表 或 详情 的唯一标识
      */
     rowKey: {
       type: String,
       "default": "id"
     },
 
-    /**
-     * operates
+    /**
+     * operates
      */
     operates: {
       type: Array
@@ -663,10 +799,10 @@ var Curd = defineComponent({
         state = _ref2.state,
         sendEvent = _ref2.sendEvent,
         sendRequest = _ref2.sendRequest;
-    /**
-     * 排序
-     * @param list
-     * @param propName
+    /**
+     * 排序
+     * @param list
+     * @param propName
      */
 
 
@@ -675,8 +811,8 @@ var Curd = defineComponent({
         return get(item, propName);
       });
     };
-    /**
-     * 非 hideInForm columns
+    /**
+     * 非 hideInForm columns
      */
 
 
@@ -685,8 +821,8 @@ var Curd = defineComponent({
         return !item.hideInForm;
       }), "formSort");
     });
-    /**
-     * 非 hideInDetail columns
+    /**
+     * 非 hideInDetail columns
      */
 
     var descColumns = computed(function () {
@@ -694,8 +830,8 @@ var Curd = defineComponent({
         return !item.hideInDetail;
       }), "descSort");
     });
-    /**
-     *  非 hideInTable columns
+    /**
+     *  非 hideInTable columns
      */
 
     var tableColumns = computed(function () {
@@ -703,8 +839,8 @@ var Curd = defineComponent({
         return !item.hideInTable;
       }), "tableSort");
     });
-    /**
-     * search columns
+    /**
+     * search columns
      */
 
     var searchColumns = computed(function () {
@@ -1270,6 +1406,319 @@ var ProPageCurd = defineComponent({
   }
 });
 
+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({}, Descriptions.props),
+    setup: function setup(props, _ref) {
+      var slots = _ref.slots;
+
+      var _useProModule = useProModule(),
+          getItemVNode = _useProModule.getItemVNode;
+
+      var _useProCurd = useProCurd(),
+          curdState = _useProCurd.curdState,
+          descColumns = _useProCurd.descColumns;
+
+      var descVNodes = computed(function () {
+        return map(descColumns.value, function (item) {
+          var _slot;
+
+          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, (_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 _useProModule = useProModule(),
+          elementMap = _useProModule.elementMap,
+          formElementMap = _useProModule.formElementMap;
+
+      var _useProCurd = useProCurd(),
+          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 _useProModule = useProModule(),
+          elementMap = _useProModule.elementMap,
+          formElementMap = _useProModule.formElementMap;
+
+      var _useProCurd = useProCurd(),
+          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 executeSearchWithResetPage = function executeSearchWithResetPage(values) {
+        prevValues = values;
+        pageState.page = 1;
+        handleSearch();
+      };
+      /******************* table ********************/
+
+
+      var createTableItem = function createTableItem(action) {
+        var operate = getOperate(action);
+
+        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
+        });
+
+        if (!item.onClick) {
+          return _objectSpread2(_objectSpread2({}, item), {}, {
+            onClick: function onClick(record) {
+              //默认发送事件
+              sendCurdEvent({
+                action: action,
+                type: CurdSubAction.EMIT,
+                record: record
+              });
+            }
+          });
+        }
+
+        return item;
+      }; //table操作栏 items
+
+
+      var tableOperateItems = [createTableItem(CurdAction.DETAIL), createTableItem(CurdAction.EDIT), createTableItem(CurdAction.DELETE)]; //新配置的operate item，添加默认发送事件方法
+
+      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
+                });
+              }
+            });
+          }
+
+          return item;
+        });
+      };
+
+      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() {
   return inject(ProFormKey);
@@ -1368,65 +1817,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 +1979,11 @@ var proSearchFormProps = function proSearchFormProps() {
     debounceKeys: {
       type: Array
     },
+    //默认 valueType 为 text 的控件会debounce处理
+    debounceTypes: {
+      type: Array,
+      "default": ["text"]
+    },
     debounceTime: {
       type: Number,
       "default": 800
@@ -1486,62 +1995,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 +2096,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 {
@@ -1759,8 +2277,8 @@ var proTableProps = function proTableProps() {
       type: String
     },
 
-    /**
-     * 公共column，会merge到columns item中
+    /**
+     * 公共column，会merge到columns item中
      */
     column: {
       type: Object
@@ -1773,36 +2291,29 @@ var proTableProps = function proTableProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * loading
-     */
-    loading: {
-      type: Boolean
-    },
-
-    /**
-     * 序号
+    /**
+     * 序号
      */
     serialNumber: {
       type: Boolean
     },
 
-    /**
-     * 分页
+    /**
+     * 分页
      */
-    pagination: {
+    paginationState: {
       type: Object
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -1810,62 +2321,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 = _objectSpread2(_objectSpread2({}, 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 +2357,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 +2377,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 +2394,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, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, findTargetInTree, findTargetListInTree, generateId, getColumnFormItemName, getColumnValueType, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProModule, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };