caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Pull request #3555: 无JIRA 抽象类就不用shortcut了 

Merge in VISUAL/fineui from ~DAILER/fineui:es6 to es6

* commit 'a867349e9811230b7f6c5cf94ef1fa09504cf242':
  无JIRA 抽象类就不用shortcut了
  无JIRA 整理一下
es6
Dailer-刘荣歆 2 years ago
parent
d94ec24f15 a867349e98
commit
b1f2a92bbf
6 changed files with 10 additions and 241 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      packages/fineui/src/component/allvaluechooser/abstract.allvaluechooser.js
  2. 15
      packages/fineui/src/polyfill/event.js
  3. 2
      packages/fineui/src/polyfill/index.js
  4. 34
      packages/fineui/src/polyfill/sort.js
  5. 184
      packages/fineui/webpack/attachments.js
  6. 2
      packages/fineui/webpack/webpack.dev.js

14
packages/fineui/src/component/allvaluechooser/abstract.allvaluechooser.js
Unescape View File

@ -1,5 +1,4 @@
import {
shortcut,
Widget,
extend,
emptyFn,
@ -17,7 +16,6 @@ import {
} from "@/core";
import { MultiSelectCombo } from "@/widget";
@shortcut()
export class AbstractAllValueChooser extends Widget {
_const = { perPage: 100 };
@ -42,12 +40,12 @@ export class AbstractAllValueChooser extends Widget {
// 需要考虑到value也可能是数字
if (item.value === v || `${item.value}` === v) {
text = item.text;
return true;
}
});
}
return text;
}
@ -56,7 +54,7 @@ export class AbstractAllValueChooser extends Widget {
for (let i = (times - 1) * this._const.perPage; items[i] && i < times * this._const.perPage; i++) {
res.push(items[i]);
}
return res;
}
@ -99,12 +97,12 @@ export class AbstractAllValueChooser extends Widget {
callback({
items: resultItems,
});
return;
}
if (options.type === MultiSelectCombo.REQ_GET_DATA_LENGTH) {
callback({ count: resultItems.length });
return;
}
callback({
@ -126,7 +124,7 @@ export class AbstractAllValueChooser extends Widget {
};
}
}
return value;
}
}

15
packages/fineui/src/polyfill/event.js
Unescape View File

@ -1,15 +0,0 @@
const isIE = () => typeof window.CustomEvent !== "function";
if (isIE()) {
function CustomEvent(event, params) {
params = params || { bubbles: false, cancelable: false, detail: undefined };
const evt = document.createEvent("CustomEvent");
evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);
return evt;
}
CustomEvent.prototype = window.Event.prototype;
window.CustomEvent = CustomEvent;
}

2
packages/fineui/src/polyfill/index.js
Unescape View File

@ -1,3 +1 @@
export * from "./event";
export * from "./number";
export * from "./sort";

34
packages/fineui/src/polyfill/sort.js
Unescape View File

@ -1,34 +0,0 @@
// 修复ie9下sort方法的bug
// IE的sort 需要显示声明返回-1, 0, 1三种比较结果才可正常工作，而Chrome， Firefox中可以直接返回true, false等
// BI-36544 sort提供的参数就可以自定义返回值，不需要特别控制。这边使用冒泡相较于快排可能慢了点。
// 这边先将webkit的限制去掉
!function (window) {
var ua = window.navigator.userAgent.toLowerCase(),
reg = /msie/;
if (reg.test(ua)) {
var _sort = Array.prototype.sort;
Array.prototype.sort = function (fn) {
if (!!fn && typeof fn === "function") {
if (this.length < 2) {
return this;
}
var i = 0, j = i + 1, l = this.length, tmp, r = false, t = 0;
for (; i < l; i++) {
for (j = i + 1; j < l; j++) {
t = fn.call(this, this[i], this[j]);
r = (typeof t === "number" ? t :
t ? 1 : 0) > 0;
if (r === true) {
tmp = this[i];
this[i] = this[j];
this[j] = tmp;
}
}
}
return this;
}
return _sort.call(this);
};
}
}(window);

184
packages/fineui/webpack/attachments.js
Unescape View File

@ -1,70 +1,16 @@
const { sync, uniq } = require("./utils");
const workerCompact = "./dist/fix/worker.compact.js";
const lodashJs = "src/core/1.lodash.js";
const jqueryPolyfill = "./src/core/platform/web/jquery/jquery.polyfill.js";
const configJS = "./src/core/platform/web/config.js";
const runtimePolyfill = [];
const runtimePolyfill = ["core-js/stable"];
const basicAttachmentMap = {
polyfill: sync(["src/core/0.foundation.js", "src/polyfill/**/*.js"]).concat(runtimePolyfill),
core: sync([
"src/less/core/**/*.less",
"src/less/theme/**/*.less"
// lodashJs,
// jqueryJs,
// "src/core/**/*.js",
// "src/data/**/*.js",
]),
// 最基础的控件
base: sync([
"src/less/base/**/*.less"
// "src/third/**/*.js",
// "src/base/**/*.js",
]),
// 实现好的一些基础实例
case: sync([
// "src/case/**/*.js",
"src/less/case/**/*.less"
]),
widget: sync([
"src/less/widget/**/*.less",
"src/less/component/**/*.less"
// "src/widget/**/*.js",
// "src/component/**/*.js",
]),
router: sync(["src/router/**/*.js"]),
core_without_platform: sync(
["src/core/0.foundation.js", lodashJs, "src/core/**/*.js", "src/data/**/*.js"],
["src/core/platform/**/*.js", "src/core/controller/**/*.js"]
),
core_without_normalize: sync(
["src/less/core/**/*.less", "src/less/theme/**/*.less"],
["src/less/core/normalize.less", "src/less/core/normalize2.less"]
),
core_without_conflict: sync(
["src/less/core/**/*.less", "src/less/theme/**/*.less", lodashJs, "src/core/**/*.js", "src/data/**/*.js"],
["src/core/conflict.js"]
),
polyfill: sync(["src/polyfill/**/*.js"]).concat(runtimePolyfill),
resource: sync(["src/less/resource/**/*.less"]),
font: sync(["public/less/font.less"]),
ts: ["./typescript/bundle.ts"],
ui: sync(["ui/less/app.less", "ui/less/**/*.less", "ui/js/**/*.js"]),
config: sync(["demo/version.js", "i18n/i18n.cn.js"]),
utils: sync([
"src/core/0.foundation.js",
lodashJs,
"src/core/constant/**/*.js",
"src/core/func/**/*.js",
"src/core/2.base.js",
"src/core/3.ob.js",
"src/core/5.inject.js",
"src/core/utils/*.js",
"i18n/i18n.cn.js",
"_mobile/date.i18n.cn.js",
"src/data/**/*.js"
]),
less: sync([
"src/less/core/**/*.less",
"src/less/theme/**/*.less",
@ -76,69 +22,8 @@ const basicAttachmentMap = {
js_bundle: sync(["src/bundle.js"])
};
const bundle = [].concat(
basicAttachmentMap.polyfill,
basicAttachmentMap.core,
basicAttachmentMap.fix,
basicAttachmentMap.base,
basicAttachmentMap.case,
basicAttachmentMap.widget,
sync(["public/less/app.less", "public/less/**/*.less"]),
[workerCompact],
basicAttachmentMap.router,
sync(["public/js/**/*.js", "public/js/index.js", "i18n/i18n.cn.js"]),
basicAttachmentMap.ts
);
const bundleCss = [].concat(basicAttachmentMap.less, sync(["public/less/app.less", "public/less/**/*.less"]));
// const bundleModern = [].concat(
// sync(["src/less/modern.less"]),
// sync(["public/modern/app.less", "public/modern/**/*.less"]),
// );
const coreJs = [].concat(
basicAttachmentMap.polyfill,
basicAttachmentMap.core,
basicAttachmentMap.fix,
basicAttachmentMap.base,
basicAttachmentMap.case,
basicAttachmentMap.widget,
basicAttachmentMap.router,
basicAttachmentMap.ts
);
const resource = sync(["private/less/app.less", "private/less/**/*.less"]);
const config = sync(["public/js/**/*.js", "public/js/index.js", "i18n/i18n.cn.js"]);
const bundleWithoutNormalize = [].concat(
basicAttachmentMap.core_without_normalize,
sync(
[
"src/less/base/**/*.less",
"src/less/case/**/*.less",
"src/less/widget/**/*.less",
"src/less/component/**/*.less",
"public/less/**/*.less"
// ts的less
],
["public/less/app.less"]
)
);
const fineuiWithoutNormalize = [].concat(
basicAttachmentMap.core_without_normalize,
sync([
"src/less/base/**/*.less",
"src/less/case/**/*.less",
"src/less/widget/**/*.less",
"src/less/component/**/*.less",
"ui/less/app.less",
"ui/less/**/*.less"
])
);
const fineui = [].concat(
bundleCss,
basicAttachmentMap.polyfill,
@ -155,70 +40,7 @@ const fineuiForWorker = [].concat(
basicAttachmentMap.ts
);
const fineuiWithoutConflict = [].concat(
basicAttachmentMap.core_without_conflict,
basicAttachmentMap.fix,
basicAttachmentMap.base,
basicAttachmentMap.case,
basicAttachmentMap.widget,
basicAttachmentMap.router,
[workerCompact],
basicAttachmentMap.ui,
basicAttachmentMap.ts,
basicAttachmentMap.polyfill
);
// const fineuiModern = [].concat(
// sync(["src/less/modern.less"]),
// sync([
// 'ui/modern/app.less',
// 'ui/modern/**/*.less',
// ]),
// );
const fineuiProxy = [].concat(
basicAttachmentMap.polyfill,
basicAttachmentMap.core,
basicAttachmentMap.fixProxy,
basicAttachmentMap.base,
basicAttachmentMap.case,
basicAttachmentMap.widget,
basicAttachmentMap.router,
[workerCompact],
basicAttachmentMap.ui,
basicAttachmentMap.ts
);
const demo = [].concat(
basicAttachmentMap.polyfill,
basicAttachmentMap.core,
basicAttachmentMap.fix,
basicAttachmentMap.config,
basicAttachmentMap.base,
basicAttachmentMap.case,
basicAttachmentMap.widget,
basicAttachmentMap.router,
sync(["public/less/app.less", "public/less/**/*.less"]),
[workerCompact],
basicAttachmentMap.ts,
sync(["demo/less/*.less", "demo/less/**/*.less", "demo/app.js", "demo/js/**/*.js", "demo/config.js"])
);
module.exports = {
lodash: lodashJs,
font: basicAttachmentMap.font,
bundle: uniq(bundle),
fineuiWithoutNormalize: uniq(fineuiWithoutNormalize),
fineuiWithoutConflict: uniq(fineuiWithoutConflict),
bundleWithoutNormalize: uniq(bundleWithoutNormalize),
fineui: uniq(fineui),
fineuiProxy: uniq(fineuiProxy),
fineuiForWorker: uniq(fineuiForWorker),
utils: uniq(basicAttachmentMap.utils),
demo: uniq(demo),
coreWithoutPlatform: uniq(basicAttachmentMap.core_without_platform),
coreJs: uniq(coreJs),
resource: uniq(resource),
config: uniq(config),
bundleCss: uniq(bundleCss)
fineuiForWorker: uniq(fineuiForWorker)
};

2
packages/fineui/webpack/webpack.dev.js
Unescape View File

@ -16,5 +16,5 @@ module.exports = merge(common, {
devServer: {
port: 9001,
// liveReload: true,
},
}
});

Write Preview
Loading…
Cancel
Save