Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

es6
zsmj 2 years ago
parent
commit
4ef2af58d4
  1. 2
      bin/cli/worker/template/main_thread.helper.t
  2. BIN
      dist/font/iconfont.eot
  3. BIN
      dist/font/iconfont.ttf
  4. BIN
      dist/font/iconfont.woff
  5. BIN
      dist/font/iconfont.woff2
  6. 2
      package.json
  7. 2
      src/base/single/input/radio/radio.js
  8. 3
      src/widget/multiselect/multiselect.loader.js
  9. 1
      src/widget/multiselectlist/multiselectlist.insert.js
  10. 1
      src/widget/multiselectlist/multiselectlist.js
  11. 8
      webpack/attachments.js

2
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 urlfalse -> 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;

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

BIN
dist/font/iconfont.woff2 vendored

Binary file not shown.

2
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",

2
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 () {

3
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) {

1
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 () {

1
src/widget/multiselectlist/multiselectlist.js

@ -31,6 +31,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
logic: {
dynamic: false
},
isDefaultInit: true,
// onLoaded: o.onLoaded,
el: {}
});

8
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,

Loading…
Cancel
Save