Browse Source

Pull request #2154: 无JIRA任务 整理一下

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'dcf4409503747b4bc6be465a90b9c9dd9ed55ac3':
  整理代码
es6
guy 3 years ago
parent
commit
d2ddfa49c0
  1. 240
      examples/dev.html
  2. 30
      examples/hooks.html
  3. 2
      examples/virtual-group.html
  4. 6
      src/core/4.widget.js
  5. 2
      src/core/5.shortcut.js

240
examples/dev.html

@ -9,112 +9,200 @@
<body> <body>
<div id="wrapper"></div> <div id="wrapper"></div>
<script> <script>
!(function () { var Model = BI.inherit(Fix.Model, {
state: function () {
return {
expand: false,
showClearAll: false,
hasUndo: false,
hasRedo: false
};
},
var element2InstanceMap = new WeakMap(); computed: {
expandText: function () {
return this.model.expand ? "expand" : "not-expand";
},
clearAllText: function () {
return this.model.showClearAll ? "showClearAll" : "not-showClearAll";
},
undoText: function () {
return this.model.hasUndo ? "hasUndo" : "not-hasUndo";
},
redoText: function () {
return this.model.hasRedo ? "hasRedo" : "not-hasRedo";
}
},
BI.getInstanceByElement = function (element) { actions: {
return element2InstanceMap.get(element); setExpand: function () {
}; this.model.expand = !this.model.expand;
},
setClearAll: function () {
this.model.showClearAll = !this.model.showClearAll;
},
setUndo: function () {
this.model.hasUndo = !this.model.hasUndo;
},
setRedo: function () {
this.model.hasRedo = !this.model.hasRedo;
}
}
});
BI.Plugin.config(function (options) { BI.model("demo.model", Model);
function useExpand () {
var button;
var store = BI.useStore();
BI.onBeforeMount(function () {
}, function (shortcut, instance) {
instance.element.attr("shortcut", shortcut);
if (instance.options.$testId) {
setIDAttribute(instance.element[0], instance.options.$testId);
}
element2InstanceMap.set(instance.element[0], instance);
}); });
BI.onMounted(function () {
function setIDAttribute (element, id) { });
if (element.id !== "") { BI.onBeforeUnmount(function () {
throw new Error("不能修改有默认id的元素");
}
element.setAttribute("id", id);
}
function registerWidgetIdGenerator () { });
BI.onUnmounted(function () {
const idSet = new Set(); });
BI.watch("expandText", function (val) {
button.setText(val);
});
return function () {
return {
type: "bi.button",
ref: function (_ref) {
button = _ref;
},
text: store.model.expandText,
handler: function () {
store.setExpand();
}
};
};
}
function useClearAll () {
var button;
var store = BI.useStore();
BI.onBeforeMount(function () {
});
BI.onMounted(function () {
});
BI.onBeforeUnmount(function () {
});
BI.onUnmounted(function () {
return function (shortcut, id) { });
if (idSet.has(id)) { BI.watch("clearAllText", function (val) {
throw new Error("id重复了"); button.setText(val);
});
return function () {
return {
type: "bi.button",
ref: function (_ref) {
button = _ref;
},
text: store.model.clearAllText,
handler: function () {
store.setClearAll();
} }
idSet.add(id);
BI.Plugin.registerObject(shortcut, function (widget) {
setIDAttribute(widget.element[0], id);
});
}; };
} };
}
BI.registerWidgetId = registerWidgetIdGenerator(); function useUndo () {
}()); var button;
</script> var store = BI.useStore();
<script> BI.onBeforeMount(function () {
function setTestId (parentShortcut, childShortcut, testId) {
BI.Plugin.configRender(parentShortcut, function (rendered) {
var queue = BI.isArray(rendered) ? rendered : [rendered];// 广度遍历
while (queue.length > 0) {
var element = queue.shift();
BI.each(element, function (key, value) {
if (BI.isArray(value)) {
queue = queue.concat(value);
} else if (BI.isPlainObject(value)) {
queue.push(value);
} else if ("type" === key && value === childShortcut) {
element.$testId = testId;
}
});
}
return rendered;
}); });
BI.onMounted(function () {
});
BI.onBeforeUnmount(function () {
});
BI.onUnmounted(function () {
});
BI.watch("undoText", function (val) {
button.setText(val);
});
return function () {
return {
type: "bi.button",
ref: function (_ref) {
button = _ref;
},
text: store.model.undoText,
handler: function () {
store.setUndo();
}
};
};
} }
setTestId("demo.parent", "bi.button_group", "测试testId"); function useRedo () {
var button;
var store = BI.useStore();
BI.onBeforeMount(function () {
});
BI.onMounted(function () {
});
BI.onBeforeUnmount(function () {
});
BI.onUnmounted(function () {
});
BI.watch("redoText", function (val) {
button.setText(val);
});
return function () {
return {
type: "bi.button",
ref: function (_ref) {
button = _ref;
},
text: store.model.redoText,
handler: function () {
store.setRedo();
}
};
};
}
var Widget = BI.inherit(BI.Widget, { var Widget = BI.inherit(BI.Widget, {
_store: function () {
return BI.Models.getModel("demo.model");
},
setup: function () { setup: function () {
var list; var expandComponent = useExpand();
var clearAllComponent = useClearAll();
var undoComponent = useUndo();
var redoComponent = useRedo();
return function () { return function () {
return { return {
type: "bi.vertical", type: "bi.vertical",
items: [{ items: [expandComponent(), clearAllComponent(), undoComponent(), redoComponent()]
type: "bi.button_group",
height: 100,
ref: function (_ref) {
list = _ref;
},
items: BI.range(10).map(function (i) {
return {
type: "bi.label",
text: i,
cls: "bi-border"
};
}),
layouts: [{
type: "bi.inline",
tgap: 10,
lgap: 10
}]
}, {
type: "bi.button",
text: "点击",
handler: function () {
}
}]
}; };
}; };
} }
}); });
BI.shortcut("demo.parent", Widget); BI.shortcut("demo.hooks", Widget);
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
items: [{ items: [{
el: { el: {
type: "demo.parent" type: "demo.hooks"
}, },
top: 100, top: 100,
left: 100 left: 100

30
examples/hooks.html

@ -51,9 +51,9 @@
BI.model("demo.model", Model); BI.model("demo.model", Model);
function expandFunction (storeCreator) { function useExpand () {
var button; var button;
var store = BI.useStore(storeCreator); var store = BI.useStore();
BI.onBeforeMount(function () { BI.onBeforeMount(function () {
}); });
@ -83,9 +83,9 @@
}; };
} }
function clearAllFunction (storeCreator) { function useClearAll () {
var button; var button;
var store = BI.useStore(storeCreator); var store = BI.useStore();
BI.onBeforeMount(function () { BI.onBeforeMount(function () {
}); });
@ -115,9 +115,9 @@
}; };
} }
function undoFunction (storeCreator) { function useUndo () {
var button; var button;
var store = BI.useStore(storeCreator); var store = BI.useStore();
BI.onBeforeMount(function () { BI.onBeforeMount(function () {
}); });
@ -147,9 +147,9 @@
}; };
} }
function redoFunction (storeCreator) { function useRedo () {
var button; var button;
var store = BI.useStore(storeCreator); var store = BI.useStore();
BI.onBeforeMount(function () { BI.onBeforeMount(function () {
}); });
@ -180,14 +180,14 @@
} }
var Widget = BI.inherit(BI.Widget, { var Widget = BI.inherit(BI.Widget, {
_store: function () {
return BI.Models.getModel("demo.model");
},
setup: function () { setup: function () {
var storeCreator = function () { var expandComponent = useExpand();
return BI.Models.getModel("demo.model"); var clearAllComponent = useClearAll();
}; var undoComponent = useUndo();
var expandComponent = expandFunction(storeCreator); var redoComponent = useRedo();
var clearAllComponent = clearAllFunction(storeCreator);
var undoComponent = undoFunction(storeCreator);
var redoComponent = redoFunction(storeCreator);
return function () { return function () {
return { return {
type: "bi.vertical", type: "bi.vertical",

2
examples/virtual-group.html

@ -11,7 +11,7 @@
var Widget = BI.inherit(BI.Widget, { var Widget = BI.inherit(BI.Widget, {
props: { props: {
vdom: true // vdom: true
}, },
watch: { watch: {
text: function () { text: function () {

6
src/core/4.widget.js

@ -701,6 +701,7 @@
return current.$storeDelegate; return current.$storeDelegate;
} }
if (current) { if (current) {
var currentStore = current._store;
var delegate = {}, origin; var delegate = {}, origin;
if (_global.Proxy) { if (_global.Proxy) {
var proxy = new Proxy(delegate, { var proxy = new Proxy(delegate, {
@ -712,13 +713,14 @@
} }
}); });
current._store = function () { current._store = function () {
origin = _store.apply(this, arguments); origin = (_store || currentStore).apply(this, arguments);
delegate.$delegate = origin;
return origin; return origin;
}; };
return current.$storeDelegate = proxy; return current.$storeDelegate = proxy;
} }
current._store = function () { current._store = function () {
var st = _store.apply(this, arguments); var st = (_store || currentStore).apply(this, arguments);
BI.extend(delegate, st); BI.extend(delegate, st);
return st; return st;
}; };

2
src/core/5.shortcut.js

@ -25,8 +25,8 @@
BI.Widget.pushContext(context); BI.Widget.pushContext(context);
} }
widget._initProps(config); widget._initProps(config);
widget._constructed();
widget._initRoot(); widget._initRoot();
widget._constructed();
// if (!lazy || config.element || config.root) { // if (!lazy || config.element || config.root) {
widget._lazyConstructor(); widget._lazyConstructor();
// } // }

Loading…
Cancel
Save