From aa987b66da5ea0367f37e1db8df530a63cb2ae6b Mon Sep 17 00:00:00 2001 From: dailer Date: Wed, 28 Jun 2023 11:15:12 +0800 Subject: [PATCH 01/13] =?UTF-8?q?BI-128988=20fix:=20=E3=80=90=E6=9D=A5?= =?UTF-8?q?=E6=BA=90PT=E9=A1=B9=E7=9B=AE=E3=80=91=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=96=87=E6=9C=AC=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8B=BE=E9=80=89=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=20-=20=E6=8F=90=E4=BA=A4final?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/loader.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/widget/multiselect/loader.js b/src/widget/multiselect/loader.js index 3ea50472f..0101d8908 100644 --- a/src/widget/multiselect/loader.js +++ b/src/widget/multiselect/loader.js @@ -158,6 +158,11 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, { this.next.setEnd(); } } + // cacheGroup渲染的是全量的,如果这次加载更多add的items是从cacheItems里面拿的,那不用再add了 + if (this.cachItems.length > 0) { + this.button_group.addItems(...arguments); + return; + } var renderEngine = BI.Widget._renderEngine; BI.Widget.registerRenderEngine(BI.Element.renderEngine); this.cachGroup.addItems.apply(this.cachGroup, arguments); @@ -183,13 +188,6 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, { this.times = 1; this.count = 0; this.count += items.length; - if (BI.isObject(this.next)) { - if (this.hasNext()) { - this.next.setLoaded(); - } else { - this.next.invisible(); - } - } return true; }, @@ -205,6 +203,15 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, { this.cachGroup.populate.call(this.cachGroup, items, keyword); BI.Widget.registerRenderEngine(renderEngine); this.button_group.populate.call(this.button_group, items.slice(0, firstItemsCount), keyword); + + // hasNext依赖的是cacheItems计算,所以从_populate挪到populate里面 + if (BI.isObject(this.next)) { + if (this.hasNext()) { + this.next.setLoaded(); + } else { + this.next.invisible(); + } + } } }, From 3fdcc379fad02d45d7e76337df40087fd1fcb47e Mon Sep 17 00:00:00 2001 From: jimmychai Date: Fri, 7 Jul 2023 21:45:13 +0800 Subject: [PATCH 02/13] =?UTF-8?q?BI-128881=20fix:=20=E6=B7=B1=E8=89=B2?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=97=A0=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=99=E5=87=A0=E4=B8=AA=E5=AD=97=E6=B2=A1=E6=9C=89=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/utils/list-item.less | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/less/core/utils/list-item.less b/src/less/core/utils/list-item.less index c084ac275..ce5b6abb1 100644 --- a/src/less/core/utils/list-item.less +++ b/src/less/core/utils/list-item.less @@ -93,6 +93,25 @@ } } +.bi-theme-dark { + .bi-list-item-simple { + &.disabled { + &, &:hover, &:active { + color: @color-bi-text-disabled-theme-dark !important; + & .bi-input { + color: @color-bi-text-disabled-theme-dark !important; + } + & .bi-textarea { + color: @color-bi-text-disabled-theme-dark !important; + } + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } + } + } + } +} + // hover的时候文字变黑 // active的时候文字高亮 .bi-list-item-effect { From 1102e4c5716690aa3add593de24f8894591a3fc2 Mon Sep 17 00:00:00 2001 From: dailer Date: Fri, 7 Jul 2023 14:19:59 +0800 Subject: [PATCH 03/13] =?UTF-8?q?BI-128437=20=20=E6=8F=90=E4=BA=A4Final=20?= =?UTF-8?q?fix:=20=E3=80=90=E6=9D=A5=E6=BA=90PT=E9=A1=B9=E7=9B=AE=E3=80=91?= =?UTF-8?q?BI=E7=BB=91=E5=AE=9A=E5=8F=82=E6=95=B0=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/loader.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/widget/multiselect/loader.js b/src/widget/multiselect/loader.js index 0101d8908..3649ce8ad 100644 --- a/src/widget/multiselect/loader.js +++ b/src/widget/multiselect/loader.js @@ -51,7 +51,8 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, { this.next.setLoading(); if (this.cachItems && this.cachItems.length > 0) { this.next.setLoaded(); - this.addItems(this.cachItems.slice(0, 100)); + const items = this._composeItems(this.cachItems.slice(0, 100)); + this.addItems(items); this.cachItems = this.cachItems.slice(100); return; } @@ -170,6 +171,17 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, { this.button_group.addItems.apply(this.button_group, arguments); }, + + _composeItems: function (items) { + const cacheValue = this.cachGroup.getValue(); + return items.map(item => { + return { + ...item, + selected: cacheValue.includes(item.value || item.id) + }; + }); + }, + _populate: function (items) { var self = this, o = this.options; if (arguments.length === 0 && (BI.isFunction(o.itemsCreator))) { From 42eea2a91ad41efc196eb083d662abdf2be86d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=2EKing-=E7=8E=8B=E5=87=AF=E5=A3=AE?= Date: Fri, 14 Jul 2023 11:28:03 +0800 Subject: [PATCH 04/13] =?UTF-8?q?REPORT-97526=20feat:=E7=BB=99=E5=B8=A6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E5=A4=9A=E9=80=89=E5=A4=9A=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=E6=A0=91=E5=A2=9E=E5=8A=A0searcherPaneAutoShrink,sear?= =?UTF-8?q?cherPaneIsSelectedAny=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/ztree/parttree.js | 13 +++++++++++-- .../treevaluechooser/abstract.treevaluechooser.js | 2 +- .../treevaluechooser/pane.treevaluechooser.js | 9 ++++++++- .../src/widget/multiselecttree/multiselecttree.js | 2 ++ .../multitree/trigger/multi.tree.search.pane.js | 6 +++++- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/packages/fineui/src/case/ztree/parttree.js b/packages/fineui/src/case/ztree/parttree.js index 2a93dd7bb..266e0d6b9 100644 --- a/packages/fineui/src/case/ztree/parttree.js +++ b/packages/fineui/src/case/ztree/parttree.js @@ -16,6 +16,12 @@ export class PartTree extends AsyncTree { static EVENT_CLICK_TREE_NODE = "EVENT_CLICK_TREE_NODE"; + _defaultConfig() { + return extend(super._defaultConfig(...arguments), { + isSelectedAny: true, //是否返回所有被checked的结点(包括被checked的结点的子结点) + }); + } + constructor(...args) { super(...args); this.seMethos = super._selectTreeNode; @@ -55,8 +61,11 @@ export class PartTree extends AsyncTree { const name = this._getNodeValue(treeNode); this.fireEvent(PartTree.EVENT_CLICK_TREE_NODE); if (treeNode.checked === true) { - this.options.paras.selectedValues = this._getUnionValue(); - // this._buildTree(self.options.paras.selectedValues, concat(parentValues, name)); + if (this.options.isSelectedAny) { + this.options.paras.selectedValues = this._getUnionValue(); //获取所有被selected的结点 + } else { + this._addTreeNode(this.options.paras.selectedValues, parentValues, name, {});//给selectedValues增加被click的结点（不包含该节点的子结点） + } o.itemsCreator( extend({}, o.paras, { type: TreeView.REQ_TYPE_ADJUST_DATA, diff --git a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js index 87e23cb84..61323f27c 100644 --- a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js +++ b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js @@ -389,7 +389,7 @@ export class AbstractTreeValueChooser extends Widget { each(selected, (k, v) => { const p = clone(parents); p.push(k); - if (!dealWithSelectedValues(selected[k], p)) { + if (!dealWithSelectedValues(selected[k], p) || op.searcherPaneAutoShrink === false) { each(selected[k], (nk, nv) => { const t = clone(p); t.push(nk); diff --git a/packages/fineui/src/component/treevaluechooser/pane.treevaluechooser.js b/packages/fineui/src/component/treevaluechooser/pane.treevaluechooser.js index aad0bf08d..ff5aad90f 100644 --- a/packages/fineui/src/component/treevaluechooser/pane.treevaluechooser.js +++ b/packages/fineui/src/component/treevaluechooser/pane.treevaluechooser.js @@ -15,6 +15,9 @@ export class TreeValueChooserPane extends AbstractTreeValueChooser { items: null, itemsCreator: emptyFn, showLine: true, + //searcherPaneAutoShrink和searcherPaneIsSelectedAny同时为false时，返回值和非搜索状态下的树逻辑一致 + searcherPaneAutoShrink: true,//其搜索树是否会判别子结点全选则取父结点的值 + searcherPaneIsSelectedAny: true, //其搜索树是否返回所有被checked的结点(包括被checked的结点的子结点) }); } @@ -25,7 +28,11 @@ export class TreeValueChooserPane extends AbstractTreeValueChooser { type: o.hideSearch ? MultiSelectTreePopup.xtype : MultiSelectTree.xtype, element: this, showLine: o.showLine, - itemsCreator: bind(this._itemsCreator, this), + searcherPaneIsSelectedAny: o.hideSearch || o.searcherPaneIsSelectedAny, + itemsCreator: (options, callback) => { + options.searcherPaneAutoShrink = o.hideSearch || o.searcherPaneAutoShrink; + this._itemsCreator.call(this, options, callback); + }, }); this.pane.on(MultiSelectTree.EVENT_CHANGE, () => { diff --git a/packages/fineui/src/widget/multiselecttree/multiselecttree.js b/packages/fineui/src/widget/multiselecttree/multiselecttree.js index 9493f444b..1047a9601 100644 --- a/packages/fineui/src/widget/multiselecttree/multiselecttree.js +++ b/packages/fineui/src/widget/multiselecttree/multiselecttree.js @@ -16,6 +16,7 @@ export class MultiSelectTree extends Single { baseCls: "bi-multi-select-tree", itemsCreator: emptyFn, simple: false, + searcherPaneIsSelectedAny: true, }); } @@ -44,6 +45,7 @@ export class MultiSelectTree extends Single { this.searcherPane = createWidget({ type: MultiTreeSearchPane.xtype, cls: "bi-border-left bi-border-right bi-border-bottom", + isSelectedAny: o.searcherPaneIsSelectedAny, keywordGetter() { return self.searcher.getKeyword(); }, diff --git a/packages/fineui/src/widget/multitree/trigger/multi.tree.search.pane.js b/packages/fineui/src/widget/multitree/trigger/multi.tree.search.pane.js index 63de74987..01bb92499 100644 --- a/packages/fineui/src/widget/multitree/trigger/multi.tree.search.pane.js +++ b/packages/fineui/src/widget/multitree/trigger/multi.tree.search.pane.js @@ -6,7 +6,10 @@ import { TreeView, PartTree } from "@/case"; export class MultiTreeSearchPane extends Pane { static xtype = "bi.multi_tree_search_pane"; - props = { baseCls: "bi-multi-tree-search-pane bi-card" }; + props = { + baseCls: "bi-multi-tree-search-pane bi-card", + isSelectedAny: true, + }; static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CLICK_CONFIRM = "EVENT_CLICK_CONFIRM"; @@ -22,6 +25,7 @@ export class MultiTreeSearchPane extends Pane { type: PartTree.xtype, element: this, tipText: i18nText("BI-No_Select"), + isSelectedAny: opts.isSelectedAny, itemsCreator(op, callback) { op.keyword = opts.keywordGetter(); opts.itemsCreator(op, callback); From 87745691fe3486d4c1d8b60527bb7e81fdf15113 Mon Sep 17 00:00:00 2001 From: dailer Date: Mon, 17 Jul 2023 17:29:05 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=97=A0JRIA=20Workers=E6=8C=82=E8=BD=BD?= =?UTF-8?q?=E5=88=B0BI=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/typescript/bundle.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/fineui/typescript/bundle.ts b/packages/fineui/typescript/bundle.ts index fb4e34400..174fa3e6e 100644 --- a/packages/fineui/typescript/bundle.ts +++ b/packages/fineui/typescript/bundle.ts @@ -1,3 +1,5 @@ -// import fineui from "./index"; - -// BI.extend(BI, fineui); +import { Workers } from "./core/worker/workers"; +// 仅Workers是ts实现的代码,所以要挂载到BI上 +BI?.extend(BI, { + Workers: Workers +}); \ No newline at end of file From e3ecaac8b90bf46a025a7b42d3fdc25ab2074381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=2EKing-=E7=8E=8B=E5=87=AF=E5=A3=AE?= Date: Tue, 18 Jul 2023 16:21:12 +0800 Subject: [PATCH 06/13] =?UTF-8?q?REPORT-100874=20fix:=E3=80=90=E4=B8=93?= =?UTF-8?q?=E9=A2=98=E3=80=91=E3=80=90=E6=9D=83=E9=99=90=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E3=80=91=E6=9D=83=E9=99=90=E5=A4=8D=E7=94=A8=E6=97=B6=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=8A=B6=E6=80=81=E4=B8=8B=E9=80=89=E4=B8=AD=E9=83=A8?= =?UTF-8?q?=E9=97=A8=EF=BC=8C=E6=90=9C=E7=B4=A2=E7=8A=B6=E6=80=81=E4=B8=8B?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B6=E4=B8=AD1=E4=B8=AA=E8=81=8C?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=8F=96=E6=B6=88=E6=90=9C=E7=B4=A2=E5=90=8E?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E8=81=8C=E5=8A=A1=E8=BF=98=E6=98=AF=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abstract.treevaluechooser.js | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js index 61323f27c..90bf612d4 100644 --- a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js +++ b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js @@ -174,6 +174,7 @@ export class AbstractTreeValueChooser extends Widget { } _reqSelectedTreeNode(op, callback) { + const self = this; const selectedValues = deepClone(op.selectedValues); const notSelectedValue = op.notSelectedValue || {}; const keyword = op.keyword || ""; @@ -188,7 +189,7 @@ export class AbstractTreeValueChooser extends Widget { dealWithSelectedValues(selectedValues); callback(selectedValues); - const dealWithSelectedValues = selectedValues => { + function dealWithSelectedValues(selectedValues) { let p = parentValues.concat(notSelectedValue); // 存储的值中存在这个值就把它删掉 // 例如选中了中国-江苏-南京， 取消中国或江苏或南京 @@ -197,18 +198,18 @@ export class AbstractTreeValueChooser extends Widget { // 如果搜索的值在父亲链中 if (isSearchValueInParent(p)) { // 例如选中了 中国-江苏， 搜索江苏， 取消江苏(干掉了江苏) - this._deleteNode(selectedValues, p); + self._deleteNode(selectedValues, p); } else { const searched = []; // 要找到所有以notSelectedValue为叶子节点的链路 const find = search(parentValues, notSelectedValue, [], searched); if (find && isNotEmptyArray(searched)) { each(searched, (i, arr) => { - const node = this._getNode(selectedValues, arr); + const node = self._getNode(selectedValues, arr); if (node) { // 例如选中了 中国-江苏， 搜索江苏， 取消中国（实际上只想删除中国-江苏，因为搜的是江苏） // 例如选中了 中国-江苏-南京，搜索南京，取消中国（实际上只想删除中国-江苏-南京，因为搜的是南京） - this._deleteNode(selectedValues, arr); + self._deleteNode(selectedValues, arr); } else { // 例如选中了 中国-江苏，搜索南京，取消中国（实际上只想删除中国-江苏-南京，因为搜的是南京） expandSelectedValue(selectedValues, arr, last(arr)); @@ -239,14 +240,14 @@ export class AbstractTreeValueChooser extends Widget { // 添加去掉搜索的结果集 if (result.length > 0) { each(result, (i, strs) => { - this._buildTree(selectedValues, strs); + self._buildTree(selectedValues, strs); }); } } } }; - const expandSelectedValue = (selectedValues, parents, notSelectedValue) => { + function expandSelectedValue(selectedValues, parents, notSelectedValue) { let next = selectedValues; const childrenCount = []; const path = []; @@ -259,7 +260,7 @@ export class AbstractTreeValueChooser extends Widget { } if (isEmpty(next)) { const split = parents.slice(0, i); - const expanded = this._getChildren(split); + const expanded = self._getChildren(split); path.push(split); childrenCount.push(expanded.length); // 如果只有一个值且取消的就是这个值 @@ -270,7 +271,7 @@ export class AbstractTreeValueChooser extends Widget { ) { for (let j = childrenCount.length - 1; j >= 0; j--) { if (childrenCount[j] === 1) { - this._deleteNode(selectedValues, path[j]); + self._deleteNode(selectedValues, path[j]); } else { break; } @@ -295,16 +296,16 @@ export class AbstractTreeValueChooser extends Widget { }); }; - const search = (parents, current, result, searched) => { + function search(parents, current, result, searched) { const newParents = clone(parents); newParents.push(current); - if (this._isMatch(parents, current, keyword)) { + if (self._isMatch(parents, current, keyword)) { searched && searched.push(newParents); return true; } - const children = this._getChildren(newParents); + const children = self._getChildren(newParents); const notSearch = []; let can = false; @@ -327,9 +328,9 @@ export class AbstractTreeValueChooser extends Widget { return can; }; - const isSearchValueInParent = parentValues => { + function isSearchValueInParent(parentValues) { for (let i = 0, len = parentValues.length; i < len; i++) { - if (this._isMatch(parentValues.slice(0, i), parentValues[i], keyword)) { + if (self._isMatch(parentValues.slice(0, i), parentValues[i], keyword)) { return true; } } From 11b8baa5c6c3502113d85b2238a75dd558397099 Mon Sep 17 00:00:00 2001 From: dailer Date: Tue, 18 Jul 2023 17:07:23 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=97=A0JIRA=20$=E5=92=8CJquery=E7=9A=84?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=97=AE=E9=A2=98=E5=85=BC=E5=AE=B9FR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/bundle.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/bundle.js b/packages/fineui/src/bundle.js index 7d9f259d1..a7e875954 100644 --- a/packages/fineui/src/bundle.js +++ b/packages/fineui/src/bundle.js @@ -5,12 +5,15 @@ import {_defineVarProperties} from "@/core/constant/writable.var"; _global.BI = _global.BI || {}; +// for fr, 已经有的就不对外暴露了. +// 要知道BI只有`BI.$`, 挂在全局对象上的只是为了兼容而已 +if (!_global.$ && !_global.jQuery) { + _global.jQuery = _global.$ = fuiExport.$; +} Object.assign(_global, { Fix: fuiExport.Fix, _: fuiExport._, - $: fuiExport.$, - jQuery: fuiExport.$, }); Object.assign(_global.BI, fuiExport, injectFn); From 2ead0ec7005e51eb5a9c30d1d22576f421243f3e Mon Sep 17 00:00:00 2001 From: dailer Date: Thu, 20 Jul 2023 16:33:26 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=97=A0JIRA=20=20report=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=94=A8=E7=9A=84worker=E9=80=82=E9=85=8D+=E5=88=A0?= =?UTF-8?q?=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/worker.js | 36 ++++++++++++++++++++++++++ packages/fineui/webpack/attachments.js | 6 ++--- 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 packages/fineui/src/worker.js diff --git a/packages/fineui/src/worker.js b/packages/fineui/src/worker.js new file mode 100644 index 000000000..2956dde18 --- /dev/null +++ b/packages/fineui/src/worker.js @@ -0,0 +1,36 @@ +// sideEffects +import "./core/system"; + +import * as _core from "./core"; +import * as _base from "./base"; +import * as _fix from "./fix"; +import * as _router from "./router"; + +export * as Popper from "@popperjs/core"; + +import * as D from "@/core/decorator"; +import { Fix } from "./fix"; + +const Decorators = { ...D, Model: Fix.Model }; + +const fuiExport = { + ..._core, + ..._base, + ..._fix, + ..._router +}; + +import * as injectFn from "@/core/5.inject"; +import { _global } from "@/core/0.foundation"; +import { _defineVarProperties } from "@/core/constant/writable.var"; + +_global.BI = _global.BI || {}; + +Object.assign(_global, { + Fix: fuiExport.Fix, + _: fuiExport._, +}); + +Object.assign(_global.BI, fuiExport, injectFn, { Decorators, }); + +_defineVarProperties(_global.BI); diff --git a/packages/fineui/webpack/attachments.js b/packages/fineui/webpack/attachments.js index be1d89017..3adb47d20 100644 --- a/packages/fineui/webpack/attachments.js +++ b/packages/fineui/webpack/attachments.js @@ -19,7 +19,8 @@ const basicAttachmentMap = { "src/less/widget/**/*.less", "src/less/component/**/*.less" ]), - js_bundle: sync(["src/bundle.js"]) + js_bundle: sync(["src/bundle.js"]), + js_worker: sync(["src/worker.js"]) }; const bundleCss = [].concat(basicAttachmentMap.less, sync(["public/less/app.less", "public/less/**/*.less"])); @@ -34,8 +35,7 @@ const fineui = [].concat( ); const fineuiForWorker = [].concat( - jqueryPolyfill, - basicAttachmentMap.js_bundle, + basicAttachmentMap.js_worker, basicAttachmentMap.ui, basicAttachmentMap.ts ); From 961691646377209febc02e023fc465a00d97f8e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dailer-=E5=88=98=E8=8D=A3=E6=AD=86?= Date: Tue, 25 Jul 2023 14:07:01 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=AF=BC=E5=87=BA=20bi.context?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/base/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fineui/src/base/index.js b/packages/fineui/src/base/index.js index e5c6dcdb5..da9f8a0c0 100644 --- a/packages/fineui/src/base/index.js +++ b/packages/fineui/src/base/index.js @@ -11,3 +11,4 @@ export * from "./layer"; export * from "./list"; export * from "./single"; export * from "./el"; +export * from "./context"; \ No newline at end of file From 271418e258b6f203d6c8c6ffbee10025b9b15154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=2EKing-=E7=8E=8B=E5=87=AF=E5=A3=AE?= Date: Wed, 26 Jul 2023 10:38:33 +0800 Subject: [PATCH 10/13] =?UTF-8?q?REPORT-101145=20fix:=E6=96=B0=E5=89=8D?= =?UTF-8?q?=E7=AB=AF-=E8=A7=86=E5=9B=BE=E6=A0=91=E6=8E=A7=E4=BB=B6-?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=8D=E5=8F=AF=E7=94=A8=E5=90=8E=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E8=83=BD=E9=80=89=E4=B8=AD=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/base/combination/expander.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/base/combination/expander.js b/packages/fineui/src/base/combination/expander.js index bbca8fadd..041b448b4 100644 --- a/packages/fineui/src/base/combination/expander.js +++ b/packages/fineui/src/base/combination/expander.js @@ -276,7 +276,7 @@ export class Expander extends Widget { } _setEnable(arg) { - super._setEnable(arguments); + super._setEnable(...arguments); !arg && this.element.removeClass(this.options.hoverClass); !arg && this.isViewVisible() && this._hideView(); } From 366a2926afa1f3ce5957e583a6e1d2112462bbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=2EKing-=E7=8E=8B=E5=87=AF=E5=A3=AE?= Date: Wed, 26 Jul 2023 11:37:15 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=97=A0jira=20=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E8=BF=90=E7=AE=97=E7=AC=A6=E8=A1=A5=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/base/combination/expander.js | 2 +- packages/fineui/src/base/combination/group.button.js | 4 ++-- packages/fineui/src/base/combination/loader.js | 2 +- packages/fineui/src/base/combination/navigation.js | 2 +- packages/fineui/src/base/combination/switcher.js | 2 +- packages/fineui/src/base/combination/tab.js | 2 +- packages/fineui/src/base/single/0.single.js | 2 +- packages/fineui/src/base/single/button/button.basic.js | 2 +- packages/fineui/src/base/single/editor/editor.textarea.js | 2 +- packages/fineui/src/base/single/input/checkbox/checkbox.js | 2 +- packages/fineui/src/base/single/input/file.js | 2 +- packages/fineui/src/base/single/input/input.js | 2 +- packages/fineui/src/base/single/input/radio/radio.image.js | 2 +- packages/fineui/src/base/single/input/radio/radio.js | 2 +- packages/fineui/src/core/controller/controller.masker.js | 2 +- packages/fineui/src/core/loader/loader.style.js | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/fineui/src/base/combination/expander.js b/packages/fineui/src/base/combination/expander.js index 041b448b4..ad418a0f9 100644 --- a/packages/fineui/src/base/combination/expander.js +++ b/packages/fineui/src/base/combination/expander.js @@ -341,6 +341,6 @@ export class Expander extends Widget { } destroy() { - super.destroy(arguments); + super.destroy(...arguments); } } diff --git a/packages/fineui/src/base/combination/group.button.js b/packages/fineui/src/base/combination/group.button.js index 16894a283..1b228d4e6 100644 --- a/packages/fineui/src/base/combination/group.button.js +++ b/packages/fineui/src/base/combination/group.button.js @@ -418,12 +418,12 @@ export class ButtonGroup extends Widget { } empty() { - super.empty(arguments); + super.empty(...arguments); this.options.items = []; } destroy() { - super.destroy(arguments); + super.destroy(...arguments); this.options.items = []; } } diff --git a/packages/fineui/src/base/combination/loader.js b/packages/fineui/src/base/combination/loader.js index 14ec167bc..95081f18b 100644 --- a/packages/fineui/src/base/combination/loader.js +++ b/packages/fineui/src/base/combination/loader.js @@ -342,6 +342,6 @@ export class Loader extends Widget { } destroy() { - super.destroy(arguments); + super.destroy(...arguments); } } diff --git a/packages/fineui/src/base/combination/navigation.js b/packages/fineui/src/base/combination/navigation.js index 7a5e88faf..f79df33a2 100644 --- a/packages/fineui/src/base/combination/navigation.js +++ b/packages/fineui/src/base/combination/navigation.js @@ -191,6 +191,6 @@ export class Navigation extends Widget { } destroy() { - super.destroy(arguments); + super.destroy(...arguments); } } diff --git a/packages/fineui/src/base/combination/switcher.js b/packages/fineui/src/base/combination/switcher.js index 85e4a8083..dfb0c1da9 100644 --- a/packages/fineui/src/base/combination/switcher.js +++ b/packages/fineui/src/base/combination/switcher.js @@ -263,7 +263,7 @@ export class Switcher extends Widget { } _setEnable(arg) { - super._setEnable(arguments); + super._setEnable(...arguments); !arg && this.isViewVisible() && this._hideView(); } diff --git a/packages/fineui/src/base/combination/tab.js b/packages/fineui/src/base/combination/tab.js index b00554dcd..6f025baf4 100644 --- a/packages/fineui/src/base/combination/tab.js +++ b/packages/fineui/src/base/combination/tab.js @@ -200,6 +200,6 @@ export class Tab extends Widget { destroy() { this.cardMap = {}; - super.destroy(arguments); + super.destroy(...arguments); } } diff --git a/packages/fineui/src/base/single/0.single.js b/packages/fineui/src/base/single/0.single.js index 6d2408b4f..d113ef908 100644 --- a/packages/fineui/src/base/single/0.single.js +++ b/packages/fineui/src/base/single/0.single.js @@ -72,7 +72,7 @@ export class Single extends Widget { this.setValue(newValue); }) : value; - super._init(arguments); + super._init(...arguments); } _mounted() { diff --git a/packages/fineui/src/base/single/button/button.basic.js b/packages/fineui/src/base/single/button/button.basic.js index 37dfb403a..7dc121efb 100644 --- a/packages/fineui/src/base/single/button/button.basic.js +++ b/packages/fineui/src/base/single/button/button.basic.js @@ -69,7 +69,7 @@ export class BasicButton extends Single { this.setSelected(newValue); }) : opts.selected; - super._init(arguments); + super._init(...arguments); if (opts.shadow) { this._createShadow(); diff --git a/packages/fineui/src/base/single/editor/editor.textarea.js b/packages/fineui/src/base/single/editor/editor.textarea.js index 4152af588..f0d306bbd 100644 --- a/packages/fineui/src/base/single/editor/editor.textarea.js +++ b/packages/fineui/src/base/single/editor/editor.textarea.js @@ -279,7 +279,7 @@ export class TextAreaEditor extends Single { } _setValid(b) { - super._setValid(arguments); + super._setValid(...arguments); // this.content.setValid(b); // this.watermark && this.watermark.setValid(b); } diff --git a/packages/fineui/src/base/single/input/checkbox/checkbox.js b/packages/fineui/src/base/single/input/checkbox/checkbox.js index 1cf223924..e943c00ad 100644 --- a/packages/fineui/src/base/single/input/checkbox/checkbox.js +++ b/packages/fineui/src/base/single/input/checkbox/checkbox.js @@ -52,7 +52,7 @@ export class Checkbox extends BasicButton { } doClick() { - super.doClick(arguments); + super.doClick(...arguments); if (this.isValid()) { this.fireEvent(Checkbox.EVENT_CHANGE); } diff --git a/packages/fineui/src/base/single/input/file.js b/packages/fineui/src/base/single/input/file.js index 0b1bb059e..5c33d99b0 100644 --- a/packages/fineui/src/base/single/input/file.js +++ b/packages/fineui/src/base/single/input/file.js @@ -759,7 +759,7 @@ export class File extends Widget { } _setEnable(enable) { - super._setEnable(arguments); + super._setEnable(...arguments); if (enable === true) { this.element.removeAttr("disabled"); } else { diff --git a/packages/fineui/src/base/single/input/input.js b/packages/fineui/src/base/single/input/input.js index 9ca0207f5..fb950aaed 100644 --- a/packages/fineui/src/base/single/input/input.js +++ b/packages/fineui/src/base/single/input/input.js @@ -344,7 +344,7 @@ export class Input extends Single { } _setValid() { - super._setValid(arguments); + super._setValid(...arguments); if (this.isValid()) { this._lastChangedValue = this.getValue(); this.element.removeClass("bi-input-error"); diff --git a/packages/fineui/src/base/single/input/radio/radio.image.js b/packages/fineui/src/base/single/input/radio/radio.image.js index 6c939eba1..2d807cb82 100644 --- a/packages/fineui/src/base/single/input/radio/radio.image.js +++ b/packages/fineui/src/base/single/input/radio/radio.image.js @@ -28,7 +28,7 @@ export class ImageRadio extends IconButton { } doClick() { - super.doClick(arguments); + super.doClick(...arguments); if (this.isValid()) { this.fireEvent(ImageRadio.EVENT_CHANGE); } diff --git a/packages/fineui/src/base/single/input/radio/radio.js b/packages/fineui/src/base/single/input/radio/radio.js index 041255355..fa6a10401 100644 --- a/packages/fineui/src/base/single/input/radio/radio.js +++ b/packages/fineui/src/base/single/input/radio/radio.js @@ -51,7 +51,7 @@ export class Radio extends BasicButton { } doClick() { - super.doClick(arguments); + super.doClick(...arguments); if (this.isValid()) { this.fireEvent(Radio.EVENT_CHANGE); } diff --git a/packages/fineui/src/core/controller/controller.masker.js b/packages/fineui/src/core/controller/controller.masker.js index dc07a48b8..cd8f4cc05 100644 --- a/packages/fineui/src/core/controller/controller.masker.js +++ b/packages/fineui/src/core/controller/controller.masker.js @@ -12,7 +12,7 @@ export class MaskersController extends LayerController { } init() { - super.init(arguments); + super.init(...arguments); this.zindex = zIndex_masker; } } diff --git a/packages/fineui/src/core/loader/loader.style.js b/packages/fineui/src/core/loader/loader.style.js index a8b1dd2b0..b8e4780ff 100644 --- a/packages/fineui/src/core/loader/loader.style.js +++ b/packages/fineui/src/core/loader/loader.style.js @@ -13,7 +13,7 @@ export class StyleLoaderManager extends OB { } _init() { - super._init(arguments); + super._init(...arguments); this.stylesManager = {}; } From 69600488a5f9ff90d756bbe22abd59d97fcb4acf Mon Sep 17 00:00:00 2001 From: Sylar <> Date: Wed, 26 Jul 2023 17:12:36 +0800 Subject: [PATCH 12/13] =?UTF-8?q?REPORT-101548=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=A4=8D=E9=80=89=E6=A0=91this=E6=8C=87=E5=90=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../treevaluechooser/abstract.treevaluechooser.list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js index 9c84e13ba..d3afdae79 100644 --- a/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js +++ b/packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js @@ -31,7 +31,7 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser { return; } - doCheck([], this.tree.getRoot(), selectedValues); + doCheck.call(this, [], this.tree.getRoot(), selectedValues); callback({ items: values(result), From 416fe4a3baf6235c67655e611960fd911d783d14 Mon Sep 17 00:00:00 2001 From: dailer Date: Wed, 26 Jul 2023 19:08:21 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=97=A0JIRA=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/ztree/list/listasynctree.js | 2 +- packages/fineui/src/case/ztree/list/listparttree.js | 2 +- packages/fineui/src/case/ztree/list/listtreeview.js | 2 +- packages/fineui/src/case/ztree/tree.list.display.js | 2 +- packages/fineui/src/widget/multitree/multi.tree.list.combo.js | 4 ++-- scripts/lib/fui.component.json | 4 ++-- scripts/lib/fui.export.txt | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/fineui/src/case/ztree/list/listasynctree.js b/packages/fineui/src/case/ztree/list/listasynctree.js index 716d6c79e..f3ec1214d 100644 --- a/packages/fineui/src/case/ztree/list/listasynctree.js +++ b/packages/fineui/src/case/ztree/list/listasynctree.js @@ -11,7 +11,7 @@ import $ from "jquery"; */ @shortcut() -export class Listasynctree extends Listtreeview { +export class ListAsyncTree extends ListTreeView { static xtype = "bi.list_async_tree"; // 配置属性 diff --git a/packages/fineui/src/case/ztree/list/listparttree.js b/packages/fineui/src/case/ztree/list/listparttree.js index 9ec25d2f0..8bcae708f 100644 --- a/packages/fineui/src/case/ztree/list/listparttree.js +++ b/packages/fineui/src/case/ztree/list/listparttree.js @@ -11,7 +11,7 @@ import $ from "jquery"; */ @shortcut() -export class ListPartTree extends Listasynctree { +export class ListPartTree extends ListAsyncTree { static xtype = "bi.list_part_tree"; _loadMore() { diff --git a/packages/fineui/src/case/ztree/list/listtreeview.js b/packages/fineui/src/case/ztree/list/listtreeview.js index b7ec3aaa7..b6955e3de 100644 --- a/packages/fineui/src/case/ztree/list/listtreeview.js +++ b/packages/fineui/src/case/ztree/list/listtreeview.js @@ -11,7 +11,7 @@ import $ from "jquery"; */ @shortcut() -export class Listtreeview extends TreeView { +export class ListTreeView extends TreeView { static xtype = "bi.list_tree_view"; _constants = { diff --git a/packages/fineui/src/case/ztree/tree.list.display.js b/packages/fineui/src/case/ztree/tree.list.display.js index 9add974f5..85720f3d4 100644 --- a/packages/fineui/src/case/ztree/tree.list.display.js +++ b/packages/fineui/src/case/ztree/tree.list.display.js @@ -10,7 +10,7 @@ import $ from "jquery"; */ @shortcut() -export class ListDisplayTree extends Listtreeview { +export class ListDisplayTree extends ListTreeView { static xtype = "bi.list_display_tree"; static EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/packages/fineui/src/widget/multitree/multi.tree.list.combo.js b/packages/fineui/src/widget/multitree/multi.tree.list.combo.js index eb20de280..d32f941ed 100644 --- a/packages/fineui/src/widget/multitree/multi.tree.list.combo.js +++ b/packages/fineui/src/widget/multitree/multi.tree.list.combo.js @@ -19,7 +19,7 @@ import { Single, Combo } from "@/base"; import { MultiTreeSearchInsertPane } from "./trigger/multi.tree.search.insert.pane"; import { MultiTreePopup } from "./multi.tree.popup"; import { MultiSelectTrigger } from "../multiselect/multiselect.trigger"; -import { TriggerIconButton, ListPartTree, ListDisplayTree, Listasynctree } from "@/case"; +import { TriggerIconButton, ListPartTree, ListDisplayTree, ListAsyncTree } from "@/case"; import { MultiSelectCheckSelectedSwitcher } from "../multiselect/trigger/switcher.checkselected"; @shortcut() @@ -126,7 +126,7 @@ export class MultiTreeListCombo extends Single { self.numberCounter.setAdapter(this); }, el: { - type: Listasynctree.xtype, + type: ListAsyncTree.xtype, }, listeners: [ { diff --git a/scripts/lib/fui.component.json b/scripts/lib/fui.component.json index 35bfe7cc1..22d45963a 100644 --- a/scripts/lib/fui.component.json +++ b/scripts/lib/fui.component.json @@ -167,9 +167,9 @@ "bi.small_select_text_trigger": "SmallSelectTextTrigger", "bi.small_text_trigger": "SmallTextTrigger", "bi.async_tree": "AsyncTree", - "bi.list_async_tree": "Listasynctree", + "bi.list_async_tree": "ListAsyncTree", "bi.list_part_tree": "ListPartTree", - "bi.list_tree_view": "Listtreeview", + "bi.list_tree_view": "ListTreeView", "bi.part_tree": "PartTree", "bi.display_tree": "DisplayTree", "bi.list_display_tree": "ListDisplayTree", diff --git a/scripts/lib/fui.export.txt b/scripts/lib/fui.export.txt index ef18cb6a8..b04b355ce 100644 --- a/scripts/lib/fui.export.txt +++ b/scripts/lib/fui.export.txt @@ -233,8 +233,8 @@ ListLoader ListPane ListPartTree ListView -Listasynctree -Listtreeview +ListAsyncTree +ListTreeView Loader LoadingBar Logic