diff --git a/bin/cli/worker/template/main_thread.helper.t b/bin/cli/worker/template/main_thread.helper.t index 19ac36016..2ee06acb7 100644 --- a/bin/cli/worker/template/main_thread.helper.t +++ b/bin/cli/worker/template/main_thread.helper.t @@ -2,7 +2,7 @@ import { ${WorkerName}MainThreadWorker } from './main_thread/${workerName}_main_ // 不需要一起打包的话则不需要引入这行 // FuiWorkerPlugin中的属性会同步到fui-worker中,同时支持loader行内传入属性 // 根据实际需求传入inline,返回格式 true -> blob url,false -> servicePath -import { workerUrl } from 'fui-worker!./worker_thread/${workerName}_worker_thread'; +import workerUrl from 'fui-worker!./worker_thread/${workerName}_worker_thread'; export class ${WorkerName}WorkerHelper { private worker: ${WorkerName}MainThreadWorker; diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot index e80c660e5..ac0a97fe4 100644 Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index 193c5da6a..ed9114ed8 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 0eae8de52..fb9750bb1 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 637a9d9ad..dbb237c0f 100644 Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ diff --git a/package.json b/package.json index c39aed465..55640e6d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220905204735", + "version": "2.0.20220906172430", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", diff --git a/src/base/single/input/radio/radio.js b/src/base/single/input/radio/radio.js index 68c695277..f84cf4038 100644 --- a/src/base/single/input/radio/radio.js +++ b/src/base/single/input/radio/radio.js @@ -12,7 +12,7 @@ BI.Radio = BI.inherit(BI.BasicButton, { width: 16, height: 16, iconWidth: 16, - iconHeight: 16, + iconHeight: 16 }, render: function () { diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js index 3bcde5823..2aa22aad5 100644 --- a/src/widget/multiselect/multiselect.loader.js +++ b/src/widget/multiselect/multiselect.loader.js @@ -20,6 +20,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { itemFormatter: BI.emptyFn, onLoaded: BI.emptyFn, itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, + isDefaultInit: false, }); }, @@ -45,7 +46,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { onLoaded: opts.onLoaded, el: { type: "bi.multi_select_inner_loader", - isDefaultInit: false, + isDefaultInit: opts.isDefaultInit, } }, opts.el), itemsCreator: function (op, callback) { diff --git a/src/widget/multiselectlist/multiselectlist.insert.js b/src/widget/multiselectlist/multiselectlist.insert.js index 277ee20a9..3311d3536 100644 --- a/src/widget/multiselectlist/multiselectlist.insert.js +++ b/src/widget/multiselectlist/multiselectlist.insert.js @@ -34,6 +34,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, { }, // onLoaded: o.onLoaded, el: {}, + isDefaultInit: true, value: o.value }); this.adapter.on(BI.MultiSelectLoader.EVENT_CHANGE, function () { diff --git a/src/widget/multiselectlist/multiselectlist.js b/src/widget/multiselectlist/multiselectlist.js index eccc18581..eb0baaed1 100644 --- a/src/widget/multiselectlist/multiselectlist.js +++ b/src/widget/multiselectlist/multiselectlist.js @@ -31,6 +31,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, { logic: { dynamic: false }, + isDefaultInit: true, // onLoaded: o.onLoaded, el: {} }); diff --git a/webpack/attachments.js b/webpack/attachments.js index cf26e9d09..bf16b1505 100644 --- a/webpack/attachments.js +++ b/webpack/attachments.js @@ -7,8 +7,13 @@ const workerCompact = './dist/fix/worker.compact.js'; const lodashJs = "src/core/1.lodash.js"; const jqueryJs = "src/core/platform/web/jquery/_jquery.js"; +const runtimePolyfill = ["@babel/polyfill", "es6-promise/auto"]; + const basicAttachmentMap = { - polyfill: sync(["src/core/0.foundation.js", "src/polyfill/**/*.js"]).concat(["@babel/polyfill", "es6-promise/auto"]), + polyfill: sync([ + "src/core/0.foundation.js", + "src/polyfill/**/*.js", + ]).concat(runtimePolyfill), core: sync([ "src/less/core/**/*.less", "src/less/theme/**/*.less", @@ -202,6 +207,7 @@ const fineuiProxy = [].concat( ); const fineuiWithoutJqueryAndPolyfillJs = [].concat( + runtimePolyfill, sync([ "src/core/0.foundation.js", lodashJs,