Browse Source

Pull request #3526: REPORT-95320 && BI-125865

Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6

* commit '52d8f2ea4d44591d396e825446b6a76cd2f619c3':
  BI-125865 fix: 【6.0.10发散】展开数据预警后,调整浏览器窗口,页面显示异常
  REPORT-95320 fix: 【冒烟】【权限管理】权限复用页面搜索并选中部门后,取消搜索后查看实际未选中
es6
Dailer-刘荣歆 2 years ago
parent
commit
35a6551f7c
  1. 2
      packages/fineui/src/base/0.base.js
  2. 24
      packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js
  3. 8
      packages/fineui/src/core/controller/controller.layer.js

2
packages/fineui/src/base/0.base.js

@ -11,7 +11,7 @@ import {
import { StyleLoaderManager } from '../core/loader/loader.style';
const Resizers = new ResizeController();
const Layers = new LayerController();
const Layers = new LayerController(Resizers);
const Maskers = new MaskersController();
const Bubbles = new BubblesController();
const Tooltips = new TooltipsController();

24
packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js

@ -379,13 +379,7 @@ export class AbstractTreeValueChooser extends Widget {
result.push([k]);
});
dealWithSelectedValues(selectedValues, []);
const jo = {};
each(result, (i, strs) => {
this._buildTree(jo, strs);
});
callback(jo);
const isAllSelected = (selected, parents) => isEmpty(selected) || this._getChildCount(parents) === size(selected);
function dealWithSelectedValues(selected, parents) {
if (selected == null || isEmpty(selected)) {
@ -408,7 +402,15 @@ export class AbstractTreeValueChooser extends Widget {
return can && isAllSelected(selected, parents);
}
const isAllSelected = (selected, parents) => isEmpty(selected) || this._getChildCount(parents) === size(selected);
dealWithSelectedValues(selectedValues, []);
const jo = {};
each(result, (i, strs) => {
this._buildTree(jo, strs);
});
callback(jo);
}
_reqInitTreeNode(op, callback) {
@ -469,7 +471,7 @@ export class AbstractTreeValueChooser extends Widget {
}
return output;
};
}
function nodeSearch(deep, parentValues, current, isAllSelect, result) {
if (self._isMatch(parentValues, current, keyword)) {
@ -512,7 +514,7 @@ export class AbstractTreeValueChooser extends Widget {
}
return [can, checked];
};
}
function createOneJson(parentValues, value, isOpen, checked, half, flag, result) {
const node = self._getTreeNode(parentValues, value);
@ -529,7 +531,7 @@ export class AbstractTreeValueChooser extends Widget {
flag,
disabled: node.disabled,
});
};
}
function isHalf(parentValues, value) {
const find = findSelectedObj(parentValues);

8
packages/fineui/src/core/controller/controller.layer.js

@ -9,17 +9,17 @@ import { Widget } from "../4.widget";
import { createWidget } from "../5.inject";
import { zIndex_layer } from "../constant";
import { DOM } from "../utils";
// import { Resizers } from "../../base/0.base";
export class LayerController extends Controller {
constructor() {
constructor(Resizers) {
super();
this._constructor();
this.Resizers = Resizers;
}
props = {
render: "body",
}
};
init() {
this.layerManager = {};
@ -28,7 +28,7 @@ export class LayerController extends Controller {
}
_initResizer() {
// this.resizer = Resizers.add(`layerController${uniqueId()}`, bind(this._resize, this));
this.resizer = this.Resizers.add(`layerController${uniqueId()}`, bind(this._resize, this));
}
_resize() {

Loading…
Cancel
Save