diff --git a/bin/cli/cli.js b/bin/cli/cli.js
old mode 100644
new mode 100755
index 732fc1133..513024023
--- a/bin/cli/cli.js
+++ b/bin/cli/cli.js
@@ -1,44 +1,21 @@
#!/usr/bin/env node
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
const workerCmd = require('./worker/cli.worker');
-function getArgs (startIndex = 1) {
- const args = {};
- process.argv
- .slice(startIndex, process.argv.length)
- .forEach(arg => {
- // long arg
- if (arg.slice(0, 2) === '--') {
- const longArg = arg.split('=');
- const longArgFlag = longArg[0].slice(2, longArg[0].length);
- const longArgValue = longArg.length > 1 ? longArg[1] : true;
- args[longArgFlag] = longArgValue;
- // flags
- } else if (arg[0] === '-') {
- const flags = arg.slice(1, arg.length);
- args[flags] = true;
- }
- });
+const argv = yargs(hideBin(process.argv)).argv;
- return args;
-}
+const cmd = argv._[0];
const cmds = new Map([
['worker', workerCmd],
]);
-const baseCmd = 'fui-cli';
-
-const startIndex = process.argv.findIndex(argv => argv.indexOf(baseCmd) !== -1);
-
-if (startIndex === -1) {
- throw new Error(`Command ${baseCmd} not found in args`);
-}
-
-const cmd = process.argv[startIndex + 1];
+if (!cmd) throw new Error('Command is undefined!');
if (cmds.has(cmd)) {
- cmds.get(cmd)?.exec(getArgs(startIndex + 2));
+ cmds.get(cmd)?.exec(argv);
} else {
throw new Error(`Command ${cmd} not supported`);
}
diff --git a/bin/cli/worker/cli.worker.js b/bin/cli/worker/cli.worker.js
index 555c99cf0..b67513fbb 100644
--- a/bin/cli/worker/cli.worker.js
+++ b/bin/cli/worker/cli.worker.js
@@ -5,7 +5,7 @@ function first2UpperCase(str) {
return str.toLowerCase().replace(/( |^)[a-z]/g, L => L.toUpperCase());
}
-function scanAndCreate(structure, workerName, root = process.env.INIT_CWD) {
+function scanAndCreate(structure, workerName, root) {
Object.keys(structure)
.forEach(name => {
if (typeof structure[name] === 'object') {
@@ -60,7 +60,7 @@ module.exports = {
},
};
- scanAndCreate(structure, name);
+ scanAndCreate(structure, name, args.where ? path.resolve(args.where) : process.cwd());
},
};
diff --git a/demo/js/case/demo.segment.js b/demo/js/case/demo.segment.js
index 8831c11f3..946c5d952 100644
--- a/demo/js/case/demo.segment.js
+++ b/demo/js/case/demo.segment.js
@@ -1,28 +1,28 @@
Demo.Func = BI.inherit(BI.Widget, {
props: {
- baseCls: "demo-func"
+ baseCls: "demo-func",
},
render: function () {
BI.createWidget({
- type: "bi.vertical",
+ type: "bi.horizontal",
element: this,
vgap: 20,
hgap: 30,
items: [{
type: "bi.segment",
items: [{
- text: "1",
- value: 1
+ text: "较长的选项1",
+ value: 1,
}, {
- text: "2",
- value: 2
+ text: "选项2",
+ value: 2,
}, {
- text: "3",
- value: 3
- }]
- }]
+ text: "选项3",
+ value: 3,
+ }],
+ }],
});
- }
+ },
});
-BI.shortcut("demo.segment", Demo.Func);
\ No newline at end of file
+BI.shortcut("demo.segment", Demo.Func);
diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot
index bfd53b919..525a2255d 100644
Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ
diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg
index 35d6aab64..03bfcd64d 100644
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@@ -14,6 +14,62 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -22,7 +78,7 @@
-
+
@@ -304,9 +360,9 @@
-
+
-
+
@@ -1896,7 +1952,7 @@
-
+
diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf
index c08f197a3..e4c8c2ce8 100644
Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ
diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff
index 910630447..13c6cb98e 100644
Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ
diff --git a/dist/font/iconfont.woff2 b/dist/font/iconfont.woff2
index d38205116..2c3383f13 100644
Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ
diff --git a/package.json b/package.json
index 212bbb8ce..841972678 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "fineui",
- "version": "2.0.20221110101625",
+ "version": "2.0.20221117172352",
"description": "fineui",
"main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts",
@@ -86,5 +86,9 @@
"registry": "https://registry.npmjs.org"
},
"author": "fanruan",
- "license": "MIT"
+ "license": "MIT",
+ "dependencies": {
+ "@types/yargs": "17.0.13",
+ "yargs": "17.6.2"
+ }
}
\ No newline at end of file
diff --git a/src/case/linearsegment/linear.segment.js b/src/case/linearsegment/linear.segment.js
index 3c1b677c3..b0b00f95b 100644
--- a/src/case/linearsegment/linear.segment.js
+++ b/src/case/linearsegment/linear.segment.js
@@ -3,9 +3,6 @@ BI.LinearSegment = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-linear-segment",
items: [],
- layouts: [{
- type: "bi.center"
- }],
height: 30
},
@@ -13,11 +10,14 @@ BI.LinearSegment = BI.inherit(BI.Widget, {
var self = this, o = this.options;
return {
type: "bi.button_group",
- items: BI.createItems(o.items, {
+ items: [BI.createItems(o.items, {
type: "bi.linear_segment_button",
height: o.height
- }),
- layouts: o.layouts,
+ })],
+ layouts: [{
+ type: "bi.table",
+ columnSize: BI.makeArrayByArray(o.items, "fill"),
+ }],
value: o.value,
listeners: [{
eventName: "__EVENT_CHANGE__",
diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js
index dac7754d1..3f323ffb6 100644
--- a/src/case/segment/segment.js
+++ b/src/case/segment/segment.js
@@ -10,7 +10,7 @@ BI.Segment = BI.inherit(BI.Widget, {
return BI.extend(BI.Segment.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-segment",
items: [],
- height: 24
+ height: 24,
});
},
_init: function () {
@@ -20,16 +20,15 @@ BI.Segment = BI.inherit(BI.Widget, {
element: this,
type: "bi.button_group",
value: o.value,
- items: BI.createItems(o.items, {
+ items: [BI.createItems(o.items, {
type: "bi.segment_button",
height: BI.toPix(o.height, 2),
- whiteSpace: o.whiteSpace
- }),
- layout: [
- {
- type: "bi.center"
- }
- ]
+ whiteSpace: o.whiteSpace,
+ })],
+ layouts: [{
+ type: "bi.table",
+ columnSize: BI.makeArrayByArray(o.items, "fill"),
+ }],
});
this.buttonGroup.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@@ -58,7 +57,7 @@ BI.Segment = BI.inherit(BI.Widget, {
getValue: function () {
return this.buttonGroup.getValue();
- }
+ },
});
BI.Segment.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.segment", BI.Segment);
\ No newline at end of file
+BI.shortcut("bi.segment", BI.Segment);
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 3adf1f5f4..e541191df 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -364,7 +364,7 @@
var workerMode = BI.Providers.getProvider("bi.provider.system").getWorkerMode();
var render = BI.isFunction(this.options.render) ? this.options.render : (workerMode ? (this.$render || this.render) : this.render);
var els = render && render.call(this);
- els = this.options.configRender ? this.options.configRender(els) : els;
+ els = this.options.configRender ? this.options.configRender.call(this, els) : els;
els = BI.Plugin.getRender(this.options.type, els);
if (BI.isPlainObject(els)) {
els = [els];
diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js
index 8ca284d30..d2926385d 100644
--- a/src/core/wrapper/layout.js
+++ b/src/core/wrapper/layout.js
@@ -16,7 +16,7 @@ BI.Layout = BI.inherit(BI.Widget, {
scrolly: false, // true, false
items: [],
innerHgap: 0,
- innerVgap: 0
+ innerVgap: 0,
};
},
@@ -727,6 +727,25 @@ BI.Layout = BI.inherit(BI.Widget, {
});
},
+ getRowColumnCls: function (rowIndex, colIndex, lastRowIndex, lastColIndex) {
+ var cls = "";
+ if (rowIndex === 0) {
+ cls += " first-row";
+ } else if (rowIndex === lastRowIndex) {
+ cls += " last-row";
+ }
+ if (colIndex === 0) {
+ cls += " first-col";
+ } else if (colIndex === lastColIndex) {
+ cls += " last-col";
+ }
+ BI.isOdd(rowIndex + 1) ? (cls += " odd-row") : (cls += " even-row");
+ BI.isOdd(colIndex + 1) ? (cls += " odd-col") : (cls += " even-col");
+ cls += " center-element";
+
+ return cls;
+ },
+
removeWidget: function (nameOrWidget) {
var removeIndex, self = this;
if (BI.isWidget(nameOrWidget)) {
diff --git a/src/core/wrapper/layout/layout.division.js b/src/core/wrapper/layout/layout.division.js
index 988d118be..307166283 100644
--- a/src/core/wrapper/layout/layout.division.js
+++ b/src/core/wrapper/layout/layout.division.js
@@ -28,44 +28,31 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
- var o = this.options;
+ var o = this.options, self = this;
var rows = o.rows || o.items.length, columns = o.columns || ((o.items[0] && o.items[0].length) | 0);
var map = BI.makeArray(rows), widths = {}, heights = {};
- function firstElement (item, row, col) {
- if (row === 0) {
- item.addClass("first-row");
- }
- if (col === 0) {
- item.addClass("first-col");
- }
- item.addClass(BI.isOdd(row + 1) ? "odd-row" : "even-row");
- item.addClass(BI.isOdd(col + 1) ? "odd-col" : "even-col");
- item.addClass("center-element");
+ function firstElement (item, cls) {
+ item.addClass(cls);
+
+ return item;
}
- function firstObject (item, row, col) {
- var cls = "";
- if (row === 0) {
- cls += " first-row";
- }
- if (col === 0) {
- cls += " first-col";
- }
- BI.isOdd(row + 1) ? (cls += " odd-row") : (cls += " even-row");
- BI.isOdd(col + 1) ? (cls += " odd-col") : (cls += " even-col");
- item.cls = (item.cls || "") + cls + " center-element";
+ function firstObject (item, cls) {
+ item.cls = (item.cls || "") + cls;
+
+ return item;
}
- function first (item, row, col) {
+ function first (item, cls) {
if (item instanceof BI.Widget) {
- firstElement(item.element, row, col);
+ firstElement(item.element, cls);
} else if (item.el instanceof BI.Widget) {
- firstElement(item.el.element, row, col);
+ firstElement(item.el.element, cls);
} else if (item.el) {
- firstObject(item.el, row, col);
+ firstObject(item.el, cls);
} else {
- firstObject(item, row, col);
+ firstObject(item, cls);
}
}
@@ -79,6 +66,7 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
heights[j] = (heights[j] || 0) + item.height;
map[i][j] = el;
});
+
return;
}
widths[item.row] = (widths[item.row] || 0) + item.width;
@@ -106,7 +94,7 @@ BI.DivisionLayout = BI.inherit(BI.Layout, {
if (j == o.columns - 1) {
w.element.css({right: "0%"});
}
- first(w, i, j);
+ first(w, self.getRowColumnCls(i, j, rows - 1, columns - 1));
totalW += map[i][j].width;
}
}
diff --git a/src/core/wrapper/layout/layout.grid.js b/src/core/wrapper/layout/layout.grid.js
index a81c31681..53e4cf00b 100644
--- a/src/core/wrapper/layout/layout.grid.js
+++ b/src/core/wrapper/layout/layout.grid.js
@@ -36,29 +36,16 @@ BI.GridLayout = BI.inherit(BI.Layout, {
els[i] = [];
}
- function firstElement (item, row, col) {
- if (row === 0) {
- item.addClass("first-row");
- }
- if (col === 0) {
- item.addClass("first-col");
- }
- item.addClass(BI.isOdd(row + 1) ? "odd-row" : "even-row");
- item.addClass(BI.isOdd(col + 1) ? "odd-col" : "even-col");
- item.addClass("center-element");
+ function firstElement (item, cls) {
+ item.addClass(cls);
+
+ return item;
}
- function firstObject (item, row, col) {
- var cls = "";
- if (row === 0) {
- cls += " first-row";
- }
- if (col === 0) {
- cls += " first-col";
- }
- BI.isOdd(row + 1) ? (cls += " odd-row") : (cls += " even-row");
- BI.isOdd(col + 1) ? (cls += " odd-col") : (cls += " even-col");
- item.cls = (item.cls || "") + cls + " center-element";
+ function firstObject (item, cls) {
+ item.cls = (item.cls || "") + cls;
+
+ return item;
}
function first (item, row, col) {
@@ -89,7 +76,7 @@ BI.GridLayout = BI.inherit(BI.Layout, {
type: "bi.layout"
});
}
- first(els[i][j], i, j);
+ first(els[i][j], self.getRowColumnCls(i, j, rows - 1, columns - 1));
els[i][j].element.css({
position: "absolute",
top: height * i + "%",
diff --git a/src/core/wrapper/layout/layout.table.js b/src/core/wrapper/layout/layout.table.js
index 6352672c2..51d6eeb14 100644
--- a/src/core/wrapper/layout/layout.table.js
+++ b/src/core/wrapper/layout/layout.table.js
@@ -16,7 +16,7 @@ BI.TableLayout = BI.inherit(BI.Layout, {
// rowSize: 30, // or [30,30,30]
hgap: 0,
vgap: 0,
- items: []
+ items: [],
});
},
render: function () {
@@ -45,57 +45,43 @@ BI.TableLayout = BI.inherit(BI.Layout, {
return self._optimiseGap(size);
}).join(" ") : BI.range(o.items.length).fill(this._optimiseGap(o.rowSize)).join(" "),
"grid-row-gap": this._optimiseGap(o.vgap),
- "grid-column-gap": this._optimiseGap(o.hgap)
+ "grid-column-gap": this._optimiseGap(o.hgap),
});
}
+
return {
type: "bi.default",
ref: function (_ref) {
self.layout = _ref;
},
- items: this._formatItems(items)
+ items: this._formatItems(items),
};
},
_formatItems: function (items) {
- var o = this.options;
+ var o = this.options, self = this;
+
+ function firstElement (item, cls) {
+ item.addClass(cls);
- function firstElement (item, row, col) {
- if (row === 0) {
- item.addClass("first-row");
- }
- if (col === 0) {
- item.addClass("first-col");
- }
- item.addClass(BI.isOdd(row + 1) ? "odd-row" : "even-row");
- item.addClass(BI.isOdd(col + 1) ? "odd-col" : "even-col");
- item.addClass("center-element");
return item;
}
- function firstObject (item, row, col) {
- var cls = "";
- if (row === 0) {
- cls += " first-row";
- }
- if (col === 0) {
- cls += " first-col";
- }
- BI.isOdd(row + 1) ? (cls += " odd-row") : (cls += " even-row");
- BI.isOdd(col + 1) ? (cls += " odd-col") : (cls += " even-col");
- item.cls = (item.cls || "") + cls + " center-element";
+ function firstObject (item, cls) {
+ item.cls = (item.cls || "") + cls;
+
return item;
}
- function first (item, row, col) {
+ function first (item, cls) {
if (item instanceof BI.Widget) {
- return firstElement(item.element, row, col);
+ return firstElement(item.element, cls);
} else if (item.el instanceof BI.Widget) {
- return firstElement(item.el.element, row, col);
+ return firstElement(item.el.element, cls);
} else if (item.el) {
- return firstObject(item.el, row, col);
+ return firstObject(item.el, cls);
} else {
- return firstObject(item, row, col);
+ return firstObject(item, cls);
}
}
@@ -105,18 +91,20 @@ BI.TableLayout = BI.inherit(BI.Layout, {
columnSize: ["fill"],
horizontalAlign: o.horizontalAlign,
verticalAlign: o.verticalAlign,
- items: [BI.formatEL(item)]
+ items: [BI.formatEL(item)],
};
}
- return BI.reduce(items, function (row, result, i) {
- return result.concat(BI.map(row, function (j, item) {
+ return BI.reduce(items, function (rowItems, result, rowIndex) {
+ return result.concat(BI.map(rowItems, function (colIndex, item) {
+ var cls = self.getRowColumnCls(rowIndex, colIndex, items.length - 1, rowItems.length - 1);
if (BI.isEmpty(item)) {
return first(wrapLayout({
- type: "bi.layout"
- }), i, j);
+ type: "bi.layout",
+ }), cls);
}
- return first(wrapLayout(item), i, j);
+
+ return first(wrapLayout(item), cls);
}));
}, []);
},
@@ -127,6 +115,6 @@ BI.TableLayout = BI.inherit(BI.Layout, {
populate: function (items) {
this.layout.populate(this._formatItems(items));
- }
+ },
});
BI.shortcut("bi.table", BI.TableLayout);
diff --git a/src/core/wrapper/layout/layout.window.js b/src/core/wrapper/layout/layout.window.js
index c7d14623c..a6e6c6a26 100644
--- a/src/core/wrapper/layout/layout.window.js
+++ b/src/core/wrapper/layout/layout.window.js
@@ -35,7 +35,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
},
stroke: function (items) {
- var o = this.options;
+ var o = this.options, self = this;
if (BI.isNumber(o.rowSize)) {
o.rowSize = BI.makeArray(o.items.length, 1 / o.items.length);
}
@@ -43,29 +43,16 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
o.columnSize = BI.makeArray(o.items[0].length, 1 / o.items[0].length);
}
- function firstElement (item, row, col) {
- if (row === 0) {
- item.addClass("first-row");
- }
- if (col === 0) {
- item.addClass("first-col");
- }
- item.addClass(BI.isOdd(row + 1) ? "odd-row" : "even-row");
- item.addClass(BI.isOdd(col + 1) ? "odd-col" : "even-col");
- item.addClass("center-element");
+ function firstElement (item, cls) {
+ item.addClass(cls);
+
+ return item;
}
- function firstObject (item, row, col) {
- var cls = "";
- if (row === 0) {
- cls += " first-row";
- }
- if (col === 0) {
- cls += " first-col";
- }
- BI.isOdd(row + 1) ? (cls += " odd-row") : (cls += " even-row");
- BI.isOdd(col + 1) ? (cls += " odd-col") : (cls += " even-col");
- item.cls = (item.cls || "") + cls + " center-element";
+ function firstObject (item, cls) {
+ item.cls = (item.cls || "") + cls;
+
+ return item;
}
function first (item, row, col) {
@@ -109,7 +96,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
h = this._optimiseGap(o.rowSize[i]);
}
wi.element.css({top: t, height: h});
- first(wi, i, j);
+ first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1));
}
if (!BI.isNumber(o.rowSize[i])) {
break;
@@ -127,7 +114,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
h = this._optimiseGap(o.rowSize[i]);
}
wi.element.css({bottom: b, height: h});
- first(wi, i, j);
+ first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1));
}
if (!BI.isNumber(o.rowSize[i])) {
break;
@@ -145,7 +132,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
w = this._optimiseGap(o.columnSize[j]);
}
wi.element.css({left: l, width: w});
- first(wi, i, j);
+ first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1));
}
if (!BI.isNumber(o.columnSize[j])) {
break;
@@ -163,7 +150,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, {
w = this._optimiseGap(o.columnSize[j]);
}
wi.element.css({right: r, width: w});
- first(wi, i, j);
+ first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1));
}
if (!BI.isNumber(o.columnSize[j])) {
break;
diff --git a/src/core/wrapper/layout/sticky/sticky.horizontal.js b/src/core/wrapper/layout/sticky/sticky.horizontal.js
index afdf955aa..d88f28b6d 100644
--- a/src/core/wrapper/layout/sticky/sticky.horizontal.js
+++ b/src/core/wrapper/layout/sticky/sticky.horizontal.js
@@ -22,7 +22,7 @@ BI.HorizontalStickyLayout = BI.inherit(BI.FlexHorizontalLayout, {
}
if (columnSize !== "fill") {
var fillIndex;
- BI.count(0, o.items.length - 1, index => {
+ BI.count(0, o.items.length, index => {
if (BI.isNotNull(fillIndex)) {
return;
}
diff --git a/src/core/wrapper/layout/sticky/sticky.vertical.js b/src/core/wrapper/layout/sticky/sticky.vertical.js
index beb0e9d43..71dc3ed8c 100644
--- a/src/core/wrapper/layout/sticky/sticky.vertical.js
+++ b/src/core/wrapper/layout/sticky/sticky.vertical.js
@@ -22,7 +22,7 @@ BI.VerticalStickyLayout = BI.inherit(BI.FlexVerticalLayout, {
}
if (rowSize !== "fill") {
var fillIndex;
- BI.count(0, o.items.length - 1, index => {
+ BI.count(0, o.items.length, index => {
if (BI.isNotNull(fillIndex)) {
return;
}
diff --git a/src/less/base/segment/button.segment.less b/src/less/base/segment/button.segment.less
index 451d65f33..5fdd04264 100644
--- a/src/less/base/segment/button.segment.less
+++ b/src/less/base/segment/button.segment.less
@@ -10,7 +10,7 @@
.line-segment-button-line {
.transition(background 0.3s);
}
- &.active, &:active {
+ &.active, &:active:not(.disabled) {
font-weight: bold;
}
}
diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less
index f106ddc75..08fec037a 100644
--- a/src/less/base/segment/segment.less
+++ b/src/less/base/segment/segment.less
@@ -7,17 +7,24 @@
border-top: 1px solid @color-bi-split-segment;
border-bottom: 1px solid @color-bi-split-segment;
}
- & > .first-element{
+ & > .first-col{
border-left: 1px solid @color-bi-split-segment;
.border-corner-radius(2px,0px,0px,2px)
}
- & > .last-element{
+ & > .last-col{
.border-corner-radius(0px,2px,2px,0px)
}
- &.disabled > .center-element, &.disabled > .first-element{
+ &.disabled > .center-element, &.disabled > .first-col{
border-color: @color-bi-split-disabled-segment;
}
}
+.bi-linear-segment {
+ &.disabled {
+ .bi-high-light-background {
+ background-color: @color-bi-background-dark-gray !important;
+ }
+ }
+}
.bi-theme-dark {
.bi-segment {
@@ -27,7 +34,7 @@
border-top: 1px solid @color-bi-split-segment-theme-dark;
border-bottom: 1px solid @color-bi-split-segment-theme-dark;
}
- & > .first-element{
+ & > .first-col{
border-left: 1px solid @color-bi-split-segment-theme-dark;
}
}
diff --git a/src/less/widget/multiselect/trigger/button.checkselected.less b/src/less/widget/multiselect/trigger/button.checkselected.less
index b02c76e80..4a36315b0 100644
--- a/src/less/widget/multiselect/trigger/button.checkselected.less
+++ b/src/less/widget/multiselect/trigger/button.checkselected.less
@@ -2,7 +2,6 @@
.bi-multi-select-check-selected-button {
z-index: 1;
- min-width: 16px;
.border-radius(50%);
&:active {
diff --git a/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less b/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less
index 55207b67a..5393d7b24 100644
--- a/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less
+++ b/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less
@@ -7,6 +7,7 @@
}
.trigger-check-text {
.border-radius(8px);
+ .border-radius(calc(var(--css-scale, 1) * 8px));
z-index: 1;
&:active {
background-color: @color-bi-background-multi-select-trigger-check-selected;
diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js
index 558a6c62a..d2d68d19b 100644
--- a/src/widget/year/combo.year.js
+++ b/src/widget/year/combo.year.js
@@ -141,7 +141,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.icon_button",
- cls: "bi-trigger-icon-button",
+ cls: "bi-trigger-icon-button date-change-h-font",
width: this._const.iconWidth,
height: BI.toPix(o.height, border),
ref: function () {
diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js
index 4a85db0f2..82d6e3ca8 100644
--- a/src/widget/yearmonth/combo.yearmonth.js
+++ b/src/widget/yearmonth/combo.yearmonth.js
@@ -141,7 +141,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
items: [{
el: {
type: "bi.icon_button",
- cls: "bi-trigger-icon-button",
+ cls: "bi-trigger-icon-button date-change-h-font",
width: BI.toPix(o.height, border),
height: BI.toPix(o.height, border),
ref: function () {
diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js
index 455fd9901..1403d254f 100644
--- a/src/widget/yearquarter/combo.yearquarter.js
+++ b/src/widget/yearquarter/combo.yearquarter.js
@@ -144,7 +144,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.icon_button",
- cls: "bi-trigger-icon-button",
+ cls: "bi-trigger-icon-button date-change-h-font",
width: this._consts.iconWidth,
height: BI.toPix(o.height, border),
ref: function () {
@@ -169,7 +169,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
}
switch (type) {
case BI.DynamicYearQuarterCombo.Dynamic:
- this.comboWrapper.resize();
+ this.changeIcon.setVisible(true);
break;
default:
this.changeIcon.setVisible(false);
diff --git a/typescript/core/base.ts b/typescript/core/base.ts
index b5a3ce55c..6182a0833 100644
--- a/typescript/core/base.ts
+++ b/typescript/core/base.ts
@@ -148,9 +148,9 @@ export interface _base {
takeRight: (array: T[], n: number) => T[];
- findIndex: (array: any[], value: any, callback?: Function | object | string, thisArg?: any) => number;
+ findIndex: (array: T[], predicate?: ((index: number, item: T, array: T[]) => any) | object | string, thisArg?: any) => number;
- findLastIndex: (array: any[], value: any, callback?: Function | object | string, thisArg?: any) => number;
+ findLastIndex: (array: T[], predicate?: ((index: number, item: T, array: T[]) => any) | object | string, thisArg?: any) => number;
makeArray: (length: number, value?: T) => number[] | T[];