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

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

@@ -1,12 +1,13 @@
 import { _Widget } from "../../core/widget";
 export interface _Combo extends _Widget {
-    populate(items: any): void;
+    populate(...args: any[]): void;
     _setEnable(v: boolean): void;
     isViewVisible(): boolean;
     showView(e?: any): void;
     hideView(): void;
     getView(): any;
     getPopupPosition(): any;
+    adjustHeight(e?: MouseEvent): void;
     toggle(): void;
 }
 export interface _ComboStatic {

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

@@ -1,7 +1,7 @@
 import { _BasicButton } from "./button.basic";
 export interface _NodeButton extends _BasicButton {
-    isOpened: () => void;
-    setOpened: (b: boolean) => void;
-    triggerCollapse: () => void;
-    triggerExpand: () => void;
+    isOpened(): void;
+    setOpened(b: boolean): void;
+    triggerCollapse(): void;
+    triggerExpand(): void;
 }

dist/lib/core/base.d.ts

@@ -45,7 +45,7 @@ export interface _base {
     lastKey: (obj: object) => string;
     firstObject: (obj: object) => any;
     lastObject: (obj: object) => any;
-    concat: (obj1: any, obj2: any) => any;
+    concat: (obj1: any, obj2: any, ...args: any[]) => any;
     backEach: (obj: any, predicate: Function, context?: any) => boolean;
     backAny: (obj: any, predicate: Function, context?: any) => boolean;
     backEvery: (obj: any, predicate: Function, context?: any) => boolean;

dist/lib/core/decorator/decorator.d.ts

@@ -34,6 +34,27 @@ export declare function store<T>(Model: Constructor<T> & {
         _store(): any;
     };
 } & U;
+/**
+ * 注册mixin
+ * ie8下不能使用
+ */
+export declare function mixin<T>(): (Target: Constructor<T> & {
+    xtype: string;
+}) => void;
+/**
+ * 类注册mixins属性
+ * ie8下不能使用
+ * @param Mixins
+ */
+export declare function mixins(...Mixins: ({
+    new (...args: any[]): {};
+} & {
+    xtype: string;
+})[]): <U extends new (...args: any[]) => {}>(constructor: U) => {
+    new (...args: any[]): {
+        mixins: string[];
+    };
+} & U;
 /**
  * Model基类
  */

dist/lib/core/inject.d.ts

@@ -0,0 +1,40 @@
+declare type _module = (xtype: string, cls: any) => void;
+declare type _constant = (xtype: string, cls: any) => void;
+declare type _model = (xtype: string, cls: any) => void;
+declare type _store = (xtype: string, cls: any) => void;
+declare type _service = (xtype: string, cls: any) => void;
+declare type _provider = (xtype: string, cls: any) => void;
+interface _modules {
+    getModule: (type: string) => any;
+    getAllModules: () => any;
+}
+interface _constants {
+    getConstant: (type: string) => any;
+}
+interface _models {
+    getModel: (type: string, options?: any) => any;
+}
+interface _stores {
+    getStore: (type: string, options?: any) => any;
+}
+interface _providers {
+    getProvider: (type: string, options?: any) => any;
+}
+interface _services {
+    getService: (type: string, options?: any) => any;
+}
+export declare type _inject = {
+    module: _module;
+    constant: _constant;
+    model: _model;
+    store: _store;
+    provider: _provider;
+    service: _service;
+    Modules: _modules;
+    Constants: _constants;
+    Models: _models;
+    Stores: _stores;
+    Providers: _providers;
+    Services: _services;
+};
+export {};

dist/lib/core/ob.d.ts

@@ -14,7 +14,7 @@ export interface _OB {
     _getEvents(): {
         [eventName: string]: Function[];
     };
-    on(eventName: string, fn: Function): void;
+    on(eventName: string, fn: Function): Function;
     once(eventName: string, fn: Function): void;
     un(eName: string, fn: Function): void;
     _initRef(): void;

dist/lib/core/plugin.d.ts

@@ -0,0 +1,12 @@
+import { _Widget } from "./widget";
+declare type configWidgetFn = (options: object) => object;
+declare type configObjectFn = (widget: _Widget) => void;
+export declare type _config = (widgetFunction: configWidgetFn | configWidgetFn[], objectFunction: configObjectFn | configObjectFn[]) => void;
+export declare type _configWidget = (shorcut: string, widgetFunction: configWidgetFn) => void;
+export declare type _registerObject = (shorcut: string, objectFunction: configObjectFn) => void;
+export declare type _Plugin = {
+    config: _config;
+    configWidget: _configWidget;
+    registerObject: _registerObject;
+};
+export {};

dist/lib/index.d.ts

@@ -33,8 +33,10 @@ import { _RedMarkBehavior } from "./core/behavior/behavior.redmark";
 import * as decorator from "./core/decorator/decorator";
 import { _func } from "./core/func";
 import { _i18n } from "./core/i18n";
+import { _Plugin } from "./core/plugin";
 import { _OB } from "./core/ob";
 import { _Widget, _WidgetStatic } from "./core/widget";
+import { _inject } from "./core/inject";
 import { _Layout } from "./core/wrapper/layout";
 import { _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
 import { _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
@@ -44,9 +46,11 @@ declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
     readonly prototype: T;
+    readonly xtype: string;
 };
-export interface BI extends _func, _i18n, _base {
+export interface BI extends _func, _i18n, _base, _inject {
     OB: ClassConstructor<_OB>;
+    Plugin: _Plugin;
     Widget: ClassConstructor<_Widget> & _WidgetStatic;
     Single: ClassConstructor<_Single>;
     BasicButton: ClassConstructor<_BasicButton> & _BasicButtonStatic;

lib/postbuild/postbuild.js

@@ -34,9 +34,12 @@ deleteList.forEach(filename => {
     });
 });
 
-const demoJs = resolve(dest, './demo.js');
-
-const content = `${readFileSync(demoJs, { encoding: 'utf8' })}
-//# sourceMappingURL=./demo.js.map`;
+const fileList = ['demo.js', 'fineui.js', '2.0/fineui.js'];
+fileList.forEach(filename => {
+    const sourcefile = resolve(dest, `./${filename}`);
+    
+    const content = `${readFileSync(sourcefile, { encoding: 'utf8' })}
+//# sourceMappingURL=./${filename}.map`;
 
-writeFileSync(demoJs, content);
+    writeFileSync(sourcefile, content);
+});

lib/postpublish/postpublish.js

@@ -0,0 +1,15 @@
+const { resolve } = require("path");
+const { execSync } = require("child_process");
+const { writeFileSync } = require("fs");
+
+const packageJSON = require("../../package.json");
+
+packageJSON.name = "fineui";
+
+packageJSON.publishConfig.registry = 'https://registry.npmjs.org';
+
+writeFileSync(resolve(__dirname, "../../package.json"), JSON.stringify(packageJSON, null, 2));
+
+execSync('git add dist/');
+execSync('git add package.json');
+execSync(`git diff-index --quiet HEAD || git commit -am "auto upgrade version to ${packageJSON.version}"`);

lib/prepublish/prepublish.js

@@ -22,4 +22,8 @@ versionChars[versionChars.length - 1] = version;
 
 packageJSON.version = versionChars.join(".");
 
+packageJSON.publishConfig.registry = 'https://npm.fineres.com/';
+
+packageJSON.name = "@fui/core";
+
 writeFileSync(resolve(__dirname, "../../package.json"), JSON.stringify(packageJSON, null, 2));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.0",
+  "version": "2.0.20200908154118",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",
@@ -60,8 +60,9 @@
     "postbuild": "node ./lib/postbuild/postbuild.js",
     "test": "karma start",
     "dev": "npm run webpack:dev",
-    "prepublishOnly": "npm run build && node ./lib/prepublish/prepublish.js",
-    "postpublish": "cnpm sync fineui"
+    "prepublishToPrivate": "npm run build && node ./lib/prepublish/prepublish.js",
+    "publishToPrivate": "npm publish",
+    "postpublishToPrivate": " node ./lib/postpublish/postpublish.js"
   },
   "repository": {
     "type": "git",
@@ -77,4 +78,4 @@
   },
   "author": "fanruan",
   "license": "MIT"
-}
+}

publish.bat

@@ -1 +1 @@
-npm publish
+npm run publishToPrivate

publish.sh

@@ -1 +1 @@
-npm publish
+npm run publishToPrivate

src/base/single/button/buttons/button.js

@@ -74,6 +74,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
                 vgap: o.vgap,
                 items: [{
                     type: "bi.horizontal",
+                    columnSize: ["", "fill"],
                     items: [this.icon, this.text]
                 }]
             });

src/component/treevaluechooser/abstract.treevaluechooser.js

@@ -749,14 +749,16 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
 
                 return false;
             }
-            if (node.value === parentValues[index]) {
+            if (node.value === parentValues[index] && node.getParent() === currentParent) {
                 index++;
                 currentParent = node;
+
                 return;
             }
 
             return true;
         });
+        
         return findParentNode;
     },
 

yarn.lock

@@ -149,7 +149,7 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
@@ -286,6 +286,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
+"@babel/plugin-proposal-optional-chaining@7.9.0":
+  version "7.9.0"
+  resolved "https://registry.npm.taobao.org/@babel/plugin-proposal-optional-chaining/download/@babel/plugin-proposal-optional-chaining-7.9.0.tgz?cache=0&sync_timestamp=1596145014102&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-proposal-optional-chaining%2Fdownload%2F%40babel%2Fplugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
+  integrity sha1-MdsWsVTDnWuKZFKSRyuYOUwpKlg=
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
@@ -329,6 +337,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-optional-chaining@^7.8.0":
+  version "7.8.3"
+  resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-chaining/download/@babel/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha1-T2nCq5UWfgGAzVM2YT+MV4j31Io=
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-typescript@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz#2f55e770d3501e83af217d782cb7517d7bb34d25"
@@ -739,6 +754,22 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@fui/babel-preset-fineui@^1.0.0":
+  version "1.0.2"
+  resolved "https://npm.fineres.com/@fui%2fbabel-preset-fineui/-/babel-preset-fineui-1.0.2.tgz#403adc4bc51a13443da9157c96887ebac1477013"
+  integrity sha512-cOJL8T8DwGNJZeE97wHlTnMWjUi9X3uXYd9MnAyDhcWWti9Sjd+95Sdg0C210d0s/LEOpRFCQJENd251NWcoIA==
+  dependencies:
+    "@babel/core" "7.4.5"
+    "@babel/plugin-proposal-class-properties" "7.5.0"
+    "@babel/plugin-proposal-decorators" "7.4.4"
+    "@babel/plugin-proposal-optional-chaining" "7.9.0"
+    "@babel/plugin-transform-block-scoping" "7.5.5"
+    "@babel/plugin-transform-classes" "7.5.5"
+    "@babel/plugin-transform-modules-commonjs" "7.6.0"
+    "@babel/plugin-transform-proto-to-assign" "7.5.5"
+    "@babel/preset-env" "7.4.5"
+    "@babel/preset-typescript" "7.3.3"
+
 "@fui/eslint-plugin@1.0.7":
   version "1.0.7"
   resolved "https://npm.fineres.com/@fui%2feslint-plugin/-/eslint-plugin-1.0.7.tgz#59193b087bc092cdaff7da5f2851d0bf72308831"
@@ -2937,7 +2968,7 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -5063,7 +5094,7 @@ import-local@2.0.0, import-local@^2.0.0:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -6127,11 +6158,6 @@ lockfile@^1.0.4:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -6140,33 +6166,11 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
 lodash._root@~3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
@@ -6182,11 +6186,6 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"