From 3bfb09859b7fb5c08a18339dc0b5bbc470349049 Mon Sep 17 00:00:00 2001 From: dailer Date: Fri, 11 Feb 2022 09:43:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0JIRA=20:=20=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/combination/combo.ts | 1 + typescript/core/utils/tree.ts | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts index bec2a7b75..249e7e6f2 100644 --- a/typescript/base/combination/combo.ts +++ b/typescript/base/combination/combo.ts @@ -34,6 +34,7 @@ export declare class Combo extends Widget { adjustYOffset?: number; hideChecker?: Function; offsetStyle?: 'left' | 'right' | 'center'; + value?:any; el?: any; popup?: any; comboClass?: string; diff --git a/typescript/core/utils/tree.ts b/typescript/core/utils/tree.ts index c300ad100..643d99cd0 100644 --- a/typescript/core/utils/tree.ts +++ b/typescript/core/utils/tree.ts @@ -43,8 +43,8 @@ export declare class Tree { postOrderTraverse(callback: Function): void; nrPostOrderTraverse(callback: Function): void; static transformToArrayFormat(nodes: T | T[], pId: any, childKey?: string): T[]; - static arrayFormat(nodes: Node | Node[], pId: any): Node[]; - static transformToTreeFormat(sNodes: T[]): Node[]; - static treeFormat(sNodes: Node | Node[]): Node[]; - static traversal(array: Node[], callback: Function, pNode: Node): void; + static arrayFormat(nodes: T | T[], pId: any): T[]; + static transformToTreeFormat(sNodes: T[]): T[]; + static treeFormat(sNodes: T | T[]): T[]; + static traversal(array: T[], callback: (index:number,node:T,pNode?:T)=> boolean | void, pNode?: T): void; } From 784e0fe142ffe215d2fc7b53df124f064627600e Mon Sep 17 00:00:00 2001 From: dailer Date: Fri, 18 Feb 2022 17:16:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20sticky=20?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/core/wrapper/layout/sticky/sticky.horizontal.ts | 5 +++++ typescript/core/wrapper/layout/sticky/sticky.vertical.ts | 5 +++++ typescript/index.ts | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 typescript/core/wrapper/layout/sticky/sticky.horizontal.ts create mode 100644 typescript/core/wrapper/layout/sticky/sticky.vertical.ts diff --git a/typescript/core/wrapper/layout/sticky/sticky.horizontal.ts b/typescript/core/wrapper/layout/sticky/sticky.horizontal.ts new file mode 100644 index 000000000..900be7c45 --- /dev/null +++ b/typescript/core/wrapper/layout/sticky/sticky.horizontal.ts @@ -0,0 +1,5 @@ +import { Layout } from "../../layout"; + +export declare class HorizontalStickyLayout extends Layout { + static xtype: string; +} diff --git a/typescript/core/wrapper/layout/sticky/sticky.vertical.ts b/typescript/core/wrapper/layout/sticky/sticky.vertical.ts new file mode 100644 index 000000000..f5a07b44e --- /dev/null +++ b/typescript/core/wrapper/layout/sticky/sticky.vertical.ts @@ -0,0 +1,5 @@ +import { Layout } from "../../layout"; + +export declare class VerticalStickyLayout extends Layout { + static xtype: string; +} diff --git a/typescript/index.ts b/typescript/index.ts index 619ab72ce..fa18bc8da 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -181,6 +181,8 @@ import { TdLayout } from './core/wrapper/layout/layout.td'; import { MultiLayerSelectLevelTree } from './widget/multilayerselecttree/multilayerselecttree.leveltree'; import { SelectTreeExpander } from './widget/selecttree/selecttree.expander'; import { DownListGroupItem } from "./widget/downlist/item.downlistgroup"; +import { VerticalStickyLayout } from "./core/wrapper/layout/sticky/sticky.vertical"; +import { HorizontalStickyLayout } from "./core/wrapper/layout/sticky/sticky.horizontal"; import './shims-tsx'; @@ -370,6 +372,8 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils { MultiLayerSelectLevelTree: typeof MultiLayerSelectLevelTree; SelectTreeExpander: typeof SelectTreeExpander; DownListGroupItem: typeof DownListGroupItem; + VerticalStickyLayout: typeof VerticalStickyLayout; + HorizontalStickyLayout: typeof HorizontalStickyLayout; } export default { @@ -558,4 +562,6 @@ export { SelectTreeExpander, DirectionPager, DownListGroupItem, + HorizontalStickyLayout, + VerticalStickyLayout, }; From a1afaa95424c939dd1200a61ff8f8a392d22c615 Mon Sep 17 00:00:00 2001 From: dailer Date: Mon, 21 Feb 2022 19:13:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?getSearchResult=E6=96=B9=E6=B3=95=E7=9A=84d?= =?UTF-8?q?eepClone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/func/function.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/func/function.js b/src/core/func/function.js index 05c8fe78a..2d3f9a3e8 100644 --- a/src/core/func/function.js +++ b/src/core/func/function.js @@ -40,16 +40,14 @@ _.extend(BI.Func, { * @param items * @param keyword * @param param 搜索哪个属性 - * @param clone 是否需要deepClone */ - getSearchResult: function (items, keyword, param, clone) { + getSearchResult: function (items, keyword, param) { var isArray = BI.isArray(items); items = isArray ? BI.flatten(items) : items; param || (param = "text"); - BI.isNull(clone) && (clone = true); if (!BI.isKey(keyword)) { return { - find: clone ? BI.deepClone(items) : items, + find: items, match: isArray ? [] : {} }; } @@ -61,7 +59,6 @@ _.extend(BI.Func, { if (BI.isNull(item)) { return; } - clone && (item = BI.deepClone(item)); t = BI.stripEL(item); text = BI.find([t[param], t.text, t.value, t.name, t], function (index, val) { return BI.isNotNull(val); From 9a78e2662cba326a4ba0831a1ef580ff1ddd4810 Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 23 Feb 2022 17:46:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=A0JIRA=20=E4=B8=A5=E6=A0=BC=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/input/file.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/base/single/input/file.js b/src/base/single/input/file.js index e9b1a5a2a..50ec58bdc 100644 --- a/src/base/single/input/file.js +++ b/src/base/single/input/file.js @@ -333,11 +333,10 @@ if (isFunction(handler.onloadstart)) { handler.onloadstart(rpe, {}); } - with (document.body || document.documentElement) { - appendChild(iframe); - appendChild(form); - form.submit(); - } + var d = document.body || document.documentElement; + d.appendChild(iframe); + d.appendChild(form); + form.submit(); return handler; }; @@ -652,7 +651,7 @@ }); }, - setMaxFileLength: function(v) { + setMaxFileLength: function (v) { this.options.maxLength = v; if (this.wrap) { this.wrap.maxLength = v;