@newview/ui 1.1.13 → 1.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newview/ui",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "author": "newview",
   "type": "module",
   "main": "./dist/newview-ui.umd.cjs",

package/types/ComForm.d.ts

@@ -664,6 +664,11 @@ export interface RadioGroupProp {
      * 在选项状态发生改变时触发，返回当前选中的项。通过修改外部的数据改变时不会触发
      */
     onChange?: (event?: any, item?: ComFormItem) => any;
+
+    /**
+     * 设置禁用状态
+     */
+    disabled?: boolean;
 }
 
 /**
@@ -1509,7 +1514,7 @@ export interface ComFormItem {
      */
     type?: "Switch" | "Label" | "Button" | "Input" | "InputNumber" | "Select" | "Radio" | "Checkbox" |
     "TreeSelect" | "City" | "AutoComplete" | "Slider" | "DatePicker" | "TimePicker" | "Cascader" |
-    "TagSelect" | "Rate" | "ColorPicker" | "IconSelect" | "UploadFile";
+    "TagSelect" | "Rate" | "ColorPicker" | "IconSelect" | "UploadFile" | 'TextEditor';
 
     /**
      * Switch 参数
@@ -1640,6 +1645,10 @@ export interface ComFormItem {
      * 是否显示校验错误信息
      */
     'show-message'?: boolean;
+    /**
+    * 文本高度
+    */
+    textHeight?: number;
 }
 
 import type { DefineComponent } from 'vue';

package/types/Grid.d.ts

@@ -225,6 +225,21 @@ export interface GridChProp {
     label?: string
 }
 
+
+/**
+ * 表头筛选配置
+ */
+export interface GridFilterProp {
+    /**
+     * 筛选类型
+     */
+    type: "select" | "input" | "date" | "month" | "year" | "time" | "datetime" | "daterange";
+    /**
+     * 下拉列表数据
+     */
+    options?:FilterSelectOptionProp[]
+}
+
 /**
  * 基本配置
  */
@@ -317,6 +332,10 @@ export interface GridSetting {
      * 校验规则配置项
      */
     editRules?: { [field: string]: VxeTableDefines.ValidatorRule[] }
+    /**
+     * 表头筛选配置
+     */
+    filterConfig?: VxeTablePropTypes.FilterConfig;
 }
 
 /**
@@ -408,6 +427,20 @@ export interface GridEvent extends VxeTableListeners {
      * @returns 
      */
     event_loaded?: (datas: any[]) => void;
+    
+    /**
+     * 表头筛选项发生改变事件
+     * @param param 
+     * @returns 
+     */
+    event_filterChange?: (param,param2) => void;
+  /**
+    * 合并行或列
+    * @param param0 
+    * @returns 
+    */
+
+    event_rowspanMethod?: ({ row, _rowIndex, column, visibleData }) => void
 }
 
 /**
@@ -490,6 +523,11 @@ export interface GridColumn extends VxeColumnProps {
      * ch列参数
      */
     ch?: GridChProp;
+
+    /**
+     * 表头筛选配置
+     */
+    filter?: GridFilterProp
 }
 
 /**