@vue-start/pro 0.4.1 → 0.4.4

package/dist/index.d.ts

@@ -382,7 +382,7 @@ declare const proTableProps: () => {
     };
 };
 declare type ProTableProps = Partial<ExtractPropTypes<ReturnType<typeof proTableProps>>>;
-declare const createTable: (Table: any, Props?: any) => any;
+declare const createTable: (Table: any, Props?: any, tableMethods?: string[] | undefined) => any;
 
 declare type TPageState = {
     page: number;
@@ -464,6 +464,7 @@ declare const proCurdProps: () => {
     };
 };
 declare type CurdProps = Partial<ExtractPropTypes<ReturnType<typeof proCurdProps>>>;
+declare const CurdMethods: string[];
 declare type ProCurdProps = CurdProps & Omit<ProModuleProps, "state" | "requests"> & {
     curdState?: UnwrapNestedRefs<ICurdState>;
 };
@@ -558,6 +559,9 @@ declare const ProPageCurd: vue.DefineComponent<ProPageCurdProps, {}, {}, {}, {},
 declare const createCurdDesc: (Descriptions: any, DescriptionsItem: any) => any;
 
 declare const proCurdAddOrEditProps: () => {
+    signName: {
+        type: StringConstructor;
+    };
     operateBar: {
         type: BooleanConstructor;
         default: boolean;
@@ -582,7 +586,7 @@ declare const proCurdAddOrEditProps: () => {
     };
 };
 declare type ProCurdAddOrEditProps = Partial<ExtractPropTypes<ReturnType<typeof proCurdAddOrEditProps>>>;
-declare const createCurdForm: (Form: any, Button: any, convertFormProps?: ((curdState: ICurdState) => Record<string, any>) | undefined) => any;
+declare const createCurdForm: (Form: any, Button: any, convertFormProps?: ((curdState: ICurdState) => Record<string, any>) | undefined, formMethods?: string[] | undefined) => any;
 
 declare const proCurdListProps: () => {
     /**
@@ -730,7 +734,7 @@ declare const proFormProps: () => {
     };
 };
 declare type ProFormProps = Partial<ExtractPropTypes<ReturnType<typeof proFormProps>>>;
-declare const createForm: (Form: any, Grid: any) => any;
+declare const createForm: (Form: any, Grid: any, formMethods: string[]) => any;
 
 declare enum SearchMode {
     AUTO = "AUTO",
@@ -785,7 +789,7 @@ declare type ProSearchFormProps = Partial<ExtractPropTypes<ReturnType<typeof pro
  * 该组件只是个模式，最终返回null，不做任何渲染，应配合着ProForm的包装类一起使用
  * 针对传入的model（监听对象）做相应的finish（回调）处理
  */
-declare const createSearchForm: (Form: any, Props: any) => any;
+declare const createSearchForm: (Form: any, Props: any, formMethods: string[]) => any;
 
 interface FormItemProps {
     name?: string | number | (string | number)[];
@@ -958,4 +962,4 @@ declare const generateId: () => string;
  */
 declare const createExpose: (methods: string[], targetRef: Ref$1) => {};
 
-export { BooleanObjType, BooleanRulesObjType, CurdAction, CurdAddAction, CurdCurrentMode, CurdSubAction, FieldNames, FormItemProps, GridProps, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOperateItem, IProCurdProvide, IProFormProvideExtra, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, InternalNamePath, NamePath, ProCurd, ProCurdAddOrEditProps, ProCurdListProps, ProCurdProps, ProFormItemProps, ProFormListProps, ProFormProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProPageCurd, ProPageCurdProps, ProSearchFormProps, ProTableProps, RequestAction, SearchMode, TActionEvent, TActionState, TColumn, TColumns, TCurdActionEvent, TData, TDefaultValueType, TElementMap, TOption, TOptions, TPageState, TTableColumn, TTableColumns, TValueType, Wrapper, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, findTargetInTree, findTargetListInTree, generateId, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProFormList, provideProModule, renderElement, renderElements, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };
+export { BooleanObjType, BooleanRulesObjType, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, FieldNames, FormItemProps, GridProps, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOperateItem, IProCurdProvide, IProFormProvideExtra, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, InternalNamePath, NamePath, ProCurd, ProCurdAddOrEditProps, ProCurdListProps, ProCurdProps, ProFormItemProps, ProFormListProps, ProFormProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProPageCurd, ProPageCurdProps, ProSearchFormProps, ProTableProps, RequestAction, SearchMode, TActionEvent, TActionState, TColumn, TColumns, TCurdActionEvent, TData, TDefaultValueType, TElementMap, TOption, TOptions, TPageState, TTableColumn, TTableColumns, TValueType, Wrapper, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, findTargetInTree, findTargetListInTree, generateId, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProFormList, provideProModule, renderElement, renderElements, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };

package/dist/index.es.js

@@ -989,6 +989,7 @@ var proCurdProps = function proCurdProps() {
   };
 };
 
+var CurdMethods = ["sendCurdEvent", "refreshList", "sendEvent", "sendRequest"];
 var Curd = defineComponent({
   props: _objectSpread2({}, proCurdProps()),
   setup: function setup(props, _ref) {
@@ -1168,7 +1169,6 @@ var Curd = defineComponent({
     });
     expose({
       sendCurdEvent: sendCurdEvent,
-      getOperate: getOperate,
       refreshList: handleSearch
     });
     return function () {
@@ -1250,8 +1250,30 @@ var ProCurd = defineComponent({
     });
     var moduleKeys = keys(omit(ProModule.props, "state", "requests"));
     expose({
-      moduleRef: moduleRef,
-      curdRef: curdRef
+      sendCurdEvent: function sendCurdEvent(event) {
+        var _curdRef$value;
+
+        (_curdRef$value = curdRef.value) === null || _curdRef$value === void 0 ? void 0 : _curdRef$value.sendCurdEvent(event);
+      },
+      refreshList: function refreshList(extra) {
+        var _curdRef$value2;
+
+        (_curdRef$value2 = curdRef.value) === null || _curdRef$value2 === void 0 ? void 0 : _curdRef$value2.refreshList(extra);
+      },
+      sendEvent: function sendEvent(action) {
+        var _moduleRef$value;
+
+        (_moduleRef$value = moduleRef.value) === null || _moduleRef$value === void 0 ? void 0 : _moduleRef$value.sendEvent(action);
+      },
+      sendRequest: function sendRequest(requestNameOrAction) {
+        var _moduleRef$value2;
+
+        for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          params[_key - 1] = arguments[_key];
+        }
+
+        (_moduleRef$value2 = moduleRef.value) === null || _moduleRef$value2 === void 0 ? void 0 : _moduleRef$value2.sendEvent.apply(_moduleRef$value2, [requestNameOrAction].concat(params));
+      }
     });
     return function () {
       return createVNode(ProModule, mergeProps({
@@ -1280,8 +1302,8 @@ var modalCurdProps = function modalCurdProps() {
   };
 };
 
-/**
- * 事件处理
+/**
+ * 事件处理
  */
 var ModalCurd = defineComponent({
   props: _objectSpread2({}, modalCurdProps()),
@@ -1437,12 +1459,17 @@ var ModalCurd = defineComponent({
 var ProModalCurd = defineComponent({
   props: _objectSpread2(_objectSpread2({}, ProCurd.props), ModalCurd.props),
   setup: function setup(props, _ref4) {
-    var slots = _ref4.slots;
+    var slots = _ref4.slots,
+        expose = _ref4.expose;
+    var curdRef = ref();
+    expose(createExpose(CurdMethods, curdRef));
     var invalidKeys = keys(ModalCurd.props);
     return function () {
       var _slots$default;
 
-      return createVNode(ProCurd, omit(props, invalidKeys), {
+      return createVNode(ProCurd, mergeProps({
+        "ref": curdRef
+      }, 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)];
         }
@@ -1609,12 +1636,17 @@ var PageCurd = defineComponent({
 var ProPageCurd = defineComponent({
   props: _objectSpread2(_objectSpread2({}, ProCurd.props), PageCurd.props),
   setup: function setup(props, _ref4) {
-    var slots = _ref4.slots;
+    var slots = _ref4.slots,
+        expose = _ref4.expose;
+    var curdRef = ref();
+    expose(createExpose(CurdMethods, curdRef));
     var invalidKeys = keys(PageCurd.props);
     return function () {
       var _slots$default;
 
-      return createVNode(ProCurd, omit(props, invalidKeys), {
+      return createVNode(ProCurd, mergeProps({
+        "ref": curdRef
+      }, 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)];
         }
@@ -1633,6 +1665,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
       //重写Item content
       renderItem: {
         type: Function
+      },
+      //标记名称
+      signName: {
+        type: String
       }
     }),
     setup: function setup(props, _ref) {
@@ -1641,10 +1677,12 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
       var _useProCurd = useProCurd(),
           getItemVNode = _useProCurd.getItemVNode,
           curdState = _useProCurd.curdState,
-          descColumns = _useProCurd.descColumns;
+          descColumns = _useProCurd.descColumns,
+          getSignColumns = _useProCurd.getSignColumns;
 
       var descVNodes = computed(function () {
-        return map(descColumns.value, function (item) {
+        var columns = props.signName ? getSignColumns(props.signName) : descColumns.value;
+        return map(columns, function (item) {
           var _slot;
 
           var _props$renderItem;
@@ -1681,6 +1719,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
 
 var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
   return {
+    //标记名称
+    signName: {
+      type: String
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1710,22 +1752,38 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
   };
 };
 
-var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
+var createCurdForm = function createCurdForm(Form, Button, convertFormProps, formMethods) {
   return defineComponent({
+    inheritAttrs: false,
     props: _objectSpread2(_objectSpread2({}, Form.props), proCurdAddOrEditProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
+      var slots = _ref.slots,
+          attrs = _ref.attrs,
+          expose = _ref.expose;
 
       var _useProCurd = useProCurd(),
           elementMap = _useProCurd.elementMap,
           formElementMap = _useProCurd.formElementMap,
           curdState = _useProCurd.curdState,
           formColumns = _useProCurd.formColumns,
+          getSignColumns = _useProCurd.getSignColumns,
           sendCurdEvent = _useProCurd.sendCurdEvent;
 
       var formRef = ref();
+      var columns = computed(function () {
+        if (props.signName) {
+          return getSignColumns(props.signName);
+        }
+
+        return formColumns.value;
+      });
+
+      var handleFinish = function handleFinish(values, originValues) {
+        if (attrs.onFinish) {
+          attrs.onFinish(values, originValues);
+          return;
+        }
 
-      var handleFinish = function handleFinish(values) {
         if (curdState.mode === CurdCurrentMode.EDIT) {
           //edit
           sendCurdEvent({
@@ -1757,15 +1815,16 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
         (_formRef$value2 = formRef.value) === null || _formRef$value2 === void 0 ? void 0 : _formRef$value2.submit();
       };
 
+      expose(createExpose(formMethods, formRef));
       return function () {
         var _slots$divide, _slots$operateStart, _slots$operateCenter, _slots$operateEnd, _slots$default;
 
         return createVNode(Form, mergeProps({
           "ref": formRef
-        }, props, {
+        }, omit(attrs, "onFinish"), props, {
           "elementMap": props.elementMap || elementMap,
           "formElementMap": props.formElementMap || formElementMap,
-          "columns": formColumns.value,
+          "columns": columns.value,
           "model": curdState.detailData,
           "readonly": curdState.mode === CurdCurrentMode.DETAIL,
           "onFinish": handleFinish
@@ -1799,8 +1858,8 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
 
 var proCurdListProps = function proCurdListProps() {
   return {
-    /**
-     * extra 是否放到SearchForm中
+    /**
+     * extra 是否放到SearchForm中
      */
     extraInSearch: {
       type: Boolean,
@@ -1903,9 +1962,29 @@ var createCurdList = function createCurdList(SearchForm, Table) {
       };
 
       return function () {
-        var _props$searchProps, _slots$divide, _curdState$listData, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd;
+        var _curdState$listData, _props$searchProps, _slots$divide, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd;
 
         var tableProps = props.tableProps;
+
+        var rewriteTableProps = _objectSpread2(_objectSpread2({
+          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
+        });
+
         var extra = slots.extra ? createVNode("div", {
           "class": "pro-curd-list-extra"
         }, [slots.extra()]) : null;
@@ -1918,24 +1997,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() : 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", {
+        }, (_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", {
           "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)])]);
       };
@@ -2149,7 +2211,7 @@ var proFormProps = function proFormProps() {
   };
 };
 
-var createForm = function createForm(Form, Grid) {
+var createForm = function createForm(Form, Grid, formMethods) {
   return defineComponent({
     inheritAttrs: false,
     props: _objectSpread2(_objectSpread2(_objectSpread2({}, Form.props), proFormProps()), omit(Grid.props, "items")),
@@ -2201,22 +2263,7 @@ var createForm = function createForm(Form, Grid) {
       };
 
       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);
-        }
-      });
+      expose(createExpose(formMethods, formRef));
       provideProForm(_objectSpread2({
         formState: formState,
         showState: showState,
@@ -2328,11 +2375,12 @@ var proSearchFormProps = function proSearchFormProps() {
  * 该组件只是个模式，最终返回null，不做任何渲染，应配合着ProForm的包装类一起使用
  * 针对传入的model（监听对象）做相应的finish（回调）处理
  */
-var createSearchForm = function createSearchForm(Form, Props) {
+var createSearchForm = function createSearchForm(Form, Props, formMethods) {
   return defineComponent({
     props: _objectSpread2(_objectSpread2(_objectSpread2({}, Form.props), Props), proSearchFormProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
+      var slots = _ref.slots,
+          expose = _ref.expose;
       var formState = props.model || reactive({});
       var valueTypeSet = new Set(props.debounceTypes); //根据column valueType 算出默认需要debounce处理的属性集合
 
@@ -2344,6 +2392,7 @@ var createSearchForm = function createSearchForm(Form, Props) {
         return getColumnFormItemName(column);
       });
       var formRef = ref();
+      expose(createExpose(formMethods, formRef));
 
       var handleFinish = function handleFinish() {
         var _formRef$value;
@@ -2500,8 +2549,8 @@ var proTableProps = function proTableProps() {
       type: String
     },
 
-    /**
-     * 公共column，会merge到columns item中
+    /**
+     * 公共column，会merge到columns item中
      */
     column: {
       type: Object
@@ -2514,29 +2563,29 @@ var proTableProps = function proTableProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * 序号
+    /**
+     * 序号
      */
     serialNumber: {
       type: Boolean
     },
 
-    /**
-     * 分页
+    /**
+     * 分页
      */
     paginationState: {
       type: Object
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -2544,11 +2593,12 @@ var proTableProps = function proTableProps() {
   };
 };
 
-var createTable = function createTable(Table, Props) {
+var createTable = function createTable(Table, Props, tableMethods) {
   return defineComponent({
     props: _objectSpread2(_objectSpread2(_objectSpread2({}, Table.props), Props), proTableProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
+      var slots = _ref.slots,
+          expose = _ref.expose;
 
       var createNumberColumn = function createNumberColumn() {
         return _objectSpread2(_objectSpread2({
@@ -2663,6 +2713,7 @@ var createTable = function createTable(Table, Props) {
         columns: columns,
         tableRef: tableRef
       }, props.provideExtra));
+      expose(createExpose(tableMethods || [], tableRef));
       var invalidKeys = keys(proTableProps());
       return function () {
         return createVNode(Table, mergeProps({
@@ -2675,4 +2726,4 @@ var createTable = function createTable(Table, Props) {
   });
 };
 
-export { CurdAction, CurdAddAction, CurdCurrentMode, CurdSubAction, ProCurd, ProModalCurd, ProModule, ProPageCurd, RequestAction, SearchMode, Wrapper, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, findTargetInTree, findTargetListInTree, generateId, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProFormList, provideProModule, renderElement, renderElements, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };
+export { CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, ProCurd, ProModalCurd, ProModule, ProPageCurd, RequestAction, SearchMode, Wrapper, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, findTargetInTree, findTargetListInTree, generateId, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProFormList, provideProModule, renderElement, renderElements, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };

package/dist/index.js

@@ -993,6 +993,7 @@ var proCurdProps = function proCurdProps() {
   };
 };
 
+var CurdMethods = ["sendCurdEvent", "refreshList", "sendEvent", "sendRequest"];
 var Curd = vue.defineComponent({
   props: _objectSpread2({}, proCurdProps()),
   setup: function setup(props, _ref) {
@@ -1172,7 +1173,6 @@ var Curd = vue.defineComponent({
     });
     expose({
       sendCurdEvent: sendCurdEvent,
-      getOperate: getOperate,
       refreshList: handleSearch
     });
     return function () {
@@ -1254,8 +1254,30 @@ var ProCurd = vue.defineComponent({
     });
     var moduleKeys = lodash.keys(lodash.omit(ProModule.props, "state", "requests"));
     expose({
-      moduleRef: moduleRef,
-      curdRef: curdRef
+      sendCurdEvent: function sendCurdEvent(event) {
+        var _curdRef$value;
+
+        (_curdRef$value = curdRef.value) === null || _curdRef$value === void 0 ? void 0 : _curdRef$value.sendCurdEvent(event);
+      },
+      refreshList: function refreshList(extra) {
+        var _curdRef$value2;
+
+        (_curdRef$value2 = curdRef.value) === null || _curdRef$value2 === void 0 ? void 0 : _curdRef$value2.refreshList(extra);
+      },
+      sendEvent: function sendEvent(action) {
+        var _moduleRef$value;
+
+        (_moduleRef$value = moduleRef.value) === null || _moduleRef$value === void 0 ? void 0 : _moduleRef$value.sendEvent(action);
+      },
+      sendRequest: function sendRequest(requestNameOrAction) {
+        var _moduleRef$value2;
+
+        for (var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          params[_key - 1] = arguments[_key];
+        }
+
+        (_moduleRef$value2 = moduleRef.value) === null || _moduleRef$value2 === void 0 ? void 0 : _moduleRef$value2.sendEvent.apply(_moduleRef$value2, [requestNameOrAction].concat(params));
+      }
     });
     return function () {
       return vue.createVNode(ProModule, vue.mergeProps({
@@ -1284,8 +1306,8 @@ var modalCurdProps = function modalCurdProps() {
   };
 };
 
-/**
- * 事件处理
+/**
+ * 事件处理
  */
 var ModalCurd = vue.defineComponent({
   props: _objectSpread2({}, modalCurdProps()),
@@ -1441,12 +1463,17 @@ var ModalCurd = vue.defineComponent({
 var ProModalCurd = vue.defineComponent({
   props: _objectSpread2(_objectSpread2({}, ProCurd.props), ModalCurd.props),
   setup: function setup(props, _ref4) {
-    var slots = _ref4.slots;
+    var slots = _ref4.slots,
+        expose = _ref4.expose;
+    var curdRef = vue.ref();
+    expose(createExpose(CurdMethods, curdRef));
     var invalidKeys = lodash.keys(ModalCurd.props);
     return function () {
       var _slots$default;
 
-      return vue.createVNode(ProCurd, lodash.omit(props, invalidKeys), {
+      return vue.createVNode(ProCurd, vue.mergeProps({
+        "ref": curdRef
+      }, lodash.omit(props, invalidKeys)), {
         "default": function _default() {
           return [vue.createVNode(ModalCurd, lodash.pick(props, invalidKeys), null), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
         }
@@ -1613,12 +1640,17 @@ var PageCurd = vue.defineComponent({
 var ProPageCurd = vue.defineComponent({
   props: _objectSpread2(_objectSpread2({}, ProCurd.props), PageCurd.props),
   setup: function setup(props, _ref4) {
-    var slots = _ref4.slots;
+    var slots = _ref4.slots,
+        expose = _ref4.expose;
+    var curdRef = vue.ref();
+    expose(createExpose(CurdMethods, curdRef));
     var invalidKeys = lodash.keys(PageCurd.props);
     return function () {
       var _slots$default;
 
-      return vue.createVNode(ProCurd, lodash.omit(props, invalidKeys), {
+      return vue.createVNode(ProCurd, vue.mergeProps({
+        "ref": curdRef
+      }, lodash.omit(props, invalidKeys)), {
         "default": function _default() {
           return [vue.createVNode(PageCurd, lodash.pick(props, invalidKeys), null), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
         }
@@ -1637,6 +1669,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
       //重写Item content
       renderItem: {
         type: Function
+      },
+      //标记名称
+      signName: {
+        type: String
       }
     }),
     setup: function setup(props, _ref) {
@@ -1645,10 +1681,12 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
       var _useProCurd = useProCurd(),
           getItemVNode = _useProCurd.getItemVNode,
           curdState = _useProCurd.curdState,
-          descColumns = _useProCurd.descColumns;
+          descColumns = _useProCurd.descColumns,
+          getSignColumns = _useProCurd.getSignColumns;
 
       var descVNodes = vue.computed(function () {
-        return lodash.map(descColumns.value, function (item) {
+        var columns = props.signName ? getSignColumns(props.signName) : descColumns.value;
+        return lodash.map(columns, function (item) {
           var _slot;
 
           var _props$renderItem;
@@ -1685,6 +1723,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
 
 var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
   return {
+    //标记名称
+    signName: {
+      type: String
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1714,22 +1756,38 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
   };
 };
 
-var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
+var createCurdForm = function createCurdForm(Form, Button, convertFormProps, formMethods) {
   return vue.defineComponent({
+    inheritAttrs: false,
     props: _objectSpread2(_objectSpread2({}, Form.props), proCurdAddOrEditProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
+      var slots = _ref.slots,
+          attrs = _ref.attrs,
+          expose = _ref.expose;
 
       var _useProCurd = useProCurd(),
           elementMap = _useProCurd.elementMap,
           formElementMap = _useProCurd.formElementMap,
           curdState = _useProCurd.curdState,
           formColumns = _useProCurd.formColumns,
+          getSignColumns = _useProCurd.getSignColumns,
           sendCurdEvent = _useProCurd.sendCurdEvent;
 
       var formRef = vue.ref();
+      var columns = vue.computed(function () {
+        if (props.signName) {
+          return getSignColumns(props.signName);
+        }
+
+        return formColumns.value;
+      });
+
+      var handleFinish = function handleFinish(values, originValues) {
+        if (attrs.onFinish) {
+          attrs.onFinish(values, originValues);
+          return;
+        }
 
-      var handleFinish = function handleFinish(values) {
         if (curdState.mode === exports.CurdCurrentMode.EDIT) {
           //edit
           sendCurdEvent({
@@ -1761,15 +1819,16 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
         (_formRef$value2 = formRef.value) === null || _formRef$value2 === void 0 ? void 0 : _formRef$value2.submit();
       };
 
+      expose(createExpose(formMethods, formRef));
       return function () {
         var _slots$divide, _slots$operateStart, _slots$operateCenter, _slots$operateEnd, _slots$default;
 
         return vue.createVNode(Form, vue.mergeProps({
           "ref": formRef
-        }, props, {
+        }, lodash.omit(attrs, "onFinish"), props, {
           "elementMap": props.elementMap || elementMap,
           "formElementMap": props.formElementMap || formElementMap,
-          "columns": formColumns.value,
+          "columns": columns.value,
           "model": curdState.detailData,
           "readonly": curdState.mode === exports.CurdCurrentMode.DETAIL,
           "onFinish": handleFinish
@@ -1803,8 +1862,8 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
 
 var proCurdListProps = function proCurdListProps() {
   return {
-    /**
-     * extra 是否放到SearchForm中
+    /**
+     * extra 是否放到SearchForm中
      */
     extraInSearch: {
       type: Boolean,
@@ -1907,9 +1966,29 @@ var createCurdList = function createCurdList(SearchForm, Table) {
       };
 
       return function () {
-        var _props$searchProps, _slots$divide, _curdState$listData, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd;
+        var _curdState$listData, _props$searchProps, _slots$divide, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd;
 
         var tableProps = props.tableProps;
+
+        var rewriteTableProps = _objectSpread2(_objectSpread2({
+          elementMap: elementMap
+        }, lodash.omit(tableProps, "slots", "operate")), {}, {
+          operate: lodash.mergeWith({
+            items: tableOperateItems
+          }, tableProps === null || tableProps === void 0 ? void 0 : tableProps.operate, function (objValue, srcValue) {
+            if (lodash.isArray(objValue) && lodash.isArray(srcValue)) {
+              return lodash.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
+        });
+
         var extra = slots.extra ? vue.createVNode("div", {
           "class": "pro-curd-list-extra"
         }, [slots.extra()]) : null;
@@ -1922,24 +2001,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() : vue.createVNode(Table, vue.mergeProps({
-          "elementMap": elementMap
-        }, lodash.omit(tableProps, "slots", "operate"), {
-          "operate": lodash.mergeWith({
-            items: tableOperateItems
-          }, tableProps === null || tableProps === void 0 ? void 0 : tableProps.operate, function (objValue, srcValue) {
-            if (lodash.isArray(objValue) && lodash.isArray(srcValue)) {
-              return lodash.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), 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), 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)])]);
       };
@@ -2153,7 +2215,7 @@ var proFormProps = function proFormProps() {
   };
 };
 
-var createForm = function createForm(Form, Grid) {
+var createForm = function createForm(Form, Grid, formMethods) {
   return vue.defineComponent({
     inheritAttrs: false,
     props: _objectSpread2(_objectSpread2(_objectSpread2({}, Form.props), proFormProps()), lodash.omit(Grid.props, "items")),
@@ -2205,22 +2267,7 @@ var createForm = function createForm(Form, Grid) {
       };
 
       var formRef = vue.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);
-        }
-      });
+      expose(createExpose(formMethods, formRef));
       provideProForm(_objectSpread2({
         formState: formState,
         showState: showState,
@@ -2332,11 +2379,12 @@ var proSearchFormProps = function proSearchFormProps() {
  * 该组件只是个模式，最终返回null，不做任何渲染，应配合着ProForm的包装类一起使用
  * 针对传入的model（监听对象）做相应的finish（回调）处理
  */
-var createSearchForm = function createSearchForm(Form, Props) {
+var createSearchForm = function createSearchForm(Form, Props, formMethods) {
   return vue.defineComponent({
     props: _objectSpread2(_objectSpread2(_objectSpread2({}, Form.props), Props), proSearchFormProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
+      var slots = _ref.slots,
+          expose = _ref.expose;
       var formState = props.model || vue.reactive({});
       var valueTypeSet = new Set(props.debounceTypes); //根据column valueType 算出默认需要debounce处理的属性集合
 
@@ -2348,6 +2396,7 @@ var createSearchForm = function createSearchForm(Form, Props) {
         return getColumnFormItemName(column);
       });
       var formRef = vue.ref();
+      expose(createExpose(formMethods, formRef));
 
       var handleFinish = function handleFinish() {
         var _formRef$value;
@@ -2504,8 +2553,8 @@ var proTableProps = function proTableProps() {
       type: String
     },
 
-    /**
-     * 公共column，会merge到columns item中
+    /**
+     * 公共column，会merge到columns item中
      */
     column: {
       type: Object
@@ -2518,29 +2567,29 @@ var proTableProps = function proTableProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * 序号
+    /**
+     * 序号
      */
     serialNumber: {
       type: Boolean
     },
 
-    /**
-     * 分页
+    /**
+     * 分页
      */
     paginationState: {
       type: Object
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -2548,11 +2597,12 @@ var proTableProps = function proTableProps() {
   };
 };
 
-var createTable = function createTable(Table, Props) {
+var createTable = function createTable(Table, Props, tableMethods) {
   return vue.defineComponent({
     props: _objectSpread2(_objectSpread2(_objectSpread2({}, Table.props), Props), proTableProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
+      var slots = _ref.slots,
+          expose = _ref.expose;
 
       var createNumberColumn = function createNumberColumn() {
         return _objectSpread2(_objectSpread2({
@@ -2667,6 +2717,7 @@ var createTable = function createTable(Table, Props) {
         columns: columns,
         tableRef: tableRef
       }, props.provideExtra));
+      expose(createExpose(tableMethods || [], tableRef));
       var invalidKeys = lodash.keys(proTableProps());
       return function () {
         return vue.createVNode(Table, vue.mergeProps({
@@ -2679,6 +2730,7 @@ var createTable = function createTable(Table, Props) {
   });
 };
 
+exports.CurdMethods = CurdMethods;
 exports.ProCurd = ProCurd;
 exports.ProModalCurd = ProModalCurd;
 exports.ProModule = ProModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-start/pro",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "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": "adf3a978c60ccb84172c2287b67d2e5ead0d0dcf"
+  "gitHead": "4cadd260951f249478eabe6e9b21bdbeb802de4c"
 }