Browse Source

Merge pull request #242629 in DEC/fineui from release/11.0 to bugfix/11.0

* commit 'a09c49ba58f0885e3b7b00f00bbc71df7eb4d4ba':
  无JIRA 组件名大小写修正
  无JIRA 组件名大小写修正
  REPORT-101548 下拉复选树this指向问题
research/test
superman 1 year ago
parent
commit
58f2ea1bae
  1. 4
      packages/fineui/src/case/ztree/list/listasynctree.js
  2. 4
      packages/fineui/src/case/ztree/list/listparttree.js
  3. 2
      packages/fineui/src/case/ztree/list/listtreeview.js
  4. 4
      packages/fineui/src/case/ztree/tree.list.display.js
  5. 2
      packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js
  6. 4
      packages/fineui/src/widget/multitree/multi.tree.list.combo.js
  7. 4
      scripts/lib/fui.component.json
  8. 4
      scripts/lib/fui.export.txt

4
packages/fineui/src/case/ztree/list/listasynctree.js

@ -1,4 +1,4 @@
import { Listtreeview } from "./listtreeview"; import { ListTreeView } from "./listtreeview";
import { cjkEncodeDO, delay, isEmpty, shortcut, extend } from "@/core"; import { cjkEncodeDO, delay, isEmpty, shortcut, extend } from "@/core";
import $ from "jquery"; import $ from "jquery";
@ -11,7 +11,7 @@ import $ from "jquery";
*/ */
@shortcut() @shortcut()
export class Listasynctree extends Listtreeview { export class ListAsyncTree extends ListTreeView {
static xtype = "bi.list_async_tree"; static xtype = "bi.list_async_tree";
// 配置属性 // 配置属性

4
packages/fineui/src/case/ztree/list/listparttree.js

@ -1,4 +1,4 @@
import { Listasynctree } from "./listasynctree"; import { ListAsyncTree } from "./listasynctree";
import { shortcut, extend, Events, delay } from "@/core"; import { shortcut, extend, Events, delay } from "@/core";
import { TreeView } from "../treeview"; import { TreeView } from "../treeview";
import $ from "jquery"; import $ from "jquery";
@ -11,7 +11,7 @@ import $ from "jquery";
*/ */
@shortcut() @shortcut()
export class ListPartTree extends Listasynctree { export class ListPartTree extends ListAsyncTree {
static xtype = "bi.list_part_tree"; static xtype = "bi.list_part_tree";
_loadMore() { _loadMore() {

2
packages/fineui/src/case/ztree/list/listtreeview.js

@ -11,7 +11,7 @@ import $ from "jquery";
*/ */
@shortcut() @shortcut()
export class Listtreeview extends TreeView { export class ListTreeView extends TreeView {
static xtype = "bi.list_tree_view"; static xtype = "bi.list_tree_view";
_constants = { _constants = {

4
packages/fineui/src/case/ztree/tree.list.display.js

@ -1,4 +1,4 @@
import { Listtreeview } from "./list/listtreeview"; import { ListTreeView } from "./list/listtreeview";
import { each, shortcut, i18nText } from "@/core"; import { each, shortcut, i18nText } from "@/core";
import $ from "jquery"; import $ from "jquery";
@ -10,7 +10,7 @@ import $ from "jquery";
*/ */
@shortcut() @shortcut()
export class ListDisplayTree extends Listtreeview { export class ListDisplayTree extends ListTreeView {
static xtype = "bi.list_display_tree"; static xtype = "bi.list_display_tree";
static EVENT_CHANGE = "EVENT_CHANGE"; static EVENT_CHANGE = "EVENT_CHANGE";

2
packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js

@ -31,7 +31,7 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser {
return; return;
} }
doCheck([], this.tree.getRoot(), selectedValues); doCheck.call(this, [], this.tree.getRoot(), selectedValues);
callback({ callback({
items: values(result), items: values(result),

4
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 { MultiTreeSearchInsertPane } from "./trigger/multi.tree.search.insert.pane";
import { MultiTreePopup } from "./multi.tree.popup"; import { MultiTreePopup } from "./multi.tree.popup";
import { MultiSelectTrigger } from "../multiselect/multiselect.trigger"; 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"; import { MultiSelectCheckSelectedSwitcher } from "../multiselect/trigger/switcher.checkselected";
@shortcut() @shortcut()
@ -126,7 +126,7 @@ export class MultiTreeListCombo extends Single {
self.numberCounter.setAdapter(this); self.numberCounter.setAdapter(this);
}, },
el: { el: {
type: Listasynctree.xtype, type: ListAsyncTree.xtype,
}, },
listeners: [ listeners: [
{ {

4
scripts/lib/fui.component.json

@ -167,9 +167,9 @@
"bi.small_select_text_trigger": "SmallSelectTextTrigger", "bi.small_select_text_trigger": "SmallSelectTextTrigger",
"bi.small_text_trigger": "SmallTextTrigger", "bi.small_text_trigger": "SmallTextTrigger",
"bi.async_tree": "AsyncTree", "bi.async_tree": "AsyncTree",
"bi.list_async_tree": "Listasynctree", "bi.list_async_tree": "ListAsyncTree",
"bi.list_part_tree": "ListPartTree", "bi.list_part_tree": "ListPartTree",
"bi.list_tree_view": "Listtreeview", "bi.list_tree_view": "ListTreeView",
"bi.part_tree": "PartTree", "bi.part_tree": "PartTree",
"bi.display_tree": "DisplayTree", "bi.display_tree": "DisplayTree",
"bi.list_display_tree": "ListDisplayTree", "bi.list_display_tree": "ListDisplayTree",

4
scripts/lib/fui.export.txt

@ -233,8 +233,8 @@ ListLoader
ListPane ListPane
ListPartTree ListPartTree
ListView ListView
Listasynctree ListAsyncTree
Listtreeview ListTreeView
Loader Loader
LoadingBar LoadingBar
Logic Logic

Loading…
Cancel
Save