diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot index 876d0c407..443a89080 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 bf89d8452..4a61059e8 100644 --- a/dist/font/iconfont.svg +++ b/dist/font/iconfont.svg @@ -14,6 +14,40 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -474,7 +508,7 @@ - + @@ -1372,7 +1406,7 @@ - + @@ -1576,7 +1610,7 @@ - + diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index d126a7c97..3da32e241 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 3ea104492..fdf6eb37f 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 a695ead6a..7680d7107 100644 Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ diff --git a/package.json b/package.json index f66cb119b..f7ba7398b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230208163847", + "version": "2.0.20230320102539", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", @@ -9,7 +9,7 @@ }, "devDependencies": { "@babel/core": "^7.17.4", - "@fui/babel-preset-fineui": "^3.0.0", + "@fui/babel-preset-fineui": "3.0.1", "@fui/eslint-plugin": "^1.0.19", "@types/node": "15.6.1", "@typescript-eslint/eslint-plugin": "2.33.0", @@ -18,7 +18,7 @@ "babel-loader": "8.0.6", "chai": "4.2.0", "concat": "1.0.3", - "core-js": "3.3.2", + "core-js": "3.29.1", "cross-env": "6.0.0", "css-loader": "3.0.0", "es6-promise": "4.2.8", @@ -43,7 +43,6 @@ "optimize-css-assets-webpack-plugin": "5.0.3", "postcss-loader": "3.0.0", "postcss-simple-vars": "5.0.2", - "puppeteer": "^13.3.0", "rimraf": "3.0.2", "script-loader": "0.7.2", "source-map-loader": "0.2.4", @@ -89,4 +88,4 @@ "jquery": "3.6.3", "yargs": "17.6.2" } -} +} \ No newline at end of file diff --git a/src/case/button/item.singleselect.radio.js b/src/case/button/item.singleselect.radio.js index 74ebe49c9..92058b476 100644 --- a/src/case/button/item.singleselect.radio.js +++ b/src/case/button/item.singleselect.radio.js @@ -25,6 +25,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, { type: "bi.center_adapt", items: [{ type: "bi.radio", + once: o.once, ref: function (_ref) { self.radio = _ref; }, diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js index 9c5f0d0fc..dd5013eba 100644 --- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js +++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js @@ -29,7 +29,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, { items: o.items, height: BI.toPix(o.height, 2), text: o.text, - value: o.value + value: o.value, + defaultText: o.defaultText }); this.popup = BI.createWidget({ type: "bi.text_value_check_combo_popup", diff --git a/src/case/trigger/trigger.text.js b/src/case/trigger/trigger.text.js index 6e7273252..4c1335ce6 100644 --- a/src/case/trigger/trigger.text.js +++ b/src/case/trigger/trigger.text.js @@ -40,6 +40,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, { height: o.height, text: text || o.defaultText, tipType: o.tipType, + title: o.title, warningTitle: o.warningTitle, hgap: o.textHgap, vgap: o.textVgap, diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 005ac241b..feb0f138b 100644 --- a/src/case/trigger/trigger.text.select.js +++ b/src/case/trigger/trigger.text.select.js @@ -35,7 +35,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { textTgap: o.textTgap, textBgap: o.textBgap, tipType: o.tipType, - title: null, + title: o.title, allowClear: o.allowClear, listeners: [ { diff --git a/src/component/allvaluechooser/combo.allvaluechooser.js b/src/component/allvaluechooser/combo.allvaluechooser.js index 11494b584..17dc244b7 100644 --- a/src/component/allvaluechooser/combo.allvaluechooser.js +++ b/src/component/allvaluechooser/combo.allvaluechooser.js @@ -34,6 +34,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, { valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, height: o.height, + defaultText: o.defaultText, value: this._assertValue({ type: BI.Selection.Multi, value: o.value || [] diff --git a/src/core/structure/tree.js b/src/core/structure/tree.js index 359af5cab..5ed377147 100644 --- a/src/core/structure/tree.js +++ b/src/core/structure/tree.js @@ -130,7 +130,7 @@ continue; } if (temp != null) { - queue = queue.concat(temp.getChildren()); + queue.push(...temp.getChildren()); } } }, diff --git a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js index 857fc368f..0599042cd 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.timeselect.js @@ -3,7 +3,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { props: function () { return { baseCls: "bi-date-time-select", - height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, + editorHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, }; }, @@ -46,7 +46,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: o.height, + height: o.editorHeight, } }, { type: "bi.label", @@ -82,7 +82,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: o.height, + height: o.editorHeight, }, { type: "bi.label", text: ":", @@ -111,7 +111,7 @@ BI.DynamicDateTimeSelect = BI.inherit(BI.Widget, { } }], width: 60, - height: o.height, + height: o.editorHeight, }] }] }; diff --git a/typescript/widget/numberinterval/numberinterval.ts b/typescript/widget/numberinterval/numberinterval.ts index ea51b9550..17ec1d15d 100644 --- a/typescript/widget/numberinterval/numberinterval.ts +++ b/typescript/widget/numberinterval/numberinterval.ts @@ -16,6 +16,7 @@ export declare class NumberInterval extends Single { closeMax?: boolean; validation?: 'invalid' | 'valid'; numTip?: string; + simple?: boolean; } & Single['props']; isStateValid(): boolean;