Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~dailer/fineui

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2021-5-17 5:00:30 PM */
+/*! time: 2021-5-18 10:10:23 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

dist/core.js

@@ -1,4 +1,4 @@
-/*! time: 2021-5-17 5:00:30 PM */
+/*! time: 2021-5-18 10:10:23 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2021-5-17 5:00:30 PM */
+/*! time: 2021-5-18 10:10:23 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2021-5-17 5:00:30 PM */
+/*! time: 2021-5-18 10:10:23 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

dist/fineui.proxy.js

@@ -1,4 +1,4 @@
-/*! time: 2021-5-17 5:00:30 PM */
+/*! time: 2021-5-18 10:10:23 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2021-5-17 5:00:30 PM */
+/*! time: 2021-5-18 10:10:23 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

dist/lib/base/single/label/abstract.label.d.ts

@@ -1,6 +1,14 @@
 import { Single } from "../single";
 export declare class AbstractLabel extends Single {
     static xtype: string;
+    props: {
+        textAlign: "left" | "center" | "right";
+        whiteSpace: "nowrap" | "normal";
+        textWidth: number | null;
+        textHeight: number | null;
+        highLight: boolean;
+        handler: Function | null;
+    } & Single['props'];
     doRedMark(...args: any[]): void;
     unRedMark(...args: any[]): void;
     doHighLight(...args: any[]): void;

dist/lib/base/single/label/label.d.ts

@@ -1,4 +1,9 @@
 import { AbstractLabel } from "./abstract.label";
 export declare class Label extends AbstractLabel {
+    props: {
+        py: string;
+        keyword: string;
+        text: string;
+    } & AbstractLabel['props'];
     static xtype: string;
 }

dist/lib/base/single/single.d.ts

@@ -4,6 +4,18 @@ interface SingleOpt {
     belowMouse?: boolean;
 }
 export declare class Single extends Widget {
+    props: {
+        readonly: boolean;
+        title: string | (() => string) | null;
+        warningTitle: string | (() => string) | null;
+        tipType: "success" | "warning";
+        value: string | null;
+        /**
+         * title是否跟随鼠标
+         * @default false
+         */
+        belowMouse: boolean;
+    };
     _showToolTip(e: Event, opt?: SingleOpt): void;
     _hideTooltip(): void;
     _clearTimeOut(): void;

dist/lib/core/ob.d.ts

@@ -33,6 +33,10 @@ interface Props {
     [key: string]: any;
 }
 export declare class OB {
+    /**
+     * 用于jsx props声明
+     */
+    __props: Partial<this['props']>;
     props: Props | (<T>(config: T) => Props & T);
     options: this["props"];
     events?: {

dist/lib/shims-tsx.d.ts

@@ -0,0 +1,31 @@
+declare const React: any;
+interface UIProps {
+    width: number;
+    height: number;
+    top: number;
+    left: number;
+    bottom: number;
+    right: number;
+    rgap: number;
+    lgap: number;
+    tgap: number;
+    bgap: number;
+}
+interface ElementClassProps<T> extends UIProps {
+    baseCls: string;
+    cls: string;
+    ref: (ref: T) => void;
+}
+declare namespace JSX {
+    interface IntrinsicElements {
+        [elemName: string]: Partial<UIProps>;
+    }
+    type ElementAttributesProperty = {
+        /**
+         * specify the property name to use
+         */
+        __props: any;
+    };
+    interface IntrinsicClassAttributes<T> extends Partial<ElementClassProps<T>> {
+    }
+}

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-5-17 5:00:30 PM */
+/*! time: 2021-5-18 10:10:23 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

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

typescript/base/single/label/abstract.label.ts

@@ -2,7 +2,16 @@ import { Single } from "../single";
 
 export declare class AbstractLabel extends Single {
     static xtype: string;
-    
+
+    props: {
+        textAlign: "left" | "center" | "right",
+        whiteSpace: "nowrap" | "normal",
+        textWidth: number | null,
+        textHeight: number | null,
+        highLight: boolean,
+        handler: Function | null,
+    } & Single['props']
+
     doRedMark(...args: any[]): void;
 
     unRedMark(...args: any[]): void;

typescript/base/single/label/label.ts

@@ -1,5 +1,11 @@
 import { AbstractLabel } from "./abstract.label";
 
 export declare class Label extends AbstractLabel {
+    props: {
+        py: string;
+        keyword: string;
+        text: string;
+    } & AbstractLabel['props'];
+
     static xtype: string;
 }

typescript/base/single/single.ts

@@ -5,6 +5,20 @@ interface SingleOpt {
 }
 
 export declare class Single extends Widget {
+    props: {
+        readonly: boolean,
+        title: string | (() => string) | null,
+        warningTitle: string | (() => string) | null,
+        tipType: "success" | "warning",
+        value: string | null,
+
+        /**
+         * title是否跟随鼠标
+         * @default false
+         */
+        belowMouse: boolean,
+    }
+
     _showToolTip(e: Event, opt?: SingleOpt): void;
 
     _hideTooltip(): void;

typescript/core/ob.ts

@@ -47,6 +47,12 @@ interface Props {
 }
 
 export declare class OB {
+
+    /**
+     * 用于jsx props声明
+     */
+    __props: Partial<this['props']>;
+
     props: Props | (<T>(config: T) => Props & T);
 
     options: this["props"];

typescript/shims-tsx.ts

@@ -0,0 +1,37 @@
+declare const React: any;
+
+interface UIProps {
+    width: number;
+    height: number;
+    top: number;
+    left: number;
+    bottom: number;
+    right: number;
+    rgap: number;
+    lgap: number;
+    tgap: number;
+    bgap: number;
+}
+
+interface ElementClassProps<T> extends UIProps {
+    baseCls: string;
+    cls: string;
+    ref: (ref: T) => void;
+}
+
+declare namespace JSX {
+    // for undefined
+    interface IntrinsicElements {
+        [elemName: string]: Partial<UIProps>;
+    }
+
+    type ElementAttributesProperty = {
+
+        /**
+         * specify the property name to use
+         */
+        __props: any;
+    };
+
+    interface IntrinsicClassAttributes<T> extends Partial<ElementClassProps<T>> {}
+}