@vue-start/pro 0.4.8 → 0.4.10

package/README.md

@@ -1,11 +1,149 @@
-# `pro`
+# pro 系列组件
 
-> TODO: description
+> 基于 ant-design-vue 和 element-plus 组件库，提供更高程度的抽象，提供更上层的设计规范，并且对应提供相应的组件使得开发者可以快速搭建出高质量的页面。
 
-## Usage
+> @vue-start/pro 是一个实现了 pro 模式的抽象库，具体 UI 组件需要从对应的实现库引用：@vue-start/element-pro @vue-start/antd-pro
 
+## 通用配置
+
+### column
+
+基础 column 配置基于 ant-design-vue 中 table 的 column，扩展了部分字段。让其可以满足更多需求。
+
+| 字段名称         | 类型                 | 说明                                                          |
+| ---------------- | -------------------- | ------------------------------------------------------------- |
+| `valueType`      | `string`             | 对应组件，缺省值为 text，自带了一部分，也可以自定义 valueType |
+| `formValueType`  | `string`             | 同 valueType，在 form 组件中使用该类型，默认为 valueType 的值 |
+| `title`          | `string` `VNode`     | 标题的内容，在 form 中是 label                                |
+| `dataIndex`      | `string`             | 与实体映射的 key，在 form 中是 name                           |
+| `formItemProps`  | `formItemProps`      | 传递给 FormItem 的配置                                        |
+| `formFieldProps` | `fieldProps`         | 传给渲染的组件的 props，自定义的时候也会传递                  |
+| `search`         | `boolean` `signName` | 为 true 时，在 SearchForm 中显示                              |
+| `form`           | `boolean` `signName` | 为 false 时，在 Form 中隐藏                                   |
+| `table`          | `boolean` `signName` | 为 false 时，在 Table 中隐藏                                  |
+| `detail`         | `boolean` `signName` | 为 false 时，在 Desc 中隐藏                                   |
+
+注：`signName` 可以在组件中设置，上述 search、form、table、detail 都为默认值。
+
+```typescript
+export type TColumn = {
+  title?: string | VNode;
+  dataIndex?: string | number;
+  valueType?: TValueType; //展示组件类型
+  formValueType?: TValueType; //录入组件类型 如不存在，默认取valueType的值
+  showProps?: Record<string, any>; //文字展示组件的props
+  formItemProps?: { name?: string; label?: string }; //FormItem props
+  formFieldProps?: Record<string, any>; //录入组件 props
+  search?: boolean; //同extra中的search
+  //拓展属性
+  extra?: {
+    //DescriptionsItem props
+    desc?: Record<string, any>;
+    //Col props
+    col?: Record<string, any>;
+    /**
+     * 自定义标记，对columns进行筛选 和 排序
+     * 默认支持：search、form、table、detail
+     * 比如： search：标记搜索条件；searchSort：搜索项的顺序
+     * 在Curd组件中可使用getSignColumns方法获取标记的Columns
+     * [sign]：              boolean 标记
+     * [`${sign}Sort`]：     标记的columns排序
+     */
+  } & Record<string, any>;
+};
+```
+
+### columnState
+
+- 对 column 进行补充。在实际使用过程中，column 通常作为静态数据配置，当需要为 column 加入动态数据时候可配置.
+- 若 column 为 hook 或者计算(computed 生成)值，则不需要使用 columnState
+
+```typescript
+//组件会将[id]的值 merge 到对应的column中
+type TColumnState = {
+  //优先使用formItemProps中的name属性
+  //id: column.formItemProps.name || column.dataIndex
+  [id]: object;
+};
+
+const columns = [
+  {
+    title: "select",
+    dataIndex: "select",
+  },
+];
+
+const columnState = {
+  select: {
+    formFieldProps: {
+      options: [{ value: "value-1", label: "label-1" }],
+    },
+  },
+};
+
+//比如：分别定义上述columns columnState，最终会合并成如下对象
+
+const mergeColumns = [
+  {
+    title: "select",
+    dataIndex: "select",
+    formFieldProps: {
+      options: [{ value: "value-1", label: "label-1" }],
+    },
+  },
+];
 ```
-const pro = require('pro');
 
-// TODO: DEMONSTRATE API
+### formElementMap
+
+- 录入原子组件集合。
+- 在 Form 中使用。
+- 根据 column 中的 valueType 从 formElementMap 查找对应的组件。
+
+```ts
+type TFormElementMap = {
+  [valueType]: FormItemComponent;
+};
+```
+
+### elementMap
+
+- 展示原子组件集合。
+- 在展示的地方使用，如：Table、Desc 等
+- 根据 column 中的 valueType 从 elementMap 查找对应的组件。
+
+```ts
+type TElementMap = {
+  [valueType]: Component;
+};
+```
+
+注：formElementMap 与 elementMap 中的 valueType 应该是像对应的，即：每一类 valueType 都有相对应的录入组件与展示组件。
+
+## 原子组件
+
+原子信息组件，统一 ProForm、ProTable 等组件里面的字段定义。valueType 是 pro 的灵魂，会根据 valueType 来映射成不同的组件。
+
+以下是支持的常见表单项（具体已实际注册值为准）：
+
+```typescript
+export type TDefaultValueType =
+  | "text"
+  | "textarea"
+  | "password"
+  | "digit" // 数字输入
+  | "date"
+  | "dateRange"
+  | "time"
+  | "timeRange"
+  | "select"
+  | "treeSelect"
+  | "checkbox"
+  | "radio"
+  | "slider"
+  | "switch"
+  | "rate"
+  | "cascader";
+
+export type TValueType = TDefaultValueType | string;
 ```

package/dist/index.d.ts

@@ -51,7 +51,8 @@ declare type TColumn = {
     formFieldProps?: Record<string, any>;
     search?: boolean;
     extra?: {
-        desc?: any;
+        desc?: Record<string, any>;
+        col?: Record<string, any>;
     } & Record<string, any>;
 };
 declare type TColumns = TColumn[];
@@ -415,6 +416,7 @@ interface ICurdState extends Record<string, any> {
 interface ICurdOperateOpts extends Omit<IRequestOpts, "actor" | "action">, Omit<IOperateItem, "value"> {
     action: ICurdAction;
     actor?: IRequestActor;
+    tableOperate?: boolean;
 }
 declare type TCurdActionEvent = {
     action: ICurdAction;
@@ -491,6 +493,7 @@ interface IProCurdProvide {
     tableColumns: Ref<TColumns>;
     searchColumns: Ref<TColumns>;
     sendCurdEvent: (event: TCurdActionEvent) => void;
+    operates: ICurdOperateOpts[];
     getOperate: (action: ICurdAction) => ICurdOperateOpts | undefined;
     refreshList: (extra?: Record<string, any>) => void;
     /******************子组件参数*******************/
@@ -503,7 +506,7 @@ declare const useProCurd: <T extends IProCurdProvide>() => T;
 declare const provideProCurd: (ctx: IProCurdProvide) => void;
 /************************************ 常量 *************************************/
 /**
- * curd 5种Action
+ * curd 5种基础Action
  */
 declare enum CurdAction {
     LIST = "LIST",
@@ -512,9 +515,9 @@ declare enum CurdAction {
     EDIT = "EDIT",
     DELETE = "DELETE"
 }
-declare type ICurdAction = keyof typeof CurdAction;
+declare type ICurdAction = keyof typeof CurdAction | string;
 /**
- * 5种Action 的子事件
+ * CurdAction 的子事件
  */
 declare enum CurdSubAction {
     EMIT = "EMIT",
@@ -532,7 +535,7 @@ declare enum CurdCurrentMode {
     EDIT = "EDIT",
     DETAIL = "DETAIL"
 }
-declare type ICurdCurrentMode = keyof typeof CurdCurrentMode;
+declare type ICurdCurrentMode = keyof typeof CurdCurrentMode | string;
 /**
  * curd add 模式下 标记 "确定" "确定并继续" 触发
  */
@@ -613,6 +616,13 @@ declare const proCurdListProps: () => {
     tableProps: {
         type: PropType<Record<string, any>>;
     };
+    paginationProps: {
+        type: PropType<Record<string, any>>;
+    };
+    showPagination: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageState: {
         type: PropType<TPageState>;
     };
@@ -632,6 +642,13 @@ declare const createCurdList: (SearchForm: any, Table: any) => vue.DefineCompone
     tableProps: {
         type: PropType<Record<string, any>>;
     };
+    paginationProps: {
+        type: PropType<Record<string, any>>;
+    };
+    showPagination: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageState: {
         type: PropType<TPageState>;
     };
@@ -649,6 +666,13 @@ declare const createCurdList: (SearchForm: any, Table: any) => vue.DefineCompone
     tableProps: {
         type: PropType<Record<string, any>>;
     };
+    paginationProps: {
+        type: PropType<Record<string, any>>;
+    };
+    showPagination: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageState: {
         type: PropType<TPageState>;
     };

package/dist/index.es.js

@@ -1,5 +1,5 @@
 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, filter as filter$1, split, isEmpty, mergeWith, sortBy, concat, isUndefined, debounce, clone, isBoolean } from 'lodash';
+import { map, isString, forEach, reduce, size, get, set, pick, omit, isArray, some, keys, isFunction, head, isObject, filter as filter$1, split, isEmpty, mergeWith, sortBy, isUndefined, concat, 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';
@@ -707,7 +707,7 @@ var provideProCurd = function provideProCurd(ctx) {
 /************************************ 常量 *************************************/
 
 /**
- * curd 5种Action
+ * curd 5种基础Action
  */
 
 var CurdAction;
@@ -721,7 +721,7 @@ var CurdAction;
 })(CurdAction || (CurdAction = {}));
 
 /**
- * 5种Action 的子事件
+ * CurdAction 的子事件
  */
 var CurdSubAction;
 
@@ -999,21 +999,32 @@ var Curd = defineComponent({
     }; //事件订阅
 
 
-    useModuleEvent(function (event) {
+    useModuleEvent(function (_ref3) {
+      var type = _ref3.type,
+          payload = _ref3.payload,
+          source = _ref3.source;
+
       //如果当前event存在source 不处理
-      if (event.source) {
+      if (source) {
         return;
       }
 
-      var action = event.type;
-      var _ref3 = event.payload,
-          type = _ref3.type,
-          values = _ref3.values,
-          record = _ref3.record;
+      var action = type;
+      var subAction = payload === null || payload === void 0 ? void 0 : payload.type;
+
+      if (action === RequestAction.Success) {
+        //覆盖
+        action = get(payload, ["requestOpts", "action"]);
+        subAction = CurdSubAction.SUCCESS;
+      }
+
+      var _ref4 = payload,
+          values = _ref4.values,
+          record = _ref4.record;
 
       switch (action) {
         case CurdAction.LIST:
-          if (type === CurdSubAction.EMIT) {
+          if (subAction === CurdSubAction.EMIT) {
             prevListParams = values;
             handleSearch();
           }
@@ -1021,22 +1032,24 @@ var Curd = defineComponent({
           return;
 
         case CurdAction.ADD:
-          if (type === CurdSubAction.EXECUTE) {
+          if (subAction === CurdSubAction.EXECUTE) {
             sendRequest(CurdAction.ADD, values, state.detailData);
           }
 
           return;
 
         case CurdAction.EDIT:
-          if (type === CurdSubAction.EXECUTE) {
+          if (subAction === CurdSubAction.EXECUTE) {
             sendRequest(CurdAction.EDIT, values, state.detailData);
           }
 
           return;
 
         case CurdAction.DELETE:
-          if (type === CurdSubAction.EMIT) {
+          if (subAction === CurdSubAction.EMIT) {
             sendRequest(CurdAction.DELETE, record, props.rowKey);
+          } else if (subAction === CurdSubAction.SUCCESS) {
+            handleSearch();
           }
 
           return;
@@ -1084,6 +1097,7 @@ var Curd = defineComponent({
       //
       sendCurdEvent: sendCurdEvent,
       //
+      operates: props.operates,
       getOperate: getOperate,
       //
       refreshList: handleSearch,
@@ -1110,11 +1124,11 @@ var ProCurd = defineComponent({
       type: Object
     }
   }),
-  setup: function setup(props, _ref4) {
+  setup: function setup(props, _ref5) {
     var _curdOperateOpts;
 
-    var slots = _ref4.slots,
-        expose = _ref4.expose;
+    var slots = _ref5.slots,
+        expose = _ref5.expose;
     var moduleRef = ref();
     var curdRef = ref();
     var curdState = props.curdState || reactive({
@@ -1251,7 +1265,7 @@ var ModalCurd = defineComponent({
         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 pageState = listProps === null || listProps === void 0 ? void 0 : (_listProps$value = listProps.value) === null || _listProps$value === void 0 ? void 0 : _listProps$value.pageState; //发送详情接口
 
     var sendDetailRequest = function sendDetailRequest(record) {
       var operateOpts = getOperate(CurdAction.DETAIL);
@@ -1292,12 +1306,12 @@ var ModalCurd = defineComponent({
         });
       } else if (subAction === CurdSubAction.SUCCESS) {
         //添加成功
-        pageState.page = 1; //重置当前页数
-        //刷新List
+        if (pageState) {
+          pageState.page = 1; //重置当前页数
+        } //刷新List
 
-        refreshList({
-          page: 1
-        });
+
+        refreshList();
 
         if (curdState.addAction === CurdAddAction.CONTINUE) {
           dispatch({
@@ -1333,13 +1347,6 @@ var ModalCurd = defineComponent({
       }
     };
 
-    var dealDelete = function dealDelete(subAction) {
-      if (subAction === CurdSubAction.SUCCESS) {
-        //刷新列表
-        refreshList();
-      }
-    };
-
     useModuleEvent(function (_ref3) {
       var type = _ref3.type,
           payload = _ref3.payload,
@@ -1375,10 +1382,6 @@ var ModalCurd = defineComponent({
             record: record
           });
           break;
-
-        case CurdAction.DELETE:
-          dealDelete(subAction);
-          break;
       }
     });
     return function () {
@@ -1431,8 +1434,7 @@ var PageCurd = defineComponent({
 
     var _useProCurd = useProCurd(),
         rowKey = _useProCurd.rowKey,
-        curdState = _useProCurd.curdState,
-        refreshList = _useProCurd.refreshList;
+        curdState = _useProCurd.curdState;
 
     var dealList = function dealList(subAction) {
       if (subAction === CurdSubAction.PAGE) {
@@ -1518,13 +1520,6 @@ var PageCurd = defineComponent({
       }
     };
 
-    var dealDelete = function dealDelete(subAction) {
-      if (subAction === CurdSubAction.SUCCESS) {
-        //刷新列表
-        refreshList();
-      }
-    };
-
     useModuleEvent(function (_ref3) {
       var type = _ref3.type,
           payload = _ref3.payload,
@@ -1564,10 +1559,6 @@ var PageCurd = defineComponent({
             record: record
           });
           break;
-
-        case CurdAction.DELETE:
-          dealDelete(subAction);
-          break;
       }
     });
     return function () {
@@ -1820,6 +1811,14 @@ var proCurdListProps = function proCurdListProps() {
     tableProps: {
       type: Object
     },
+    //pagination是否展示
+    paginationProps: {
+      type: Object
+    },
+    showPagination: {
+      type: Boolean,
+      "default": true
+    },
     //pageState
     pageState: {
       type: Object
@@ -1839,8 +1838,8 @@ var createCurdList = function createCurdList(SearchForm, Table) {
           curdState = _useProCurd.curdState,
           searchColumns = _useProCurd.searchColumns,
           tableColumns = _useProCurd.tableColumns,
-          getOperate = _useProCurd.getOperate,
-          sendCurdEvent = _useProCurd.sendCurdEvent;
+          sendCurdEvent = _useProCurd.sendCurdEvent,
+          operates = _useProCurd.operates;
       /******************* search pagination ********************/
 
 
@@ -1863,32 +1862,27 @@ var createCurdList = function createCurdList(SearchForm, Table) {
       /******************* table ********************/
 
 
-      var createTableItem = function createTableItem(action) {
-        var operate = getOperate(action);
-
+      var tableOperateItems = map(filter$1(operates, function (item) {
+        var action = item.action;
+        return action === CurdAction.DETAIL || action === CurdAction.EDIT || action === CurdAction.DELETE || item.tableOperate;
+      }), function (operate) {
         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
+          value: operate.action
         });
 
         if (!item.onClick) {
-          return _objectSpread2(_objectSpread2({}, item), {}, {
-            onClick: function onClick(record) {
-              //默认发送事件
-              sendCurdEvent({
-                action: action,
-                type: CurdSubAction.EMIT,
-                record: record
-              });
-            }
-          });
+          item.onClick = function (record) {
+            sendCurdEvent({
+              action: operate.action,
+              type: CurdSubAction.EMIT,
+              record: record
+            });
+          };
         }
 
         return item;
-      }; //table操作栏 items
-
-
-      var tableOperateItems = [createTableItem(CurdAction.DETAIL), createTableItem(CurdAction.EDIT), createTableItem(CurdAction.DELETE)]; //新配置的operate item，添加默认发送事件方法
+      }); //新配置的operate item，添加默认发送事件方法
 
       var convertOperateItems = function convertOperateItems(list) {
         return map(list, function (item) {
@@ -1946,7 +1940,7 @@ var createCurdList = function createCurdList(SearchForm, Table) {
           "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(rewriteTableProps) : createVNode(Table, rewriteTableProps, 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", {
+        }, (_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(rewriteTableProps) : createVNode(Table, rewriteTableProps, tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), props.showPagination && 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)]), (_slots$end = slots.end) === null || _slots$end === void 0 ? void 0 : _slots$end.call(slots)]);
       };
@@ -2073,24 +2067,24 @@ var provideProForm = function provideProForm(ctx) {
 
 var proFormProps = function proFormProps() {
   return {
-    /**
-     * 同 antd 或 element  form中的model
+    /**
+     * 同 antd 或 element  form中的model
      */
     model: {
       type: Object
     },
 
-    /**
-     *  子组件是否只读样式
+    /**
+     *  子组件是否只读样式
      */
     readonly: {
       type: Boolean,
       "default": undefined
     },
 
-    /**
-     *  FormComponent 根据此项来确定组件是否显示
-     *  rules 根据rules中方法生成showState对象
+    /**
+     *  FormComponent 根据此项来确定组件是否显示
+     *  rules 根据rules中方法生成showState对象
      */
     showState: {
       type: Object
@@ -2099,8 +2093,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 是否只读
+    /**
+     * 是否只读
      */
     readonlyState: {
       type: Object
@@ -2109,8 +2103,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 是否disabled
+    /**
+     * 是否disabled
      */
     disableState: {
       type: Object
@@ -2119,8 +2113,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     *
+    /**
+     *
      */
     columns: {
       type: Array
@@ -2129,30 +2123,30 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * 录入控件集合
+    /**
+     * 录入控件集合
      */
     formElementMap: {
       type: Object
     },
 
-    /**
-     * 是否启用rules验证
+    /**
+     * 是否启用rules验证
      */
     needRules: {
       type: Boolean,
       "default": true
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -2498,8 +2492,8 @@ var proTableProps = function proTableProps() {
       type: String
     },
 
-    /**
-     * 公共column，会merge到columns item中
+    /**
+     * 公共column，会merge到columns item中
      */
     column: {
       type: Object
@@ -2512,29 +2506,29 @@ var proTableProps = function proTableProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * 序号
+    /**
+     * 序号
      */
     serialNumber: {
       type: Boolean
     },
 
-    /**
-     * 分页
+    /**
+     * 分页
      */
     paginationState: {
       type: Object
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object

package/dist/index.js

@@ -711,7 +711,7 @@ var provideProCurd = function provideProCurd(ctx) {
 /************************************ 常量 *************************************/
 
 /**
- * curd 5种Action
+ * curd 5种基础Action
  */
 
 exports.CurdAction = void 0;
@@ -725,7 +725,7 @@ exports.CurdAction = void 0;
 })(exports.CurdAction || (exports.CurdAction = {}));
 
 /**
- * 5种Action 的子事件
+ * CurdAction 的子事件
  */
 exports.CurdSubAction = void 0;
 
@@ -1003,21 +1003,32 @@ var Curd = vue.defineComponent({
     }; //事件订阅
 
 
-    useModuleEvent(function (event) {
+    useModuleEvent(function (_ref3) {
+      var type = _ref3.type,
+          payload = _ref3.payload,
+          source = _ref3.source;
+
       //如果当前event存在source 不处理
-      if (event.source) {
+      if (source) {
         return;
       }
 
-      var action = event.type;
-      var _ref3 = event.payload,
-          type = _ref3.type,
-          values = _ref3.values,
-          record = _ref3.record;
+      var action = type;
+      var subAction = payload === null || payload === void 0 ? void 0 : payload.type;
+
+      if (action === RequestAction.Success) {
+        //覆盖
+        action = lodash.get(payload, ["requestOpts", "action"]);
+        subAction = exports.CurdSubAction.SUCCESS;
+      }
+
+      var _ref4 = payload,
+          values = _ref4.values,
+          record = _ref4.record;
 
       switch (action) {
         case exports.CurdAction.LIST:
-          if (type === exports.CurdSubAction.EMIT) {
+          if (subAction === exports.CurdSubAction.EMIT) {
             prevListParams = values;
             handleSearch();
           }
@@ -1025,22 +1036,24 @@ var Curd = vue.defineComponent({
           return;
 
         case exports.CurdAction.ADD:
-          if (type === exports.CurdSubAction.EXECUTE) {
+          if (subAction === exports.CurdSubAction.EXECUTE) {
             sendRequest(exports.CurdAction.ADD, values, state.detailData);
           }
 
           return;
 
         case exports.CurdAction.EDIT:
-          if (type === exports.CurdSubAction.EXECUTE) {
+          if (subAction === exports.CurdSubAction.EXECUTE) {
             sendRequest(exports.CurdAction.EDIT, values, state.detailData);
           }
 
           return;
 
         case exports.CurdAction.DELETE:
-          if (type === exports.CurdSubAction.EMIT) {
+          if (subAction === exports.CurdSubAction.EMIT) {
             sendRequest(exports.CurdAction.DELETE, record, props.rowKey);
+          } else if (subAction === exports.CurdSubAction.SUCCESS) {
+            handleSearch();
           }
 
           return;
@@ -1088,6 +1101,7 @@ var Curd = vue.defineComponent({
       //
       sendCurdEvent: sendCurdEvent,
       //
+      operates: props.operates,
       getOperate: getOperate,
       //
       refreshList: handleSearch,
@@ -1114,11 +1128,11 @@ var ProCurd = vue.defineComponent({
       type: Object
     }
   }),
-  setup: function setup(props, _ref4) {
+  setup: function setup(props, _ref5) {
     var _curdOperateOpts;
 
-    var slots = _ref4.slots,
-        expose = _ref4.expose;
+    var slots = _ref5.slots,
+        expose = _ref5.expose;
     var moduleRef = vue.ref();
     var curdRef = vue.ref();
     var curdState = props.curdState || vue.reactive({
@@ -1255,7 +1269,7 @@ var ModalCurd = vue.defineComponent({
         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) || vue.reactive(_objectSpread2({}, defaultPage)); //发送详情接口
+    var pageState = listProps === null || listProps === void 0 ? void 0 : (_listProps$value = listProps.value) === null || _listProps$value === void 0 ? void 0 : _listProps$value.pageState; //发送详情接口
 
     var sendDetailRequest = function sendDetailRequest(record) {
       var operateOpts = getOperate(exports.CurdAction.DETAIL);
@@ -1296,12 +1310,12 @@ var ModalCurd = vue.defineComponent({
         });
       } else if (subAction === exports.CurdSubAction.SUCCESS) {
         //添加成功
-        pageState.page = 1; //重置当前页数
-        //刷新List
+        if (pageState) {
+          pageState.page = 1; //重置当前页数
+        } //刷新List
 
-        refreshList({
-          page: 1
-        });
+
+        refreshList();
 
         if (curdState.addAction === exports.CurdAddAction.CONTINUE) {
           dispatch({
@@ -1337,13 +1351,6 @@ var ModalCurd = vue.defineComponent({
       }
     };
 
-    var dealDelete = function dealDelete(subAction) {
-      if (subAction === exports.CurdSubAction.SUCCESS) {
-        //刷新列表
-        refreshList();
-      }
-    };
-
     useModuleEvent(function (_ref3) {
       var type = _ref3.type,
           payload = _ref3.payload,
@@ -1379,10 +1386,6 @@ var ModalCurd = vue.defineComponent({
             record: record
           });
           break;
-
-        case exports.CurdAction.DELETE:
-          dealDelete(subAction);
-          break;
       }
     });
     return function () {
@@ -1435,8 +1438,7 @@ var PageCurd = vue.defineComponent({
 
     var _useProCurd = useProCurd(),
         rowKey = _useProCurd.rowKey,
-        curdState = _useProCurd.curdState,
-        refreshList = _useProCurd.refreshList;
+        curdState = _useProCurd.curdState;
 
     var dealList = function dealList(subAction) {
       if (subAction === exports.CurdSubAction.PAGE) {
@@ -1522,13 +1524,6 @@ var PageCurd = vue.defineComponent({
       }
     };
 
-    var dealDelete = function dealDelete(subAction) {
-      if (subAction === exports.CurdSubAction.SUCCESS) {
-        //刷新列表
-        refreshList();
-      }
-    };
-
     useModuleEvent(function (_ref3) {
       var type = _ref3.type,
           payload = _ref3.payload,
@@ -1568,10 +1563,6 @@ var PageCurd = vue.defineComponent({
             record: record
           });
           break;
-
-        case exports.CurdAction.DELETE:
-          dealDelete(subAction);
-          break;
       }
     });
     return function () {
@@ -1824,6 +1815,14 @@ var proCurdListProps = function proCurdListProps() {
     tableProps: {
       type: Object
     },
+    //pagination是否展示
+    paginationProps: {
+      type: Object
+    },
+    showPagination: {
+      type: Boolean,
+      "default": true
+    },
     //pageState
     pageState: {
       type: Object
@@ -1843,8 +1842,8 @@ var createCurdList = function createCurdList(SearchForm, Table) {
           curdState = _useProCurd.curdState,
           searchColumns = _useProCurd.searchColumns,
           tableColumns = _useProCurd.tableColumns,
-          getOperate = _useProCurd.getOperate,
-          sendCurdEvent = _useProCurd.sendCurdEvent;
+          sendCurdEvent = _useProCurd.sendCurdEvent,
+          operates = _useProCurd.operates;
       /******************* search pagination ********************/
 
 
@@ -1867,32 +1866,27 @@ var createCurdList = function createCurdList(SearchForm, Table) {
       /******************* table ********************/
 
 
-      var createTableItem = function createTableItem(action) {
-        var operate = getOperate(action);
-
+      var tableOperateItems = lodash.map(lodash.filter(operates, function (item) {
+        var action = item.action;
+        return action === exports.CurdAction.DETAIL || action === exports.CurdAction.EDIT || action === exports.CurdAction.DELETE || item.tableOperate;
+      }), function (operate) {
         var item = _objectSpread2(_objectSpread2({}, lodash.pick(operate, "label", "element", "disabled", "sort", "onClick")), {}, {
           show: !lodash.isUndefined(operate === null || operate === void 0 ? void 0 : operate.show) ? operate === null || operate === void 0 ? void 0 : operate.show : false,
-          value: action
+          value: operate.action
         });
 
         if (!item.onClick) {
-          return _objectSpread2(_objectSpread2({}, item), {}, {
-            onClick: function onClick(record) {
-              //默认发送事件
-              sendCurdEvent({
-                action: action,
-                type: exports.CurdSubAction.EMIT,
-                record: record
-              });
-            }
-          });
+          item.onClick = function (record) {
+            sendCurdEvent({
+              action: operate.action,
+              type: exports.CurdSubAction.EMIT,
+              record: record
+            });
+          };
         }
 
         return item;
-      }; //table操作栏 items
-
-
-      var tableOperateItems = [createTableItem(exports.CurdAction.DETAIL), createTableItem(exports.CurdAction.EDIT), createTableItem(exports.CurdAction.DELETE)]; //新配置的operate item，添加默认发送事件方法
+      }); //新配置的operate item，添加默认发送事件方法
 
       var convertOperateItems = function convertOperateItems(list) {
         return lodash.map(list, function (item) {
@@ -1950,7 +1944,7 @@ var createCurdList = function createCurdList(SearchForm, Table) {
           "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(rewriteTableProps) : vue.createVNode(Table, rewriteTableProps, tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), vue.createVNode("div", {
+        }, (_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(rewriteTableProps) : vue.createVNode(Table, rewriteTableProps, tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), props.showPagination && vue.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)]), (_slots$end = slots.end) === null || _slots$end === void 0 ? void 0 : _slots$end.call(slots)]);
       };
@@ -2077,24 +2071,24 @@ var provideProForm = function provideProForm(ctx) {
 
 var proFormProps = function proFormProps() {
   return {
-    /**
-     * 同 antd 或 element  form中的model
+    /**
+     * 同 antd 或 element  form中的model
      */
     model: {
       type: Object
     },
 
-    /**
-     *  子组件是否只读样式
+    /**
+     *  子组件是否只读样式
      */
     readonly: {
       type: Boolean,
       "default": undefined
     },
 
-    /**
-     *  FormComponent 根据此项来确定组件是否显示
-     *  rules 根据rules中方法生成showState对象
+    /**
+     *  FormComponent 根据此项来确定组件是否显示
+     *  rules 根据rules中方法生成showState对象
      */
     showState: {
       type: Object
@@ -2103,8 +2097,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 是否只读
+    /**
+     * 是否只读
      */
     readonlyState: {
       type: Object
@@ -2113,8 +2107,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 是否disabled
+    /**
+     * 是否disabled
      */
     disableState: {
       type: Object
@@ -2123,8 +2117,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     *
+    /**
+     *
      */
     columns: {
       type: Array
@@ -2133,30 +2127,30 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * 录入控件集合
+    /**
+     * 录入控件集合
      */
     formElementMap: {
       type: Object
     },
 
-    /**
-     * 是否启用rules验证
+    /**
+     * 是否启用rules验证
      */
     needRules: {
       type: Boolean,
       "default": true
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -2502,8 +2496,8 @@ var proTableProps = function proTableProps() {
       type: String
     },
 
-    /**
-     * 公共column，会merge到columns item中
+    /**
+     * 公共column，会merge到columns item中
      */
     column: {
       type: Object
@@ -2516,29 +2510,29 @@ var proTableProps = function proTableProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * 序号
+    /**
+     * 序号
      */
     serialNumber: {
       type: Boolean
     },
 
-    /**
-     * 分页
+    /**
+     * 分页
      */
     paginationState: {
       type: Object
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-start/pro",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "description": "> TODO: description",
   "author": "zx <zxpstudy@163.com>",
   "homepage": "https://github.com/zxeryu/vue-start#readme",
@@ -32,5 +32,5 @@
     "vue": ">=3.x",
     "vue-router": ">=4.x"
   },
-  "gitHead": "abed29975a9db75dcc076220d3ce0c6ba5df98b6"
+  "gitHead": "8df4a1e0344f286bdbd7e5a071794d3e093f1a69"
 }