Browse Source

Merge pull request #243602 in DEC/fineui from final/11.0 to release/11.0

* commit '5279f201e956764fb644ab4a1135b0bd8defc206':
  REPORT-101922 fix:【冒烟】定时调度默认用户组部门树勾选效果异常
research/test
superman 1 year ago
parent
commit
e9750de785
  1. 2
      packages/fineui/src/case/ztree/parttree.js
  2. 1
      packages/fineui/src/widget/multiselect/multiselect.combo.js
  3. 4
      packages/fineui/src/widget/multitree/trigger/searcher.list.multi.tree.js
  4. 5
      packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js

2
packages/fineui/src/case/ztree/parttree.js

@ -24,7 +24,7 @@ export class PartTree extends AsyncTree {
constructor(...args) { constructor(...args) {
super(...args); super(...args);
this.seMethos = super._selectTreeNode; this.seMethos = AsyncTree.superclass._selectTreeNode;
} }
_loadMore() { _loadMore() {

1
packages/fineui/src/widget/multiselect/multiselect.combo.js

@ -48,6 +48,7 @@ export class MultiSelectCombo extends Single {
static EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM"; static EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
static EVENT_CONFIRM = "EVENT_CONFIRM"; static EVENT_CONFIRM = "EVENT_CONFIRM";
static MultiSelectCombo = "MultiSelectCombo"; static MultiSelectCombo = "MultiSelectCombo";
static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
_defaultConfig() { _defaultConfig() {
return extend(super._defaultConfig(...arguments), { return extend(super._defaultConfig(...arguments), {

4
packages/fineui/src/widget/multitree/trigger/searcher.list.multi.tree.js

@ -1,4 +1,4 @@
import { shortcut, Widget, extend, emptyFn, createWidget, isNotNull, isNumber, size, each, last, Selection } from "@/core"; import { shortcut, Widget, extend, emptyFn, createWidget, isNotNull, isNumber, size, each, last, Selection, isObject } from "@/core";
import { MultiSelectEditor } from "../../multiselect/trigger/editor.multiselect"; import { MultiSelectEditor } from "../../multiselect/trigger/editor.multiselect";
import { MultiSelectSearcher } from "../../multiselect/trigger/searcher.multiselect"; import { MultiSelectSearcher } from "../../multiselect/trigger/searcher.multiselect";
import { Searcher } from "@/base"; import { Searcher } from "@/base";
@ -137,7 +137,7 @@ export class MultiListTreeSearcher extends Widget {
setState(ob) { setState(ob) {
const o = this.options; const o = this.options;
ob || (ob = {}); ob || (ob = {});
ob.value || (ob.value = []); isObject(ob) && (ob.value || (ob.value = []));
let count = 0; let count = 0;
if (isNumber(ob)) { if (isNumber(ob)) {
this.editor.setState(ob); this.editor.setState(ob);

5
packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js

@ -11,7 +11,8 @@ import {
each, each,
isEmptyObject, isEmptyObject,
Func, Func,
Selection Selection,
isObject
} from "@/core"; } from "@/core";
import { MultiSelectEditor } from "../../multiselect/trigger/editor.multiselect"; import { MultiSelectEditor } from "../../multiselect/trigger/editor.multiselect";
import { MultiSelectSearcher } from "../../multiselect/trigger/searcher.multiselect"; import { MultiSelectSearcher } from "../../multiselect/trigger/searcher.multiselect";
@ -165,7 +166,7 @@ export class MultiTreeSearcher extends Widget {
setState(ob) { setState(ob) {
const o = this.options; const o = this.options;
ob || (ob = {}); ob || (ob = {});
ob.value || (ob.value = {}); isObject(ob) && (ob.value || (ob.value = {}));
let count = 0; let count = 0;
if (isNumber(ob)) { if (isNumber(ob)) {
this.editor.setState(ob); this.editor.setState(ob);

Loading…
Cancel
Save