Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 3 years ago
parent
commit
23358ef74d
  1. BIN
      dist/font/iconfont.eot
  2. 1668
      dist/font/iconfont.svg
  3. BIN
      dist/font/iconfont.ttf
  4. BIN
      dist/font/iconfont.woff
  5. BIN
      dist/font/iconfont.woff2
  6. 2
      package.json
  7. 10
      src/core/4.widget.js
  8. 76
      src/less/lib/font.less

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

1668
dist/font/iconfont.svg vendored

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 471 KiB

After

Width:  |  Height:  |  Size: 607 KiB

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", "name": "fineui",
"version": "2.0.20220310211329", "version": "2.0.20220311111233",
"description": "fineui", "description": "fineui",
"main": "dist/fineui.min.js", "main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

10
src/core/4.widget.js

@ -147,7 +147,10 @@
self.__async = true; self.__async = true;
var beforeRenderResult = (self.options.beforeRender || self.beforeRender).call(self, render); var beforeRenderResult = (self.options.beforeRender || self.beforeRender).call(self, render);
if (beforeRenderResult instanceof Promise) { if (beforeRenderResult instanceof Promise) {
beforeRenderResult.then(render); beforeRenderResult.then(render).catch(function (e) {
_global.console && console.error(e);
render();
});
} }
} else { } else {
self._render(); self._render();
@ -159,7 +162,10 @@
this.__asking = true; this.__asking = true;
var beforeInitResult = (this.options.beforeInit || this.beforeInit).call(this, init); var beforeInitResult = (this.options.beforeInit || this.beforeInit).call(this, init);
if (beforeInitResult instanceof Promise) { if (beforeInitResult instanceof Promise) {
beforeInitResult.then(init); beforeInitResult.then(init).catch(function (e) {
_global.console && console.error(e);
init();
});
} }
} else { } else {
init(); init();

76
src/less/lib/font.less

@ -1,57 +1,57 @@
//字体库 //字体库
@font-cross: "e6d0"; @font-cross: "e1ab";
@font-circle-close: "e6d5"; @font-circle-close: "e1a9";
@font-search: "e6dc"; @font-search: "e1c3";
@font-date: "e733"; @font-date: "e1d3";
@font-time: "e6b1"; @font-time: "e1ae";
@font-change: "e72f"; @font-change: "e1cd";
@font-dot: "e762"; @font-dot: "e1aa";
@font-plus: "e75b"; @font-plus: "e1a0";
@font-minus: "e75a"; @font-minus: "e19e";
@font-right-triangle: "e70c"; @font-right-triangle: "e1bd";
@font-copy: "e6bd"; @font-copy: "e1ad";
@font-check-mark: "e6cf"; @font-check-mark: "e1b0";
@font-arrow-left: "e70d"; @font-arrow-left: "e1bc";
@font-arrow-right: "e70c"; @font-arrow-right: "e1bd";
@font-up-triangle: "e70a"; @font-up-triangle: "e1c6";
@font-down-triangle: "e70b"; @font-down-triangle: "e1c9";
@font-solid-left: "e6d9"; @font-solid-left: "e1c4";
@font-solid-right: "e6d8"; @font-solid-right: "e1a5";
@font-solid-top: "e6d6"; @font-solid-top: "e1ac";
@font-solid-bottom: "e6d7"; @font-solid-bottom: "e1c0";
@font-trigger-triangle: "e64e"; @font-trigger-triangle: "e1d5";
@font-less: "e75e"; @font-less: "e1d1";
@font-less-equal: "e761"; @font-less-equal: "e1d2";
@font-bold: "e697"; @font-bold: "e19b";
@font-italic: "e69d"; @font-italic: "e199";
@font-underline: "e69c"; @font-underline: "e1d6";
@font-color: "e698"; @font-color: "e198";
@font-background: "e699"; @font-background: "e19a";
@font-color-underline: "e69a"; @font-color-underline: "e19c";
@font-align-left: "e6ca"; @font-align-left: "e1a7";
@font-align-center: "e6bf"; @font-align-center: "e1a2";
@font-align-right: "e6c8"; @font-align-right: "e1af";
@font-tip-error: "e757"; @font-tip-error: "e1da";
@font-tip-success: "e756"; @font-tip-success: "e1db";
@font-tip-warning: "e755"; @font-tip-warning: "e1d7";
@font-tip-message: "e74b"; @font-tip-message: "e1d9";
@font-key: "e740"; @font-key: "e1d0";
@font-add: "e6dd"; @font-add: "e1c7";

Loading…
Cancel
Save