Skip to content

Commit c288e3d

Browse files
author
pipeline
committed
v23.2.4 is released
1 parent e8ab44b commit c288e3d

File tree

266 files changed

+206
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+206
-226
lines changed

components/barcodegenerator/CHANGELOG.md

Lines changed: 1 addition & 1 deletion

components/base/CHANGELOG.md

Lines changed: 8 additions & 0 deletions

components/base/releasenotes/README.md

Lines changed: 0 additions & 183 deletions
This file was deleted.

components/base/src/template.ts

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function compile(
1212
return (data: any, context: any, propName: any, element: any, root: any): any => {
1313
let returnEle: any;
1414
if (context) {
15-
let plugins: any = context.vueInstance ? context.vueInstance.plugins : null;
15+
let plugins: any = context.vueInstance && context.vueInstance.plugins ? { plugins: context.vueInstance.plugins } : {};
1616
let pid: string = getUniqueID("templateParentDiv");
1717
let id: string = getUniqueID("templateDiv");
1818
let ele: HTMLElement = createElement("div", {
@@ -65,14 +65,14 @@ export function compile(
6565
let tempRef: any;
6666
if (propsData) {
6767
if (templateCompRef.setup) {
68-
tempRef = (<any>Object).assign(templateCompRef.setup(null, { expose: function () {}}), propsData);
68+
tempRef = (<any>Object).assign({}, propsData);
6969
} else {
7070
tempRef = (<any>Object).assign(templateCompRef.data(), propsData);
7171
}
7272
}
7373
else {
7474
if (templateCompRef.setup) {
75-
tempRef = (<any>Object).assign(templateCompRef.setup(null, { expose: function () {}}), dataObj.data);
75+
tempRef = (<any>Object).assign({}, dataObj.data);
7676
} else {
7777
tempRef = (<any>Object).assign(templateCompRef.data(), dataObj.data);
7878
}
@@ -88,12 +88,7 @@ export function compile(
8888
}
8989
}
9090
if (templateCompRef.setup) {
91-
templateCompRef.setup = function (__props: any, { expose: __expose }: any) {
92-
__expose();
93-
const __returned__ = tempRef;
94-
Object.defineProperty(__returned__, '__isScriptSetup', { enumerable: false, value: true });
95-
return __returned__;
96-
}
91+
plugins = (<any>Object).assign(plugins, data);
9792
}
9893
templateCompRef.data = function () { return tempRef; };
9994
let app: any = Vue.createVNode(templateCompRef, plugins);
@@ -150,10 +145,7 @@ export function compile(
150145
templateFunction = Vue.extend(templateFunction);
151146
}
152147
if (templateFunction.options.setup) {
153-
var variables: any = (<any>Object).assign(templateFunction.options.setup(), dataObj.data);
154-
templateFunction.options.setup = function(__props: any) {
155-
return variables;
156-
};
148+
dataObj.propsData = (<any>Object).assign(dataObj.propsData || {}, data);
157149
}
158150
let templateVue: any = new templateFunction(dataObj);
159151
// let templateVue = new Vue(tempObj.template);
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)