@vue-start/pro 0.5.31 → 0.5.33

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 0.5.33
+
+- ProTable 新增 mergeOpts 属性，支持行、列合并
+
 # [0.4.0](https://github.com/zxeryu/vue-start/compare/@vue-start/pro@0.3.2...@vue-start/pro@0.4.0) (2022-09-02)
 
 ### Bug Fixes

package/dist/index.d.ts

@@ -10,7 +10,7 @@ import { TUpdater } from '@vue-start/store';
 import * as vue_router from 'vue-router';
 import { Router, RouteLocationNormalizedLoaded } from 'vue-router';
 import * as lodash from 'lodash';
-import { TConvert } from '@vue-start/hooks';
+import { TTableMergeOpts, TConvert } from '@vue-start/hooks';
 
 declare type TDefaultValueType = "text" | "textarea" | "password" | "digit" | "date" | "dateRange" | "time" | "timeRange" | "select" | "treeSelect" | "checkbox" | "radio" | "slider" | "switch" | "rate" | "cascader";
 declare type TValueType = TDefaultValueType | string;
@@ -43,10 +43,16 @@ declare type TColumn = {
         label?: string;
     };
     formFieldProps?: Record<string, any>;
-    search?: boolean;
+    /********* props *********/
+    props?: Record<string, any>;
+    inputProps?: Record<string, any>;
+    /********* 自定义render方法 *********/
+    render?: TRender;
+    inputRender?: TRender;
     descRender?: string | TRender;
-    formRender?: string | TRender;
     formReadRender?: string | TRender;
+    tableRender?: string | TRender;
+    search?: boolean;
     extra?: {
         desc?: Record<string, any>;
         col?: Record<string, any>;
@@ -170,7 +176,6 @@ declare type TObjItem = {
 declare type TFunItem = (string | TParamItem | TObjItem)[];
 declare type TExpression = TFunItem | TDataType | TObjItem;
 
-/***************************************** curd模式 *****************************************/
 /**
  * 获取Column的valueType，默认"text"
  * @param column
@@ -182,20 +187,33 @@ declare const getColumnValueType: (column: TColumn) => TValueType;
  */
 declare const getColumnFormItemName: (column: TColumn) => string | number | undefined;
 /**
- * 根据Column生成FormItem VNode
- * formFieldProps中的slots参数会以v-slots的形式传递到FormItem的录入组件（子组件）中
- * @param formElementMap
+ * 获取column 中对应的render方法
+ * case1：render为方法的时候，直接返回render；
+ * case2：render为字符串的时候，返回column中该字符串对应的属性；
+ *      如：render为"customRender"时候，返回customRender方法；
  * @param column
- * @param needRules
+ * @param render
  */
-declare const getFormItemEl: (formElementMap: any, column: TColumn) => VNode | null;
+declare const getRealRender: (column: TColumn, render?: string | Function) => Function | undefined;
 /**
- *  根据Column生成Item VNode
+ * 渲染column描述的组件
  * @param elementMap
  * @param column
- * @param value
+ * @param extra 动态props，一般传递value
+ * @param opts
  */
-declare const getItemEl: <T extends TColumn>(elementMap: any, column: T, value: any) => VNode | null;
+declare const renderColumn: (elementMap: any, column: TColumn, extra?: Record<string, any>, opts?: {
+    render?: string;
+}) => any;
+/**
+ * form 中渲染column对应的输入组件
+ * @param elementMap
+ * @param formElementMap
+ * @param column
+ */
+declare const renderInputColumn: (elementMap: any, formElementMap: any, column: TColumn) => VNode<vue.RendererNode, vue.RendererElement, {
+    [key: string]: any;
+}> | null;
 /***************************************** 通用模式 *****************************************/
 declare type InternalNamePath = (string | number)[];
 declare type NamePath = string | number | InternalNamePath;
@@ -975,7 +993,7 @@ declare const proFormProps: () => {
      * submit触发前hook，返回true，表示消费了此事件，不执行finish回掉
      */
     onPreFinish: {
-        type: PropType<(...e: any[]) => boolean>;
+        type: PropType<(...e: any[]) => boolean | undefined>;
         default: undefined;
     };
 };
@@ -1123,6 +1141,7 @@ interface IProFormListProvide {
 }
 declare const useProFormList: () => IProFormListProvide;
 declare const provideProFormList: (ctx: IProFormListProvide) => void;
+declare type TOriginFn = () => void;
 declare const proFormListProps: () => {
     rowKey: {
         type: StringConstructor;
@@ -1148,6 +1167,18 @@ declare const proFormListProps: () => {
     renderItemMinus: {
         type: PropType<() => VNode>;
     };
+    onPreAdd: {
+        type: PropType<() => boolean | undefined>;
+    };
+    onAdd: {
+        type: PropType<(fn: TOriginFn) => void>;
+    };
+    onPreRemove: {
+        type: PropType<(opts: any) => boolean | undefined>;
+    };
+    onRemove: {
+        type: PropType<(fn: TOriginFn, opts: any) => void>;
+    };
 };
 declare type ProFormListProps = Partial<ExtractPropTypes<ReturnType<typeof proFormListProps>>> & Omit<ProGridProps, "items">;
 declare const ProFormList: vue.DefineComponent<ProFormListProps, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<ProFormListProps>, {}>;
@@ -1373,10 +1404,18 @@ declare const proTableProps: () => {
     tableMethods: {
         type: PropType<string[]>;
     };
+    /**
+     * 行、列合并配置
+     */
+    mergeOpts: {
+        type: PropType<TTableMergeOpts>;
+    };
+    dataSource: {
+        type: PropType<Record<string, any>[]>;
+    };
 };
 declare type ProTableProps = Partial<ExtractPropTypes<ReturnType<typeof proTableProps>>> & ProBaseProps & {
     loading?: boolean;
-    dataSource?: Record<string, any>[];
 };
 declare const ProTable: vue.DefineComponent<ProTableProps, {}, {}, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.VNodeProps & vue.AllowedComponentProps & vue.ComponentCustomProps, Readonly<ProTableProps>, {}>;
 
@@ -2224,8 +2263,6 @@ declare const ProCurd: vue.DefineComponent<ProCurdProps, {}, {}, {}, {}, vue.Com
 interface IProCurdProvide {
     columns: Ref<TColumns>;
     getSignColumns: (signName: string) => TColumns;
-    getFormItemVNode: (column: TColumn) => VNode | null;
-    getItemVNode: (column: TColumn, value: any) => VNode | null;
     elementMap: TElementMap;
     formElementMap: TElementMap;
     rowKey: string;
@@ -2430,4 +2467,4 @@ declare const getSignValue: <T = any>(item: TColumn, signName: string) => T;
  */
 declare const filterSlotsByPrefix: (slots: Record<string, any>, prefix: string) => lodash.Dictionary<any>;
 
-export { AddButton, BooleanObjType, BooleanRulesObjType, ColumnSetting, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, ElementKeys, FieldNames, FormAction, FormItemProps, FormRulePrefixMap, IAccess, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOpeItem, IOperateItem, IPer, IProConfigProvide, IProCurdProvide, IProFormProvideExtra, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, IUser, InternalNamePath, LogonUser, LogonUserKey, MustLogon, NamePath, PageHeaderProps, PaginationSlotProps, PerSuffix, Permission, PermissionProps, ProBaseProps, ProColumnSettingProps, ProConfig, ProConfigProps, ProCurd, ProCurdDesc, ProCurdDescConnect, ProCurdDescProps, ProCurdForm, ProCurdFormConnect, ProCurdFormProps, ProCurdList, ProCurdListConnect, ProCurdListProps, ProCurdModal, ProCurdModalForm, ProCurdModalFormConnect, ProCurdModalProps, ProCurdProps, ProDesc, ProDescProps, ProDispatchRequestType, ProForm, ProFormItemProps, ProFormList, ProFormListProps, ProFormProps, ProGrid, ProGridProps, ProLayout, ProList, ProListProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProOperate, ProOperateProps, ProPage, ProPageCurd, ProPageCurdProps, ProPageProps, ProSearchForm, ProSearchFormProps, ProShowDate, ProShowDigit, ProShowOptions, ProShowText, ProShowTree, ProTable, ProTableProps, ProTypography, ProTypographyProps, ProUploadList, ProUploaderText, RequestAction, RouterMethods, SearchMode, SearchSlotProps, TAccess, TActionEvent, TActionState, TColumn, TColumns, TConfigData, TCurdActionEvent, TDefaultValueType, TElementMap, TExecuteFunName, TExecuteItem, TExecuteName, TFile, TFormExtraMap, TInitialState, TLogonUserProvide, TMeta, TOpenMenu, TOption, TOptions, TPageState, TProFormOperate, TRegisterStore, TRegisterStoreMap, TRender, TRouter, TTableColumn, TTableColumns, TValueType, TreeOption, TreeOptions, Wrapper, convertPathToList, convertResData, createExpose, createExposeObj, createFormItemCompFn, createModule, createProConfig, defaultPage, filterSlotsByPrefix, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getSignValue, getValidValues, isValidConfig, mergeState, mergeStateToList, proBaseProps, provideProCurd, provideProFormList, provideProModule, renderElement, renderElements, useAccess, useAccessMgr, useComposeRequestActor, useDispatchMeta, useDispatchStore, useDoneRequestActor, useFailedRequestActor, useFormSubmit, useGetCompByKey, useHasPer, useHasPer2, useLogonUser, useMetaRegister, useModuleEvent, useProConfig, useProCurd, useProForm, useProFormList, useProModal, useProModule, useProMsg, useProNotify, useProRouter, useProTable, useReadStore };
+export { AddButton, BooleanObjType, BooleanRulesObjType, ColumnSetting, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, ElementKeys, FieldNames, FormAction, FormItemProps, FormRulePrefixMap, IAccess, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOpeItem, IOperateItem, IPer, IProConfigProvide, IProCurdProvide, IProFormProvideExtra, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, IUser, InternalNamePath, LogonUser, LogonUserKey, MustLogon, NamePath, PageHeaderProps, PaginationSlotProps, PerSuffix, Permission, PermissionProps, ProBaseProps, ProColumnSettingProps, ProConfig, ProConfigProps, ProCurd, ProCurdDesc, ProCurdDescConnect, ProCurdDescProps, ProCurdForm, ProCurdFormConnect, ProCurdFormProps, ProCurdList, ProCurdListConnect, ProCurdListProps, ProCurdModal, ProCurdModalForm, ProCurdModalFormConnect, ProCurdModalProps, ProCurdProps, ProDesc, ProDescProps, ProDispatchRequestType, ProForm, ProFormItemProps, ProFormList, ProFormListProps, ProFormProps, ProGrid, ProGridProps, ProLayout, ProList, ProListProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProOperate, ProOperateProps, ProPage, ProPageCurd, ProPageCurdProps, ProPageProps, ProSearchForm, ProSearchFormProps, ProShowDate, ProShowDigit, ProShowOptions, ProShowText, ProShowTree, ProTable, ProTableProps, ProTypography, ProTypographyProps, ProUploadList, ProUploaderText, RequestAction, RouterMethods, SearchMode, SearchSlotProps, TAccess, TActionEvent, TActionState, TColumn, TColumns, TConfigData, TCurdActionEvent, TDefaultValueType, TElementMap, TExecuteFunName, TExecuteItem, TExecuteName, TFile, TFormExtraMap, TInitialState, TLogonUserProvide, TMeta, TOpenMenu, TOption, TOptions, TPageState, TProFormOperate, TRegisterStore, TRegisterStoreMap, TRender, TRouter, TTableColumn, TTableColumns, TValueType, TreeOption, TreeOptions, Wrapper, convertPathToList, convertResData, createExpose, createExposeObj, createFormItemCompFn, createModule, createProConfig, defaultPage, filterSlotsByPrefix, getColumnFormItemName, getColumnValueType, getFirstPropName, getRealRender, getSignValue, getValidValues, isValidConfig, mergeState, mergeStateToList, proBaseProps, provideProCurd, provideProFormList, provideProModule, renderColumn, renderElement, renderElements, renderInputColumn, useAccess, useAccessMgr, useComposeRequestActor, useDispatchMeta, useDispatchStore, useDoneRequestActor, useFailedRequestActor, useFormSubmit, useGetCompByKey, useHasPer, useHasPer2, useLogonUser, useMetaRegister, useModuleEvent, useProConfig, useProCurd, useProForm, useProFormList, useProModal, useProModule, useProMsg, useProNotify, useProRouter, useProTable, useReadStore };