@vue-start/pro 0.2.0 → 0.3.0

package/dist/index.es.js

@@ -1,8 +1,9 @@
-import { defineComponent, computed, reactive, inject, h, provide, createVNode, Fragment, mergeProps } from 'vue';
-import { map, isString, forEach, get, isObject, isEmpty, isArray, isFunction, mergeWith, reduce, keys, omit, filter as filter$1, sortBy, pick, size, debounce, some, clone, split, set, isBoolean, merge as merge$1 } from 'lodash';
+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 { filter, tap, merge, Subject } from 'rxjs';
 import { useEffect, setReactiveValue, useWatch } from '@vue-start/hooks';
 import { useRequestProvide, isFailedRequestActor, isPreRequestActor, isDoneRequestActor } from '@vue-start/request';
+import { useRouter, useRoute } from 'vue-router';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -150,17 +151,100 @@ var useComposeRequestActor = function useComposeRequestActor(actors, options, ca
   }, []);
 };
 
-/**
- * 获取Column的valueType，默认"text"
- * @param column
+/**
+ * 剔除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;
+      }
+    });
+  });
+};
+
+/**
+ * 获取Column的valueType，默认"text"
+ * @param column
  */
 
 var getColumnValueType = function getColumnValueType(column) {
   return column.formValueType || column.valueType || "text";
 };
-/**
- *获取Column的FormItem name
- * @param column
+/**
+ *获取Column的FormItem name
+ * @param column
  */
 
 var getColumnFormItemName = function getColumnFormItemName(column) {
@@ -168,12 +252,12 @@ var getColumnFormItemName = function getColumnFormItemName(column) {
 
   return ((_column$formItemProps = column.formItemProps) === null || _column$formItemProps === void 0 ? void 0 : _column$formItemProps.name) || column.dataIndex;
 };
-/**
- * 根据Column生成FormItem VNode
- * formFieldProps中的slots参数会以v-slots的形式传递到FormItem的录入组件（子组件）中
- * @param formElementMap
- * @param column
- * @param needRules
+/**
+ * 根据Column生成FormItem VNode
+ * formFieldProps中的slots参数会以v-slots的形式传递到FormItem的录入组件（子组件）中
+ * @param formElementMap
+ * @param column
+ * @param needRules
  */
 
 var getFormItemEl = function getFormItemEl(formElementMap, column) {
@@ -198,11 +282,11 @@ var getFormItemEl = function getFormItemEl(formElementMap, column) {
     showProps: column.showProps
   }), (_column$formFieldProp = column.formFieldProps) === null || _column$formFieldProp === void 0 ? void 0 : _column$formFieldProp.slots);
 };
-/**
- *  根据Column生成Item VNode
- * @param elementMap
- * @param column
- * @param value
+/**
+ *  根据Column生成Item VNode
+ * @param elementMap
+ * @param column
+ * @param value
  */
 
 var getItemEl = function getItemEl(elementMap, column, value) {
@@ -234,44 +318,44 @@ var RequestAction = {
 
 var proModuleProps = function proModuleProps() {
   return {
-    /**
-     * module状态
+    /**
+     * module状态
      */
     state: {
       type: Object
     },
 
-    /**
-     * 配置（静态）
+    /**
+     * 配置（静态）
      */
     columns: {
       type: Array
     },
 
-    /**
-     * 配置（动态）
-     * columns动态属性兼容
+    /**
+     * 配置（动态）
+     * columns动态属性兼容
      */
     columnState: {
       type: Object
     },
 
-    /**
-     * 展示组件集
+    /**
+     * 展示组件集
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * 录入组件集
+    /**
+     * 录入组件集
      */
     formElementMap: {
       type: Object
     },
 
-    /**
-     * requests
+    /**
+     * requests
      */
     requests: {
       type: Array
@@ -282,27 +366,15 @@ var proModuleProps = function proModuleProps() {
 var ProModule = defineComponent({
   props: _objectSpread2({}, proModuleProps()),
   setup: function setup(props, _ref) {
-    var slots = _ref.slots;
+    var slots = _ref.slots,
+        expose = _ref.expose;
 
-    /**
-     * columns columnState 合并
+    /**
+     * columns columnState 合并
      */
     var columns = computed(function () {
-      return map(props.columns, function (item) {
-        //如果columnState中有值，merge处理
-        var mapData = get(props.columnState, getColumnFormItemName(item));
-
-        if (isObject(mapData) && !isEmpty(mapData) && !isArray(mapData) && !isFunction(mapData)) {
-          //合并
-          return mergeWith(item, mapData, function (objValue, srcValue) {
-            //如果是数组，替换
-            if (isArray(objValue) || isArray(srcValue)) {
-              return srcValue;
-            }
-          });
-        }
-
-        return item;
+      return mergeStateToList(props.columns, props.columnState, function (item) {
+        return getColumnFormItemName(item);
       });
     });
     /*********************************** 渲染组件 ***************************************/
@@ -456,6 +528,10 @@ var ProModule = defineComponent({
       requests: props.requests,
       sendRequest: sendRequest
     });
+    expose({
+      sendEvent: sendEvent,
+      sendRequest: sendRequest
+    });
     return function () {
       var _slots$default;
 
@@ -538,6 +614,11 @@ var CurdAddAction;
   CurdAddAction["CONTINUE"] = "CONTINUE";
 })(CurdAddAction || (CurdAddAction = {}));
 
+var defaultPage = {
+  page: 1,
+  pageSize: 10
+};
+
 var proCurdProps = function proCurdProps() {
   return {
     /**
@@ -574,7 +655,8 @@ var proCurdProps = function proCurdProps() {
 var Curd = defineComponent({
   props: _objectSpread2({}, proCurdProps()),
   setup: function setup(props, _ref) {
-    var slots = _ref.slots;
+    var slots = _ref.slots,
+        expose = _ref.expose;
 
     var _ref2 = useProModule(),
         columns = _ref2.columns,
@@ -643,12 +725,18 @@ var Curd = defineComponent({
     var sendCurdEvent = function sendCurdEvent(event) {
       sendEvent({
         type: event.action,
-        payload: omit(event, "action")
+        payload: omit(event, "action", "source"),
+        source: event.source
       });
     }; //事件订阅
 
 
     useModuleEvent(function (event) {
+      //如果当前event存在source 不处理
+      if (event.source) {
+        return;
+      }
+
       var action = event.type;
       var _ref3 = event.payload,
           type = _ref3.type,
@@ -725,6 +813,11 @@ var Curd = defineComponent({
       descProps: descProps,
       modalProps: modalProps
     });
+    expose({
+      sendCurdEvent: sendCurdEvent,
+      getOperate: getOperate,
+      refreshList: handleSearch
+    });
     return function () {
       var _slots$default;
 
@@ -741,7 +834,10 @@ var ProCurd = defineComponent({
   setup: function setup(props, _ref4) {
     var _curdOperateOpts;
 
-    var slots = _ref4.slots;
+    var slots = _ref4.slots,
+        expose = _ref4.expose;
+    var moduleRef = ref();
+    var curdRef = ref();
     var curdState = props.curdState || reactive({
       detailData: {}
     });
@@ -793,18 +889,383 @@ var ProCurd = defineComponent({
       },
       label: "删除"
     }), _curdOperateOpts);
+    /****************************** columns分类 *************************************/
+
     var requests = map(props.operates, function (item) {
       var curdOpts = get(curdOperateOpts, item.action);
       return _objectSpread2(_objectSpread2({}, curdOpts), item);
     });
     var moduleKeys = keys(omit(ProModule.props, "state", "requests"));
+    expose({
+      moduleRef: moduleRef,
+      curdRef: curdRef
+    });
+    return function () {
+      return createVNode(ProModule, mergeProps({
+        "ref": moduleRef
+      }, pick(props, moduleKeys), {
+        "state": curdState,
+        "requests": requests
+      }), {
+        "default": function _default() {
+          return [createVNode(Curd, mergeProps({
+            "ref": curdRef
+          }, omit.apply(void 0, [props].concat(_toConsumableArray(moduleKeys), ["curdState", "operates"])), {
+            "operates": requests
+          }), slots)];
+        }
+      });
+    };
+  }
+});
+
+var modalCurdProps = function modalCurdProps() {
+  return {
+    defaultAddRecord: {
+      type: Object
+    }
+  };
+};
+
+/**
+ * 事件处理
+ */
+var ModalCurd = defineComponent({
+  props: _objectSpread2({}, modalCurdProps()),
+  setup: function setup(props) {
+    var _listProps$value;
+
+    var _useProModule = useProModule(),
+        dispatch = _useProModule.dispatch,
+        sendRequest = _useProModule.sendRequest;
+
+    var _useProCurd = useProCurd(),
+        rowKey = _useProCurd.rowKey,
+        curdState = _useProCurd.curdState,
+        listProps = _useProCurd.listProps,
+        getOperate = _useProCurd.getOperate,
+        refreshList = _useProCurd.refreshList;
+
+    var pageState = (listProps === null || listProps === void 0 ? void 0 : (_listProps$value = listProps.value) === null || _listProps$value === void 0 ? void 0 : _listProps$value.pageState) || reactive(_objectSpread2({}, defaultPage)); //发送详情接口
+
+    var sendDetailRequest = function sendDetailRequest(record) {
+      var operateOpts = getOperate(CurdAction.DETAIL);
+
+      if (operateOpts !== null && operateOpts !== void 0 && operateOpts.actor) {
+        //如果注册了详情接口 发起请求
+        sendRequest(CurdAction.DETAIL, record, rowKey);
+      } else {
+        //直接使用当前record作为详情数据
+        dispatch({
+          type: "detailData",
+          payload: record
+        });
+      }
+    };
+
+    var dealDetail = function dealDetail(subAction, _ref) {
+      var record = _ref.record;
+
+      if (subAction === CurdSubAction.EMIT) {
+        dispatch({
+          type: "mode",
+          payload: CurdCurrentMode.DETAIL
+        });
+        sendDetailRequest(record);
+      }
+    };
+
+    var dealAdd = function dealAdd(subAction) {
+      if (subAction === CurdSubAction.EMIT) {
+        dispatch({
+          type: "mode",
+          payload: CurdCurrentMode.ADD
+        });
+        dispatch({
+          type: "detailData",
+          payload: props.defaultAddRecord || {}
+        });
+      } else if (subAction === CurdSubAction.SUCCESS) {
+        //添加成功
+        pageState.page = 1; //重置当前页数
+        //刷新List
+
+        refreshList({
+          page: 1
+        });
+
+        if (curdState.addAction === CurdAddAction.CONTINUE) {
+          dispatch({
+            type: "detailData",
+            payload: props.defaultAddRecord || {}
+          });
+        } else {
+          dispatch({
+            type: "mode",
+            payload: undefined
+          });
+        }
+      }
+    };
+
+    var dealEdit = function dealEdit(subAction, _ref2) {
+      var record = _ref2.record;
+
+      if (subAction === CurdSubAction.EMIT) {
+        dispatch({
+          type: "mode",
+          payload: CurdCurrentMode.EDIT
+        });
+        sendDetailRequest(record);
+      } else if (subAction === CurdSubAction.SUCCESS) {
+        // 编辑成功
+        dispatch({
+          type: "mode",
+          payload: undefined
+        }); //刷新列表
+
+        refreshList();
+      }
+    };
+
+    var dealDelete = function dealDelete(subAction) {
+      if (subAction === CurdSubAction.SUCCESS) {
+        //刷新列表
+        refreshList();
+      }
+    };
+
+    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.DETAIL:
+          dealDetail(subAction, {
+            record: record
+          });
+          break;
+
+        case CurdAction.ADD:
+          dealAdd(subAction);
+          break;
+
+        case CurdAction.EDIT:
+          dealEdit(subAction, {
+            record: record
+          });
+          break;
+
+        case CurdAction.DELETE:
+          dealDelete(subAction);
+          break;
+      }
+    });
+    return function () {
+      return null;
+    };
+  }
+});
+var ProModalCurd = defineComponent({
+  props: _objectSpread2(_objectSpread2({}, ProCurd.props), ModalCurd.props),
+  setup: function setup(props, _ref4) {
+    var slots = _ref4.slots;
+    var invalidKeys = keys(ModalCurd.props);
     return function () {
-      return h(ProModule, _objectSpread2(_objectSpread2({}, pick(props, moduleKeys)), {}, {
-        state: curdState,
-        requests: requests
-      }), h(Curd, _objectSpread2(_objectSpread2({}, omit.apply(void 0, [props].concat(_toConsumableArray(moduleKeys), ["curdState", "operates"]))), {}, {
-        operates: requests
-      }), slots));
+      var _slots$default;
+
+      return createVNode(ProCurd, omit(props, invalidKeys), {
+        "default": function _default() {
+          return [createVNode(ModalCurd, pick(props, invalidKeys), null), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+        }
+      });
+    };
+  }
+});
+
+var pageCurdProps = function pageCurdProps() {
+  return {
+    defaultAddRecord: {
+      type: Object
+    },
+    routeBack: {
+      type: Function
+    }
+  };
+};
+
+var PageCurd = defineComponent({
+  props: _objectSpread2({}, pageCurdProps()),
+  setup: function setup(props) {
+    var router = useRouter();
+    var route = useRoute();
+
+    var _useProModule = useProModule(),
+        dispatch = _useProModule.dispatch,
+        sendRequest = _useProModule.sendRequest;
+
+    var _useProCurd = useProCurd(),
+        rowKey = _useProCurd.rowKey,
+        curdState = _useProCurd.curdState;
+
+    var dealList = function dealList(subAction) {
+      if (subAction === CurdSubAction.PAGE) {
+        //其实就是个重置过程
+        dispatch({
+          type: "mode",
+          payload: undefined
+        });
+        dispatch({
+          type: "detailData",
+          payload: {}
+        });
+        dispatch({
+          type: "detailLoading",
+          payload: false
+        });
+        dispatch({
+          type: "addAction",
+          payload: undefined
+        });
+      }
+    };
+
+    var dealDetail = function dealDetail(subAction, _ref) {
+      var record = _ref.record;
+
+      if (subAction === CurdSubAction.EMIT) {
+        router.push({
+          path: "".concat(route.path, "/detail"),
+          query: pick(record, rowKey)
+        });
+      } else if (subAction === CurdSubAction.PAGE) {
+        dispatch({
+          type: "mode",
+          payload: CurdCurrentMode.DETAIL
+        });
+        sendRequest(CurdAction.DETAIL, route.query, rowKey);
+      }
+    };
+
+    var dealAdd = function dealAdd(subAction) {
+      if (subAction === CurdSubAction.EMIT) {
+        router.push({
+          path: "".concat(route.path, "/add")
+        });
+      } else if (subAction === CurdSubAction.PAGE) {
+        dispatch({
+          type: "mode",
+          payload: CurdCurrentMode.ADD
+        });
+        dispatch({
+          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);
+        }
+      }
+    };
+
+    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)];
+        }
+      });
     };
   }
 });
@@ -872,6 +1333,9 @@ var proFormProps = function proFormProps() {
     columns: {
       type: Array
     },
+    columnState: {
+      type: Object
+    },
 
     /**
      * 展示控件集合，readonly模式下使用这些组件渲染
@@ -937,17 +1401,9 @@ var ProForm = defineComponent({
     var readonly = computed(function () {
       return props.readonly;
     });
-    /**
-     * 将columns 转化为FormItem VNode对象
-     */
-
-    var formItemVNodes = computed(function () {
-      if (size(props.formElementMap) <= 0) {
-        return [];
-      }
-
-      return map(props.columns, function (item) {
-        return getFormItemEl(props.formElementMap, item, props.needRules);
+    var columns = computed(function () {
+      return mergeStateToList(props.columns, props.columnState, function (item) {
+        return getColumnFormItemName(item);
       });
     });
     provideProForm(_objectSpread2({
@@ -957,14 +1413,16 @@ var ProForm = defineComponent({
       disableState: disableState,
       //
       elementMap: props.elementMap,
+      formElementMap: props.formElementMap,
       //
       readonly: readonly,
       //
-      formItemVNodes: formItemVNodes
+      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);
     };
   }
@@ -1085,51 +1543,6 @@ var ProSearchForm = defineComponent({
   }
 });
 
-/**
- * 剔除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];
-};
-
 /**
  * ProFormList ctx
  */
@@ -1346,8 +1759,8 @@ var proTableProps = function proTableProps() {
       type: String
     },
 
-    /**
-     * 公共column，会merge到columns item中
+    /**
+     * 公共column，会merge到columns item中
      */
     column: {
       type: Object
@@ -1356,23 +1769,40 @@ var proTableProps = function proTableProps() {
     columns: {
       type: Array
     },
+    columnState: {
+      type: Object
+    },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * loading
+    /**
+     * loading
      */
     loading: {
       type: Boolean
     },
 
-    /**
-     * provide传递
+    /**
+     * 序号
+     */
+    serialNumber: {
+      type: Boolean
+    },
+
+    /**
+     * 分页
+     */
+    pagination: {
+      type: Object
+    },
+
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -1385,8 +1815,11 @@ var ProTable = defineComponent({
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
     var columns = computed(function () {
-      //根据valueType选择对应的展示组件
-      var columns = map(props.columns, function (item) {
+      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);
 
@@ -1404,7 +1837,29 @@ var ProTable = defineComponent({
         }
 
         return nextItem;
-      });
+      }); //处理序号
+
+      if (props.serialNumber) {
+        columns.unshift(_objectSpread2(_objectSpread2({
+          title: "序号",
+          dataIndex: "serialNumber",
+          width: 80
+        }, props.column), {}, {
+          // @ts-ignore
+          customRender: function customRender(_ref3) {
+            var _props$pagination, _props$pagination2;
+
+            var index = _ref3.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;
+            }
+
+            return index + 1;
+          }
+        }));
+      }
+
       var operate = props.operate; //处理operate
 
       if (operate && operate.items && some(operate.items, function (item) {
@@ -1423,8 +1878,8 @@ var ProTable = defineComponent({
           dataIndex: "operate",
           fixed: "right"
         }, props.column), {}, {
-          customRender: function customRender(_ref3) {
-            var record = _ref3.record;
+          customRender: function customRender(_ref4) {
+            var record = _ref4.record;
             var validItems = filter$1(sortedItems, function (item) {
               if (item.show && isFunction(item.show)) {
                 return item.show(record);
@@ -1466,9 +1921,9 @@ var ProTable = defineComponent({
     return function () {
       var _slots$default;
 
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots, columns.value);
+      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
     };
   }
 });
 
-export { CurdAction, CurdAddAction, CurdCurrentMode, CurdSubAction, ProCurd, ProForm, ProFormList, ProModule, ProSearchForm, ProTable, RequestAction, SearchMode, convertPathToList, createFormItemCompFn, getColumnFormItemName, getColumnValueType, getFormItemEl, getItemEl, getValidValues, provideProCurd, provideProModule, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };
+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 };