@newview/ui 1.1.18 → 1.1.20

package/package.json

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

package/types/ComForm.d.ts

@@ -972,7 +972,7 @@ export interface DatePickerProp {
     /**
      * 展示的日期格式
      */
-    format?: Date;
+    format?: string;
 
     /**
      * 日期选择器出现的位置，可选值为`top` `top-start` `top-end` `bottom` `bottom-start` `bottom-end` `left` `left-start` `left-end` `right` `right-start` `right-end`
@@ -1514,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" | 'TextEditor';
+    "TagSelect" | "Rate" | "ColorPicker" | "IconSelect" | "UploadFile" | 'TextEditor' | 'DicSelect';
 
     /**
      * Switch 参数
@@ -1649,6 +1649,19 @@ export interface ComFormItem {
     * 文本高度
     */
     textHeight?: number;
+
+    /**
+    * 只读模式下文本区域是否有边框
+    */
+    textBorder?: boolean;
+    /**
+    * 字典项code
+    */
+    dicCode?: string;
+    /**
+    * 字典项所在的平台Id 默认当前平台
+    */
+    dicPId?: number
 }
 
 import type { DefineComponent } from 'vue';

package/types/Grid.d.ts

@@ -226,6 +226,15 @@ export interface GridChProp {
 }
 
 
+/**
+ * Option
+ */
+export interface FilterSelectOptionProp {
+    value: any,
+    label?: any,
+    text?: any,
+    checked?: boolean
+}
 /**
  * 表头筛选配置
  */
@@ -233,11 +242,16 @@ export interface GridFilterProp {
     /**
      * 筛选类型
      */
-    type: "select" | "input" | "date" | "month" | "year" | "time" | "datetime" | "daterange";
+    type: "select" | "input" | "date" | "month" | "year" | "time" | "datetime" | "daterange" | "numberrange";
     /**
      * 下拉列表数据
      */
     options?:FilterSelectOptionProp[]
+    /**
+     * 下拉选项是否多选
+     */
+    multiple?:boolean
+
 }
 
 /**
@@ -336,6 +350,10 @@ export interface GridSetting {
      * 表头筛选配置
      */
     filterConfig?: VxeTablePropTypes.FilterConfig;
+    /**
+     * 复选框配置项
+     */
+    checkboxConfig?: VxeTablePropTypes.CheckboxConfig;
 }
 
 /**
@@ -716,6 +734,38 @@ export declare class GridInstance extends BaseInstance {
      * 校验数据
      */
     validate(): Promise<boolean>;
+
+    /**
+     * 设置表头筛选条件
+     * @param field 
+     * @param options 
+     */
+    setFilter(field,options): void
+
+    /**
+     * 根据表头筛选数据获取拼接好的查询条件
+     * @param filterParam 
+     */
+    getHeaderFilter(filterParam):void
+
+    /**
+     * 加载表头筛选数据
+     * @param _queryWrapper 
+     */
+    loadDataByHeaderFilter(_queryWrapper: QueryWrapper): void;
+}
+/**
+ * 正在执行方法中遮罩配置
+ */
+export interface doMethodLoadingType{
+    /**
+     * 是否显示正在执行遮罩
+     */
+    show?:boolean;
+    /**
+     * 正在执行遮罩文本内容
+     */
+    text?:string
 }
 
 import type { DefineComponent } from 'vue';
@@ -725,4 +775,8 @@ export declare const Grid: DefineComponent<{
      * Gird 配置项
      */
     option?: GridOptions;
+    /**
+     * 正在执行方法中遮罩配置
+     */
+    doMethodLoading?: doMethodLoadingType;
 }>

package/vite.config.ts

@@ -35,7 +35,7 @@ export default defineConfig({
         "vue",
         "@vue-office/docx",
         "vuedraggable",
-        "sortablejs"
+        "sortablejs",
       ],
       output: {
         globals: {