Browse Source

Merge remote-tracking branch 'origin/master'

es6
imp 5 years ago
parent
commit
03658b220c
  1. BIN
      dist/font/iconfont.eot
  2. BIN
      dist/font/iconfont.ttf
  3. BIN
      dist/font/iconfont.woff
  4. BIN
      dist/font/iconfont.woff2
  5. 2
      src/core/func/function.js
  6. 3
      src/widget/multilayerselecttree/multilayerselecttree.combo.js
  7. 3
      src/widget/multilayersingletree/multilayersingletree.combo.js
  8. 29
      typescript/core/func/function.ts
  9. 32
      typescript/core/func/number.ts
  10. 15
      typescript/index.ts

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

BIN
dist/font/iconfont.woff2 vendored

Binary file not shown.

2
src/core/func/function.js

@ -87,7 +87,7 @@ _.extend(BI, {
}; };
}, },
afterFunc: function (func) { afterFunc: function (sFunc, func) {
var __self = sFunc; var __self = sFunc;
return function () { return function () {
var ret = __self.apply(sFunc, arguments); var ret = __self.apply(sFunc, arguments);

3
src/widget/multilayerselecttree/multilayerselecttree.combo.js

@ -85,7 +85,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
}] }]
}, },
value: o.value, value: o.value,
maxHeight: 400 maxHeight: 400,
minHeight: 240
} }
}; };
}, },

3
src/widget/multilayersingletree/multilayersingletree.combo.js

@ -88,7 +88,8 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
}] }]
}, },
value: o.value, value: o.value,
maxHeight: 400 maxHeight: 400,
minHeight: 240
} }
}; };
}, },

29
typescript/core/func/function.ts

@ -0,0 +1,29 @@
/**
*
* @param array
* @param name
* @return
*/
export declare type _createDistinctName = (array: any[], name: string) => string;
/**
*
* @param items
* @param keyword
* @param param
*/
export declare type _getSearchResult = (items: any, keyword: any, param: string) => {find: any, match: any}
/**
* A执行之前执行方法B
* @param sFunc A
* @param func B
*/
export declare type _beforeFunc = (sFunc: Function, func: Function) => Function;
/**
* A执行之后执行方法B
* @param sFunc A
* @param func B
*/
export declare type _afterFunc = (sFunc: Function, func: Function) => Function;

32
typescript/core/func/number.ts

@ -0,0 +1,32 @@
/**
*
* @param {Number} num
* @param {Number} arg
* @return {Number}
*/
export declare type _add = (num: number, arg: number) => number;
/**
*
* @param {Number} num
* @param {Number} arg
* @return {Number}
*/
export declare type _sub = (num: number, arg: number) => number;
/**
*
* @param {Number} num
* @param {Number} arg
* @return {Number}
*/
export declare type _mul = (num: number, arg: number) => number;
/**
*
* @param {Number} num
* @param {Number} arg
* @return {Number}
*/
export declare type _div = (num: number, arg: number) => number;

15
typescript/index.ts

@ -2,6 +2,8 @@ import { _addI18n, _i18nText } from "./core/i18n";
import { _OB } from "./core/ob"; import { _OB } from "./core/ob";
import { _pushArray, _pushDistinct, _pushDistinctArray} from "./core/func/array"; import { _pushArray, _pushDistinct, _pushDistinctArray} from "./core/func/array";
import {_startWith, _allIndexOf, _appendQuery, _endWith, _getQuery, _perfectStart, _replaceAll} from "./core/func/string"; import {_startWith, _allIndexOf, _appendQuery, _endWith, _getQuery, _perfectStart, _replaceAll} from "./core/func/string";
import {_add, _sub, _mul, _div} from "./core/func/number";
import {_afterFunc, _beforeFunc, _createDistinctName, _getSearchResult} from "./core/func/function";
export declare module BI { export declare module BI {
namespace i18n { namespace i18n {
@ -22,4 +24,17 @@ export declare module BI {
const replaceAll: _replaceAll; const replaceAll: _replaceAll;
const perfectStart: _perfectStart; const perfectStart: _perfectStart;
const allIndexOf: _allIndexOf; const allIndexOf: _allIndexOf;
const add: _add;
const sub: _sub;
const mul: _mul;
const div: _div;
const afterFunc: _afterFunc;
const beforeFunc: _beforeFunc;
namespace Func {
const createDistinctName: _createDistinctName;
const getSearchResult: _getSearchResult;
}
} }

Loading…
Cancel
Save