@farris/ui-vue 1.7.0-beta.3 → 1.7.0-beta.4

package/locales/data-grid/ui/en.json

@@ -45,7 +45,8 @@
             "sevenDays": "Seven Days",
             "oneMonth": "One Month",
             "threeMonths": "Three Months",
-            "sixMonths": "Six Months"
+            "sixMonths": "Six Months",
+            "searchBoxPlaceholder": "Please enter a keyword"
         },
         "settings": {
             "visible": "Display Columns",

package/locales/data-grid/ui/zh-CHS.json

@@ -45,7 +45,8 @@
             "sevenDays": "七天",
             "oneMonth": "一个月",
             "threeMonths": "三个月",
-            "sixMonths": "半年"
+            "sixMonths": "半年",
+            "searchBoxPlaceholder": "请输入关键词"
         },
         "settings": {
             "visible": "显示列",

package/locales/data-grid/ui/zh-CHT.json

@@ -45,7 +45,8 @@
             "sevenDays": "七天",
             "oneMonth": "一個月",
             "threeMonths": "三個月",
-            "sixMonths": "半年"
+            "sixMonths": "半年",
+            "searchBoxPlaceholder": "請輸入關鍵詞"
         },
         "settings": {
             "visible": "顯示列",

package/locales/designer/en.json

@@ -132,7 +132,14 @@
     "cancel": "Cancel",
     "confirm": "Confirm"
   },
-  "discussionGroup": {
+  "condition": {
+    "add": "Add condition",
+    "create": "Create condition group",
+    "reset": "Reset",
+    "and": "And",
+    "or": "Or"
+  },
+  "comment": {
     "reply": "Reply",
     "cancel": "Cancel",
     "submit": "Submit",
@@ -141,13 +148,6 @@
     "searchPlaceholder": "Enter name to search",
     "submitEmpty": "Submission content cannot be empty"
   },
-  "condition": {
-    "add": "Add condition",
-    "create": "Create condition group",
-    "reset": "Reset",
-    "and": "And",
-    "or": "Or"
-  },
   "avatar": {
     "imgtitle": "Amend",
     "typeError": "Type error",
@@ -477,7 +477,8 @@
       "sevenDays": "Seven Days",
       "oneMonth": "One Month",
       "threeMonths": "Three Months",
-      "sixMonths": "Six Months"
+      "sixMonths": "Six Months",
+      "searchBoxPlaceholder": "Please enter a keyword"
     },
     "settings": {
       "visible": "Display Columns",
@@ -616,6 +617,7 @@
     "prevDay": "Prev Day",
     "nextDay": "Next Day",
     "prevYear": "Prev Year",
-    "nextYear": "Next Year"
+    "nextYear": "Next Year",
+    "more": "Still #count# more items..."
   }
 }

package/locales/designer/zh-CHS.json

@@ -132,7 +132,14 @@
     "cancel": "取消",
     "confirm": "确定"
   },
-  "discussionGroup": {
+  "condition": {
+    "add": "添加条件",
+    "create": "生成条件组",
+    "reset": "重置",
+    "and": "与",
+    "or": "或"
+  },
+  "comment": {
     "reply": "回复",
     "cancel": "取消",
     "submit": "提交",
@@ -141,13 +148,6 @@
     "searchPlaceholder": "请输入姓名搜索",
     "submitEmpty": "提交内容不能为空"
   },
-  "condition": {
-    "add": "添加条件",
-    "create": "生成条件组",
-    "reset": "重置",
-    "and": "与",
-    "or": "或"
-  },
   "avatar": {
     "imgtitle": "点击修改",
     "typeError": "上传图片类型不正确",
@@ -477,7 +477,8 @@
       "sevenDays": "七天",
       "oneMonth": "一个月",
       "threeMonths": "三个月",
-      "sixMonths": "半年"
+      "sixMonths": "半年",
+      "searchBoxPlaceholder": "请输入关键词"
     },
     "settings": {
       "visible": "显示列",
@@ -579,13 +580,13 @@
   },
   "calendar": {
     "dayLabels": {
-      "Sun": "周日",
-      "Mon": "周一",
-      "Tue": "周二",
-      "Wed": "周三",
-      "Thu": "周四",
-      "Fri": "周五",
-      "Sat": "周六"
+      "Sun": "星期日",
+      "Mon": "星期一",
+      "Tue": "星期二",
+      "Wed": "星期三",
+      "Thu": "星期四",
+      "Fri": "星期五",
+      "Sat": "星期六"
     },
     "monthLabels": {
       "1": "1月",
@@ -616,6 +617,7 @@
     "prevDay": "上一天",
     "nextDay": "下一天",
     "prevYear": "上一年",
-    "nextYear": "下一年"
+    "nextYear": "下一年",
+    "more": "还有 #count# 项..."
   }
 }

package/locales/designer/zh-CHT.json

@@ -132,7 +132,14 @@
     "cancel": "取消",
     "confirm": "確定"
   },
-  "discussionGroup": {
+  "condition": {
+    "add": "新增條件",
+    "create": "建立條件群組",
+    "reset": "重設",
+    "and": "且",
+    "or": "或"
+  },
+  "comment": {
     "reply": "回覆",
     "cancel": "取消",
     "submit": "提交",
@@ -141,13 +148,6 @@
     "searchPlaceholder": "請輸入姓名搜尋",
     "submitEmpty": "提交內容不能為空"
   },
-  "condition": {
-    "add": "新增條件",
-    "create": "建立條件群組",
-    "reset": "重設",
-    "and": "且",
-    "or": "或"
-  },
   "avatar": {
     "imgtitle": "點擊修改",
     "typeError": "上傳圖片類型不正確",
@@ -473,7 +473,8 @@
       "sevenDays": "七天",
       "oneMonth": "一個月",
       "threeMonths": "三個月",
-      "sixMonths": "半年"
+      "sixMonths": "半年",
+      "searchBoxPlaceholder": "請輸入關鍵詞"
     },
     "settings": {
       "visible": "顯示列",
@@ -575,13 +576,13 @@
   },
   "calendar": {
     "dayLabels": {
-      "Sun": "周日",
-      "Mon": "周一",
-      "Tue": "周二",
-      "Wed": "周三",
-      "Thu": "周四",
-      "Fri": "周五",
-      "Sat": "周六"
+      "Sun": "星期日",
+      "Mon": "星期一",
+      "Tue": "星期二",
+      "Wed": "星期三",
+      "Thu": "星期四",
+      "Fri": "星期五",
+      "Sat": "星期六"
     },
     "monthLabels": {
       "1": "1月",
@@ -612,6 +613,7 @@
     "prevDay": "上一天",
     "nextDay": "下一天",
     "prevYear": "上一年",
-    "nextYear": "下一年"
+    "nextYear": "下一年",
+    "more": "還有 #count# 項..."
   }
 }

package/locales/ui/en.json

@@ -389,7 +389,8 @@
       "sevenDays": "Seven Days",
       "oneMonth": "One Month",
       "threeMonths": "Three Months",
-      "sixMonths": "Six Months"
+      "sixMonths": "Six Months",
+      "searchBoxPlaceholder": "Please enter a keyword"
     },
     "settings": {
       "visible": "Display Columns",
@@ -544,7 +545,8 @@
     "prevDay": "Prev Day",
     "nextDay": "Next Day",
     "prevYear": "Prev Year",
-    "nextYear": "Next Year"
+    "nextYear": "Next Year",
+    "more": "Still #count# more items..."
   },
   "avatar": {
     "imgtitle": "Amend",

package/locales/ui/zh-CHS.json

@@ -389,7 +389,8 @@
       "sevenDays": "七天",
       "oneMonth": "一个月",
       "threeMonths": "三个月",
-      "sixMonths": "半年"
+      "sixMonths": "半年",
+      "searchBoxPlaceholder": "请输入关键词"
     },
     "settings": {
       "visible": "显示列",
@@ -507,13 +508,13 @@
   },
   "calendar": {
     "dayLabels": {
-      "Sun": "周日",
-      "Mon": "周一",
-      "Tue": "周二",
-      "Wed": "周三",
-      "Thu": "周四",
-      "Fri": "周五",
-      "Sat": "周六"
+      "Sun": "星期日",
+      "Mon": "星期一",
+      "Tue": "星期二",
+      "Wed": "星期三",
+      "Thu": "星期四",
+      "Fri": "星期五",
+      "Sat": "星期六"
     },
     "monthLabels": {
       "1": "1月",
@@ -544,7 +545,8 @@
     "prevDay": "上一天",
     "nextDay": "下一天",
     "prevYear": "上一年",
-    "nextYear": "下一年"
+    "nextYear": "下一年",
+    "more": "还有 #count# 项..."
   },
   "avatar": {
     "imgtitle": "点击修改",

package/locales/ui/zh-CHT.json

@@ -385,7 +385,8 @@
       "sevenDays": "七天",
       "oneMonth": "一個月",
       "threeMonths": "三個月",
-      "sixMonths": "半年"
+      "sixMonths": "半年",
+      "searchBoxPlaceholder": "請輸入關鍵詞"
     },
     "settings": {
       "visible": "顯示列",
@@ -503,13 +504,13 @@
   },
   "calendar": {
     "dayLabels": {
-      "Sun": "周日",
-      "Mon": "周一",
-      "Tue": "周二",
-      "Wed": "周三",
-      "Thu": "周四",
-      "Fri": "周五",
-      "Sat": "周六"
+      "Sun": "星期日",
+      "Mon": "星期一",
+      "Tue": "星期二",
+      "Wed": "星期三",
+      "Thu": "星期四",
+      "Fri": "星期五",
+      "Sat": "星期六"
     },
     "monthLabels": {
       "1": "1月",
@@ -540,7 +541,8 @@
     "prevDay": "上一天",
     "nextDay": "下一天",
     "prevYear": "上一年",
-    "nextYear": "下一年"
+    "nextYear": "下一年",
+    "more": "還有 #count# 項..."
   },
   "avatar": {
     "imgtitle": "點擊修改",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farris/ui-vue",
-  "version": "1.7.0-beta.3",
+  "version": "1.7.0-beta.4",
   "license": "Apache-2.0",
   "description": "Farris Vue, a Farris Design based Vue3 component library.",
   "keywords": [

package/types/combo-list/src/composition/types.d.ts

@@ -8,4 +8,5 @@ export interface UseDataSource {
     getItemsByDisplayText: (text: string) => Option[];
     getItemsByValue: (value: string) => Option[];
     getSelectedItemsByDisplayText: (text: string) => Option[];
+    beforeOpenList: (instance: any) => Promise<any>;
 }

package/types/condition/src/composition/condition-value/number-spinner-value.d.ts

@@ -10,7 +10,7 @@ export declare class NumberSpinnerValue implements ConditionValue {
     }, editor?: any);
     clear(): void;
     getValue(): number | null | undefined;
-    getDisplayText(): number | null | undefined;
+    getDisplayText(): string;
     setValue(value: any): void;
     isEmpty(): boolean;
 }

package/types/condition/src/composition/use-field-config.d.ts

@@ -1,4 +1,4 @@
 import { SetupContext } from "vue";
 import { ConditionProps } from "../condition.props";
 import { UseFieldConfig } from "./types";
-export declare function useFieldConfig(props: ConditionProps, context: SetupContext): UseFieldConfig;
+export declare function useFieldConfig(props: ConditionProps, context: SetupContext, sourceType?: 'query-solution' | 'filter-bar'): UseFieldConfig;

package/types/condition/src/condition.props.d.ts

@@ -55,7 +55,7 @@ export declare const conditionProps: {
         default: string;
     };
     /**
-    * 控间标签同行展示
+    * 控件标签同行展示
     */
     isControlInline: {
         type: (BooleanConstructor | StringConstructor)[];

package/types/data-view/designer/property-config/use-command-option.d.ts

@@ -36,6 +36,18 @@ export declare function useCommandOption(dataGridPropertyInstance: any): {
                     uniqueFields: string[];
                 };
             };
+            formatter: {
+                title: string;
+                $converter: string;
+                type: string;
+                visible: boolean;
+                description: string;
+                refreshPanelAfterChanged: boolean;
+                editor: {
+                    type: string;
+                    language: string;
+                };
+            };
         };
         setPropertyRelates(changeObject: PropertyChangeObject, data: any): void;
     };

package/types/image/src/property-config/image.property-config.d.ts

@@ -19,11 +19,6 @@ export declare class ImageProperty extends InputBaseProperty {
                 title: string;
                 type: string;
             };
-            src: {
-                description: string;
-                title: string;
-                type: string;
-            };
             width: {
                 description: string;
                 title: string;
@@ -46,6 +41,11 @@ export declare class ImageProperty extends InputBaseProperty {
                     needValid: boolean;
                 };
             };
+            src: {
+                description: string;
+                title: string;
+                type: string;
+            };
             errorSrc: {
                 description: string;
                 title: string;

package/types/locale/src/lib/locale.service.d.ts

@@ -24,13 +24,13 @@ export declare class LocaleService {
      * 获取当前语言
      * @returns
      */
-    static getLocale(): string | import("vue").WritableComputedRef<string, string>;
+    static getLocale(): string;
     /**
      * 默认加载的多语言值，返回中文值
      * @param key
      * @returns
      */
-    static getDefaultLocaleValue(key: string): any;
+    static getDefaultLocaleValue(locale: string, key: string): any;
     static getLocaleValue(key: string, options?: any): any;
     /**
    * 属性空值或者有值但等于默认值，返回默认值多语言属性；有值但不相等返回当前属性自有值

package/types/property-panel/src/composition/entity/input-base-property.d.ts

@@ -129,6 +129,13 @@ export declare class InputBaseProperty extends BaseControlProperty {
         tabId: string;
         tabName: string;
         setPropertyRelates(changeObject: FormPropertyChangeObject, data: any): void;
+    } | {
+        title: string;
+        hideTitle: boolean;
+        properties: {};
+        tabId: string;
+        tabName: string;
+        hide: boolean;
     };
     getExpressionConfig(propertyData: any, type: 'Field' | 'Button' | 'Container', expressionTypes?: string[], associationCallBack?: (rule: Record<string, any>) => void): {
         description: string;

package/types/query-solution/src/designer/query-solution-config/composition/use-util.d.ts

@@ -15,33 +15,13 @@
  */
 import { ControlType } from './types';
 export declare function useUtil(sourceType: 'query-solution' | 'filter-bar'): {
-    getQuerySolutionExtendSchemaProerty: (controlType: ControlType, options?: any) => {
-        readonly: boolean;
-        required: boolean;
-        multiLineLabel: boolean;
-    };
-    getFilterBarionExtendSchemaProerty: (controlType: ControlType, options?: any) => {
-        readonly: boolean;
-        required: boolean;
-        isExtend: boolean;
-    };
     getExtendSchemaProerty: (controlType: ControlType, options?: any) => {
         readonly: boolean;
         required: boolean;
-        multiLineLabel: boolean;
-    } | {
-        readonly: boolean;
-        required: boolean;
-        isExtend: boolean;
     };
     getEditorByType: (type: any, options?: any) => {
         readonly: boolean;
         required: boolean;
-        multiLineLabel: boolean;
-    } | {
-        readonly: boolean;
-        required: boolean;
-        isExtend: boolean;
     };
     getSolutionField: (schemaField: any) => any;
     getControlTypeListByFieldType: (fieldType: any) => {

package/types/section/src/designer/section.design.props.d.ts

@@ -6,6 +6,23 @@ export declare const sectionDesignProps: Record<string, any> & {
         type: StringConstructor;
         default: string;
     };
+    headerTitleHtml: {
+        type: StringConstructor;
+        default: string;
+    };
+    headerHtml: {
+        type: StringConstructor;
+        default: string;
+    };
+    headerContentHtml: {
+        type: StringConstructor;
+        default: string;
+    };
+    toolbarHtml: {
+        type: StringConstructor;
+        default: string;
+    };
 };
 export type SectionDesignProps = ExtractPropTypes<typeof sectionDesignProps>;
 export declare const sectionToolbarPropsResolver: (schemaValue?: Record<string, any>, mergeDefaults?: boolean) => Record<string, any>;
+export declare const propsDesignResolver: (schemaValue?: Record<string, any>, mergeDefaults?: boolean) => Record<string, any>;

package/types/section/src/section.props.d.ts

@@ -30,28 +30,3 @@ export declare const sectionProps: Record<string, any>;
 export type SectionProps = ExtractPropTypes<typeof sectionProps>;
 export declare const propsResolver: (schemaValue?: Record<string, any>, mergeDefaults?: boolean) => Record<string, any>;
 export declare const eventHandlerResolver: import("../../dynamic-resolver").EventHandlerResolver;
-export declare const sectionDesignProps: Record<string, any> & {
-    componentId: {
-        type: StringConstructor;
-        default: string;
-    };
-    headerTitleHtml: {
-        type: StringConstructor;
-        default: string;
-    };
-    headerHtml: {
-        type: StringConstructor;
-        default: string;
-    };
-    headerContentHtml: {
-        type: StringConstructor;
-        default: string;
-    };
-    toolbarHtml: {
-        type: StringConstructor;
-        default: string;
-    };
-};
-export type SectionDesignProps = ExtractPropTypes<typeof sectionDesignProps>;
-export declare const sectionToolbarPropsResolver: (schemaValue?: Record<string, any>, mergeDefaults?: boolean) => Record<string, any>;
-export declare const propsDesignResolver: (schemaValue?: Record<string, any>, mergeDefaults?: boolean) => Record<string, any>;