From 9a257c0d01115d65979a3b8efd9f59029b8e24a4 Mon Sep 17 00:00:00 2001 From: jian Date: Thu, 14 Sep 2023 22:24:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/webpack/attachments.js | 6 ++++++ packages/fineui/webpack/webpack.prod.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/fineui/webpack/attachments.js b/packages/fineui/webpack/attachments.js index 7f4cfa185..0f136a8ec 100644 --- a/packages/fineui/webpack/attachments.js +++ b/packages/fineui/webpack/attachments.js @@ -38,8 +38,14 @@ const fineuiForWorker = [].concat( basicAttachmentMap.ts ); +const fineuiForV8Export = [...fineuiForWorker].concat( + configJS +); + + module.exports = { fineui: uniq(fineui), fineuiForWorker: uniq(fineuiForWorker), + fineuiForV8Export: uniq(fineuiForV8Export), bundleCss, }; diff --git a/packages/fineui/webpack/webpack.prod.js b/packages/fineui/webpack/webpack.prod.js index d1d7b9ffc..da8fac621 100644 --- a/packages/fineui/webpack/webpack.prod.js +++ b/packages/fineui/webpack/webpack.prod.js @@ -11,7 +11,7 @@ module.exports = merge(common, { "fineui.min": attachments.fineui, "fineui.worker.min": attachments.fineuiForWorker, "fineui.worker": attachments.fineuiForWorker, - "fineui_without_jquery_polyfill.min":attachments.fineuiForWorker, + "fineui_without_jquery_polyfill.min": attachments.fineuiForV8Export, }, output: { From 130b36aaf459569184f78b264acd679f0796bb49 Mon Sep 17 00:00:00 2001 From: jian Date: Thu, 14 Sep 2023 22:25:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/webpack/attachments.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fineui/webpack/attachments.js b/packages/fineui/webpack/attachments.js index 0f136a8ec..edee137f1 100644 --- a/packages/fineui/webpack/attachments.js +++ b/packages/fineui/webpack/attachments.js @@ -42,7 +42,6 @@ const fineuiForV8Export = [...fineuiForWorker].concat( configJS ); - module.exports = { fineui: uniq(fineui), fineuiForWorker: uniq(fineuiForWorker), From 67e6d3a3b127cb28e1eac435a3bf6022e45b8f94 Mon Sep 17 00:00:00 2001 From: jian Date: Thu, 14 Sep 2023 22:45:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=9B=9E?= =?UTF-8?q?=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/webpack/attachments.js | 6 +-- packages/fineui/webpack/webpack.prod.js | 49 +++++++++++++------------ 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/packages/fineui/webpack/attachments.js b/packages/fineui/webpack/attachments.js index edee137f1..6bb4b8110 100644 --- a/packages/fineui/webpack/attachments.js +++ b/packages/fineui/webpack/attachments.js @@ -38,13 +38,9 @@ const fineuiForWorker = [].concat( basicAttachmentMap.ts ); -const fineuiForV8Export = [...fineuiForWorker].concat( - configJS -); - module.exports = { fineui: uniq(fineui), fineuiForWorker: uniq(fineuiForWorker), - fineuiForV8Export: uniq(fineuiForV8Export), + fineuiForV8Export: uniq(fineuiForWorker), bundleCss, }; diff --git a/packages/fineui/webpack/webpack.prod.js b/packages/fineui/webpack/webpack.prod.js index da8fac621..aa32489ea 100644 --- a/packages/fineui/webpack/webpack.prod.js +++ b/packages/fineui/webpack/webpack.prod.js @@ -1,24 +1,25 @@ -const common = require("./webpack.common.js"); -const { merge } = require("webpack-merge"); -const dirs = require("./dirs"); -const attachments = require("./attachments"); - -module.exports = merge(common, { - mode: "production", - target: ["web", "es5"], - - entry: { - "fineui.min": attachments.fineui, - "fineui.worker.min": attachments.fineuiForWorker, - "fineui.worker": attachments.fineuiForWorker, - "fineui_without_jquery_polyfill.min": attachments.fineuiForV8Export, - }, - - output: { - path: dirs.DEST, - filename: "[name].js", - publicPath: "" - }, - - devtool: "hidden-source-map" -}); +const common = require("./webpack.common.js"); +const { merge } = require("webpack-merge"); +const dirs = require("./dirs"); +const attachments = require("./attachments"); + +module.exports = merge(common, { + mode: "production", + target: ["web", "es5"], + + entry: { + "fineui.min": attachments.fineui, + "fineui.worker.min": attachments.fineuiForWorker, + "fineui.worker": attachments.fineuiForWorker, + "fineui_without_jquery_polyfill.min": attachments.fineuiForWorker, + "fineui_without_jquery_polyfill": attachments.fineuiForWorker, + }, + + output: { + path: dirs.DEST, + filename: "[name].js", + publicPath: "" + }, + + devtool: "hidden-source-map" +}); From b2b59c9d40b7372d87589507b40c69bcc297b450 Mon Sep 17 00:00:00 2001 From: jian Date: Sun, 17 Sep 2023 23:31:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?KERNEL-16294=20fix:=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=80=82=E9=85=8D1=E3=80=81=E5=AF=BC=E5=87=BAwidgetEngin?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E7=9A=84Element=E6=B2=A1=E6=9C=89width?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E9=80=9A=E8=BF=87css=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=202=E3=80=81=E6=89=93=E5=8C=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=8E=A7=E4=BB=B6fineuiwithoutjquery=20=3D?= =?UTF-8?q?=20worker+=E5=9F=BA=E6=9C=AC=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 ++++---- .../core/wrapper/layout/flex/flex.horizontal.js | 6 +++--- packages/fineui/src/without_Jquery_Polyfill.js | 14 ++++++++++++++ packages/fineui/webpack/attachments.js | 8 +++++++- packages/fineui/webpack/webpack.common.js | 2 ++ packages/fineui/webpack/webpack.dev.js | 7 +++++++ packages/fineui/webpack/webpack.prod.js | 4 +--- 7 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 packages/fineui/src/without_Jquery_Polyfill.js diff --git a/package.json b/package.json index 5289f3a76..992970812 100644 --- a/package.json +++ b/package.json @@ -41,17 +41,17 @@ "less-loader": "^11.1.0", "mini-css-extract-plugin": "^2.7.5", "npm-run-all": "^4.1.5", - "prettier": "^3.0.0", "postcss": "^8.4.21", "postcss-loader": "^7.1.0", + "prettier": "^3.0.0", "style-loader": "^3.3.1", "terser-webpack-plugin": "^5.3.7", "ts-node": "^10.9.1", "typescript": "^4.9.5", "webpack": "^5.75.0", "webpack-bundle-analyzer": "^4.8.0", - "webpack-cli": "^5.0.1", - "webpack-dev-server": "^4.11.1", - "webpack-merge": "^5.8.0" + "webpack-cli": "^5.1.4", + "webpack-dev-server": "^4.15.1", + "webpack-merge": "^5.9.0" } } diff --git a/packages/fineui/src/core/wrapper/layout/flex/flex.horizontal.js b/packages/fineui/src/core/wrapper/layout/flex/flex.horizontal.js index 7489d30a7..04801dd0e 100644 --- a/packages/fineui/src/core/wrapper/layout/flex/flex.horizontal.js +++ b/packages/fineui/src/core/wrapper/layout/flex/flex.horizontal.js @@ -51,7 +51,7 @@ export class FlexHorizontalLayout extends Layout { if (o.columnSize.length > 0) { return o.columnSize.indexOf("fill") >= 0 || o.columnSize.indexOf("auto") >= 0; } - + return some(o.items, (i, item) => { if (item.width === "fill" || item.width === "auto") { return true; @@ -87,7 +87,7 @@ export class FlexHorizontalLayout extends Layout { } } if (columnSize > 0) { - w.element.width(this._optimiseGap(columnSize)); + w.element.css({ width: this._optimiseGap(columnSize) }); } if (columnSize === "fill") { w.element.addClass("f-f"); @@ -103,7 +103,7 @@ export class FlexHorizontalLayout extends Layout { w.element.addClass("l-c"); } this._handleGap(w, item, i); - + return w; } diff --git a/packages/fineui/src/without_Jquery_Polyfill.js b/packages/fineui/src/without_Jquery_Polyfill.js new file mode 100644 index 000000000..369bc3a7f --- /dev/null +++ b/packages/fineui/src/without_Jquery_Polyfill.js @@ -0,0 +1,14 @@ +export * from './worker.js'; + +// "!src/base/single/input/file.js", +// "!src/case/ztree/**/*.js", +import * as _case from './case'; +import * as _widget from './widget'; +import { _global } from "@/core/0.foundation"; + +const fuiExport = { + ..._case, + ..._widget +}; + +Object.assign(_global.BI, fuiExport); diff --git a/packages/fineui/webpack/attachments.js b/packages/fineui/webpack/attachments.js index 6bb4b8110..d4c62fa4a 100644 --- a/packages/fineui/webpack/attachments.js +++ b/packages/fineui/webpack/attachments.js @@ -21,6 +21,7 @@ const basicAttachmentMap = { ]), js_bundle: sync(["src/bundle.js"]), js_worker: sync(["src/worker.js"]), + js_without_Jquery_polyfill: sync(["src/without_Jquery_Polyfill.js"]), }; const bundleCss = uniq([].concat(basicAttachmentMap.less, basicAttachmentMap.ui, sync(["public/less/app.less", "public/less/**/*.less"]))); @@ -38,9 +39,14 @@ const fineuiForWorker = [].concat( basicAttachmentMap.ts ); +const fineuiWithout_Jquery_Polyfill = [].concat( + basicAttachmentMap.js_withoutJquery, + basicAttachmentMap.ts +); + module.exports = { fineui: uniq(fineui), fineuiForWorker: uniq(fineuiForWorker), - fineuiForV8Export: uniq(fineuiForWorker), + fineuiWithout_Jquery_Polyfill: uniq(fineuiWithout_Jquery_Polyfill), bundleCss, }; diff --git a/packages/fineui/webpack/webpack.common.js b/packages/fineui/webpack/webpack.common.js index 530372b1a..1e7ce36b4 100644 --- a/packages/fineui/webpack/webpack.common.js +++ b/packages/fineui/webpack/webpack.common.js @@ -25,6 +25,8 @@ function git(command) { module.exports = { entry: { fineui: attachments.fineui, + "fineui.worker": attachments.fineuiForWorker, + "fineui_without_jquery_polyfill": attachments.fineuiWithout_Jquery_Polyfill, }, externals: { lodash: "_", diff --git a/packages/fineui/webpack/webpack.dev.js b/packages/fineui/webpack/webpack.dev.js index e858e890b..3b795e02d 100644 --- a/packages/fineui/webpack/webpack.dev.js +++ b/packages/fineui/webpack/webpack.dev.js @@ -16,5 +16,12 @@ module.exports = merge(common, { devServer: { port: 9001, // liveReload: true, + client: { + logging: 'error', + overlay: { + errors: true, + warnings: false, + }, + }, } }); diff --git a/packages/fineui/webpack/webpack.prod.js b/packages/fineui/webpack/webpack.prod.js index aa32489ea..6df850f63 100644 --- a/packages/fineui/webpack/webpack.prod.js +++ b/packages/fineui/webpack/webpack.prod.js @@ -10,9 +10,7 @@ module.exports = merge(common, { entry: { "fineui.min": attachments.fineui, "fineui.worker.min": attachments.fineuiForWorker, - "fineui.worker": attachments.fineuiForWorker, - "fineui_without_jquery_polyfill.min": attachments.fineuiForWorker, - "fineui_without_jquery_polyfill": attachments.fineuiForWorker, + "fineui_without_jquery_polyfill.min": attachments.fineuiWithout_Jquery_Polyfill, }, output: {