Merge branch 'master' of ssh://code.fineres.com:7999/~teller/fineui

dist/lib/base/combination/combo.d.ts

@@ -11,30 +11,30 @@ export declare class Combo extends Widget {
     static EVENT_BEFORE_HIDEVIEW: string;
     static EVENT_AFTER_HIDEVIEW: string;
     props: {
-        trigger: 'click' | 'hover' | 'click-hover' | '';
-        toggle: boolean;
-        direction: 'top' | 'bottom' | 'left' | 'right' | 'top,left' | 'top,right' | 'bottom,left' | 'bottom,right' | 'right,innerRight' | 'right,innerLeft' | 'innerRight' | 'innerLeft';
-        logic: {
+        trigger?: 'click' | 'hover' | 'click-hover' | '';
+        toggle?: boolean;
+        direction?: 'top' | 'bottom' | 'left' | 'right' | 'top,left' | 'top,right' | 'bottom,left' | 'bottom,right' | 'right,innerRight' | 'right,innerLeft' | 'innerRight' | 'innerLeft';
+        logic?: {
             dynamic: boolean;
         };
-        container: any;
-        isDefaultInit: boolean;
-        destroyWhenHide: boolean;
-        hideWhenAnotherComboOpen: boolean;
-        isNeedAdjustHeight: boolean;
-        isNeedAdjustWidth: boolean;
-        stopEvent: boolean;
-        stopPropagation: boolean;
-        adjustLength: number;
-        adjustXOffset: number;
-        adjustYOffset: number;
-        hideChecker: Function;
-        offsetStyle: 'left' | 'right' | 'center';
-        el: any;
-        popup: any;
-        comboClass: string;
-        hoverClass: string;
-        belowMouse: boolean;
+        container?: any;
+        isDefaultInit?: boolean;
+        destroyWhenHide?: boolean;
+        hideWhenAnotherComboOpen?: boolean;
+        isNeedAdjustHeight?: boolean;
+        isNeedAdjustWidth?: boolean;
+        stopEvent?: boolean;
+        stopPropagation?: boolean;
+        adjustLength?: number;
+        adjustXOffset?: number;
+        adjustYOffset?: number;
+        hideChecker?: Function;
+        offsetStyle?: 'left' | 'right' | 'center';
+        el?: any;
+        popup?: any;
+        comboClass?: string;
+        hoverClass?: string;
+        belowMouse?: boolean;
     };
     resetListHeight(h: number): void;
     resetListWidth(w: number): void;

dist/lib/widget/multiselect/multiselect.insert.combo.d.ts

@@ -10,6 +10,15 @@ export declare class MultiSelectInsertCombo extends Single {
     static EVENT_ADD_ITEM: string;
     static REQ_GET_DATA_LENGTH: 1;
     static REQ_GET_ALL_DATA: -1;
+    props: {
+        itemsCreator?: Function;
+        valueFormatter?: Function;
+        itemHeight?: number;
+        allowEdit?: boolean;
+        text?: string;
+        watermark?: string;
+        container?: any;
+    } & Single['props'];
     _itemsCreator4Trigger(op: any, callback: Function): void;
     _addItem(assertShowValue: () => void, matched: boolean): void;
     _stopEditing(): void;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20210830145216",
+  "version": "2.0.20210830182122",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

typescript/base/combination/combo.ts

@@ -13,30 +13,30 @@ export declare class Combo extends Widget {
     static EVENT_AFTER_HIDEVIEW: string;
 
     props: {
-        trigger: 'click' | 'hover' | 'click-hover' | '';
-        toggle: boolean;
-        direction: 'top' | 'bottom' | 'left' | 'right' | 'top,left' | 'top,right' | 'bottom,left' | 'bottom,right' | 'right,innerRight' | 'right,innerLeft' | 'innerRight' | 'innerLeft';
-        logic: {
+        trigger?: 'click' | 'hover' | 'click-hover' | '';
+        toggle?: boolean;
+        direction?: 'top' | 'bottom' | 'left' | 'right' | 'top,left' | 'top,right' | 'bottom,left' | 'bottom,right' | 'right,innerRight' | 'right,innerLeft' | 'innerRight' | 'innerLeft';
+        logic?: {
             dynamic: boolean;
         },
-        container: any; // popupview放置的容器，默认为this.element
-        isDefaultInit: boolean;
-        destroyWhenHide: boolean;
-        hideWhenAnotherComboOpen: boolean;
-        isNeedAdjustHeight: boolean; // 是否需要高度调整
-        isNeedAdjustWidth: boolean;
-        stopEvent: boolean;
-        stopPropagation: boolean;
-        adjustLength: number; // 调整的距离
-        adjustXOffset: number;
-        adjustYOffset: number;
-        hideChecker: Function;
-        offsetStyle: 'left' | 'right' | 'center';
-        el: any;
-        popup: any;
-        comboClass: string;
-        hoverClass: string;
-        belowMouse: boolean;
+        container?: any; // popupview放置的容器，默认为this.element
+        isDefaultInit?: boolean;
+        destroyWhenHide?: boolean;
+        hideWhenAnotherComboOpen?: boolean;
+        isNeedAdjustHeight?: boolean; // 是否需要高度调整
+        isNeedAdjustWidth?: boolean;
+        stopEvent?: boolean;
+        stopPropagation?: boolean;
+        adjustLength?: number; // 调整的距离
+        adjustXOffset?: number;
+        adjustYOffset?: number;
+        hideChecker?: Function;
+        offsetStyle?: 'left' | 'right' | 'center';
+        el?: any;
+        popup?: any;
+        comboClass?: string;
+        hoverClass?: string;
+        belowMouse?: boolean;
     }
     resetListHeight(h: number): void;
 

typescript/widget/multiselect/multiselect.insert.combo.ts

@@ -12,6 +12,16 @@ export declare class MultiSelectInsertCombo extends Single {
     static REQ_GET_DATA_LENGTH: 1;
     static REQ_GET_ALL_DATA: -1;
 
+    props: {
+        itemsCreator?: Function;
+        valueFormatter?: Function;
+        itemHeight?: number;
+        allowEdit?: boolean;
+        text?: string;
+        watermark?: string;
+        container?: any;
+    } & Single['props'];
+
     _itemsCreator4Trigger(op: any, callback: Function): void;
 
     _addItem(assertShowValue: () => void, matched: boolean): void;