@ttkj/avue 2.10.20 → 2.10.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttkj/avue",
-  "version": "2.10.20",
+  "version": "2.10.21",
   "description": "A Magic Configurable Web Framework",
   "main": "lib/avue.min.js",
   "unpkg": "lib/avue.min.js",

package/types/crud/column.d.ts

@@ -1,14 +1,14 @@
 import { CreateElement, VNode } from 'vue';
 import { RenderHeaderData, TableColumn, TableColumnFilter } from 'element-ui/types/table-column';
 import { PopoverPlacement } from 'element-ui/types/popover';
-import { AvueAlignment, Obj } from '../global';
+import { AvueAlignment, AvueComponentSize, Obj } from '../global';
 import { FormColumnEventParams, AvueFormBaseColumn, AvueFormColumn, FormColumnEvent } from '../form/column';
 import { DynamicFormColumnChildren } from '../form/components/dynamic';
 
 /**
  * 表单项事件参数，适用于click|blur|focus
  */
-export interface CrudColumnEventParams<T = Obj> extends FormColumnEventParams<T> {
+export interface CrudColumnEventParams<T = Obj, U = Obj> extends FormColumnEventParams<T, U> {
   /** 所在行 */
   index: number;
   /** 行数据 */
@@ -23,7 +23,7 @@ export interface CrudColumnEventParams<T = Obj> extends FormColumnEventParams<T>
 }
 
 /** 表格项通用参数 */
-export interface CrudBaseColumn {
+export interface CrudBaseColumn<T = Obj> {
   /** 列类型, 默认: 'input' */
   type?: string;
   /** 对应列内容的字段名 */
@@ -105,7 +105,7 @@ export interface CrudColumnStyleOption {
 }
 
 /** 表格项通用搜索相关配置 */
-export interface CrudColumnSearchOption {
+export interface CrudColumnSearchOption<T = Obj> {
   /** 是否搜索项, 默认: false */
   search: boolean;
   /** 自定义搜索组件 */
@@ -240,7 +240,7 @@ export interface CrudColumnSearchOption {
 }
 
 /** 表格项通用过滤相关配置 */
-export interface CrudColumnFilterOption {
+export interface CrudColumnFilterOption<T = Obj> {
   /**
    * 是否在动态搜索条件里面显示, 默认: true
    * @default true
@@ -368,10 +368,10 @@ export interface CrudFormColumnEvent<T = Obj> {
 
 /** 表格项通用参数 */
 export interface AvueCrudBaseColumn<T = Obj>
-  extends CrudBaseColumn,
+  extends CrudBaseColumn<T>,
     Partial<CrudColumnStyleOption>,
-    Partial<CrudColumnSearchOption>,
-    Partial<CrudColumnFilterOption>,
+    Partial<CrudColumnSearchOption<T>>,
+    Partial<CrudColumnFilterOption<T>>,
     Partial<CrudFormColumnOption>,
     Partial<CrudFormColumnEvent<T>> {}
 

package/types/crud/index.d.ts

@@ -5,11 +5,12 @@ import { ElForm } from 'element-ui/types/form';
 import { ElTable } from 'element-ui/types/element-ui';
 import { ElUploadInternalRawFile } from 'element-ui/types/upload';
 
-import { AvueComponent, Obj } from '../global';
+import { AvueComponent, Obj, DicProps } from '../global';
 import { CrudOption } from './option';
 import { AvueCrudColumn } from './column';
 import { AvueCrudHeaderSearch } from './refs/header-search';
 import { AvueCrudDialogForm } from './refs/dialog-form';
+import { DynamicFormColumnEventParams } from '../form/components/dynamic';
 
 /** 表单打开类型 */
 export type AvueCrudFormMode = 'add' | 'edit' | 'view';
@@ -249,7 +250,7 @@ export interface CrudSearchFormNormalScope<T = any, R = Obj> {
   dic?: Obj[];
 }
 
-/** 通用表单插槽 */
+/** 通用弹窗表单插槽 */
 export interface CrudFormNormalScope<T = any> {
   /** 表单值 */
   value: T;
@@ -262,3 +263,32 @@ export interface CrudFormNormalScope<T = any> {
   /** 表单弹窗类型 */
   type: AvueCrudFormMode;
 }
+
+/** 通用行内弹窗表单插槽 */
+export interface CrudCellFormNormalScope<T = any, D = Obj> extends CrudNormalScope<D> {
+  /** 数据字典 */
+  dic?: Obj[];
+  /** 列配置 */
+  tableData: {
+    /** 行索引 */
+    index: number;
+    /** 行数据 */
+    row: D;
+    /** 显示值 */
+    label: string;
+    /** 列索引 */
+    columnIndex: Record<string, AvueCrudColumn>;
+    /** 数据字典 */
+    dic?: Obj[];
+    /** 根表单数据，明细组件时有值 */
+    rootFormData?: DynamicFormColumnEventParams;
+  };
+  /** props配置 */
+  props?: DicProps;
+  /** 是否只读 */
+  readonly?: boolean;
+  /** 是否禁用 */
+  disabled?: boolean;
+  /** 是否显示清空按钮 */
+  clearable: boolean;
+}

package/types/form/components/dynamic.d.ts

@@ -1,7 +1,8 @@
 // 引入定义
 import { Obj } from '../../global';
 import { CrudOption } from '../../crud/option';
-import { AvueFormBaseColumn } from '../column';
+import { FormOption } from '../option';
+import { AvueFormBaseColumn, FormColumnEventParams, AvueFormColumn } from '../column';
 
 /** 明细表单/表格配置 */
 export interface DynamicFormColumnChildren extends CrudOption {
@@ -33,3 +34,17 @@ export interface DynamicFormColumn<T = Obj> extends AvueFormBaseColumn<T> {
   /** 其他配置 */
   [x: string]: any;
 }
+/** 表单项事件参数，适用于click|blur|focus */
+export interface DynamicFormColumnEventParams<T = Obj, U = Obj> extends FormColumnEventParams<T, U> {
+  /** 根表单数据 */
+  rootFormData: {
+    /** 表单项列配置索引 */
+    columnIndex: Record<string, AvueFormColumn>;
+    /** 根表单的数据值 */
+    data: T;
+    /**  */
+    formOption: FormOption<T>;
+  };
+}
+/** change事件参数 */
+export type DynamicFormColumnChangeEventParams<T = Obj, U = Obj> = Omit<DynamicFormColumnEventParams<T, U>, 'event'>;

package/types/form/index.d.ts

@@ -65,3 +65,17 @@ export declare class AvueForm<T = Obj> extends AvueComponent {
   /** 组件Refs */
   $refs: AvueFormRefs;
 }
+
+/** 通用表单插槽 */
+export interface FormNormalScope<T = any, D = Obj> {
+  /** 表单值 */
+  value: T;
+  /** 列配置 */
+  column: AvueCrudColumn;
+  /** 大小 */
+  size: AvueComponentSize;
+  /** 是否禁用 */
+  disabled: boolean;
+  /** 表单数据 */
+  row: D;
+}