Skip to content

Commit a04d683

Browse files
LeecasonLeecason
committed
fix: vue2 and 3 render func
1 parent d49c1fd commit a04d683

File tree

3 files changed

+85
-76
lines changed

3 files changed

+85
-76
lines changed

‎src/components/RoughNotation.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,14 @@ export default (options) =>
157157
},
158158
},
159159

160-
render() {
160+
render(h2) {
161161
const slot =
162162
typeof this.$slots.default === 'function'
163163
? this.$slots.default()
164164
: this.$slots.default;
165165

166166
if (this.tag) {
167-
return h(this.tag, null, slot);
167+
return h2(this.tag, null, slot);
168168
}
169169

170170
return slot && slot[0];

‎src/components/RoughNotationGroup.js‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,23 @@ export default defineComponent({
104104
},
105105
},
106106

107-
render() {
108-
const slot =
109-
typeof this.$slots.default === 'function'
110-
? this.$slots.default()
111-
: this.$slots.default;
107+
render(h2) {
108+
// vue2
109+
if (h2 && typeof h2 === 'function') {
110+
const slot = this.$slots.default;
111+
112+
if (this.tag) {
113+
return h2(this.tag, {}, slot);
114+
}
115+
116+
return slot && slot[0];
117+
}
118+
119+
// vue3
120+
const slot = this.$slots.default();
112121

113122
if (this.tag) {
114-
return h(this.tag, null, slot);
123+
return h(this.tag, {}, slot);
115124
}
116125

117126
return slot && slot[0];

‎yarn.lock‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,47 +1224,47 @@
12241224
semver "^6.1.0"
12251225
strip-ansi "^6.0.0"
12261226

1227-
"@vue/[email protected].28":
1228-
version "3.2.28"
1229-
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.28.tgz#7f6aa4b167f0ae0413f3c36e507c898db06e8fe8"
1230-
integrity sha512-mQpfEjmHVxmWKaup0HL6tLMv2HqjjJu7XT4/q0IoUXYXC4xKG8lIVn5YChJqxBTLPuQjzas7u7i9L4PAWJZRtA==
1227+
"@vue/[email protected].29":
1228+
version "3.2.29"
1229+
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.29.tgz#b06097ab8ff0493177c68c5ea5b63d379a061097"
1230+
integrity sha512-RePZ/J4Ub3sb7atQw6V6Rez+/5LCRHGFlSetT3N4VMrejqJnNPXKUt5AVm/9F5MJriy2w/VudEIvgscCfCWqxw==
12311231
dependencies:
12321232
"@babel/parser" "^7.16.4"
1233-
"@vue/shared" "3.2.28"
1233+
"@vue/shared" "3.2.29"
12341234
estree-walker "^2.0.2"
12351235
source-map "^0.6.1"
12361236

1237-
"@vue/[email protected].28":
1238-
version "3.2.28"
1239-
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.28.tgz#cc32a987fee50673f25430df35ea943f252c23e6"
1240-
integrity sha512-KA4yXceLteKC7VykvPnViUixemQw3A+oii+deSbZJOQKQKVh1HLosI10qxa8ImPCyun41+wG3uGR+tW7eu1W6Q==
1237+
"@vue/[email protected].29":
1238+
version "3.2.29"
1239+
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.29.tgz#ad0ead405bd2f2754161335aad9758aa12430715"
1240+
integrity sha512-y26vK5khdNS9L3ckvkqJk/78qXwWb75Ci8iYLb67AkJuIgyKhIOcR1E8RIt4mswlVCIeI9gQ+fmtdhaiTAtrBQ==
12411241
dependencies:
1242-
"@vue/compiler-core" "3.2.28"
1243-
"@vue/shared" "3.2.28"
1242+
"@vue/compiler-core" "3.2.29"
1243+
"@vue/shared" "3.2.29"
12441244

1245-
"@vue/[email protected].28":
1246-
version "3.2.28"
1247-
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.28.tgz#0a576c09abc72d6a76b153133de6fd7599c182c3"
1248-
integrity sha512-zB0WznfEBb4CbGBHzhboHDKVO5nxbkbxxFo9iVlxObP7a9/qvA5kkZEuT7nXP52f3b3qEfmVTjIT23Lo1ndZdQ==
1245+
"@vue/[email protected].29":
1246+
version "3.2.29"
1247+
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.29.tgz#f76d556cd5fca6a55a3ea84c88db1a2a53a36ead"
1248+
integrity sha512-X9+0dwsag2u6hSOP/XsMYqFti/edvYvxamgBgCcbSYuXx1xLZN+dS/GvQKM4AgGS4djqo0jQvWfIXdfZ2ET68g==
12491249
dependencies:
12501250
"@babel/parser" "^7.16.4"
1251-
"@vue/compiler-core" "3.2.28"
1252-
"@vue/compiler-dom" "3.2.28"
1253-
"@vue/compiler-ssr" "3.2.28"
1254-
"@vue/reactivity-transform" "3.2.28"
1255-
"@vue/shared" "3.2.28"
1251+
"@vue/compiler-core" "3.2.29"
1252+
"@vue/compiler-dom" "3.2.29"
1253+
"@vue/compiler-ssr" "3.2.29"
1254+
"@vue/reactivity-transform" "3.2.29"
1255+
"@vue/shared" "3.2.29"
12561256
estree-walker "^2.0.2"
12571257
magic-string "^0.25.7"
12581258
postcss "^8.1.10"
12591259
source-map "^0.6.1"
12601260

1261-
"@vue/[email protected].28":
1262-
version "3.2.28"
1263-
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.28.tgz#411e8b3bdc3183b2acd35e6551734b34366d64e5"
1264-
integrity sha512-z8rck1PDTu20iLyip9lAvIhaO40DUJrw3Zv0mS4Apfh3PlfWpF5dhsO5g0dgt213wgYsQIYVIlU9cfrYapqRgg==
1261+
"@vue/[email protected].29":
1262+
version "3.2.29"
1263+
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.29.tgz#37b15b32dcd2f6b410bb61fca3f37b1a92b7eb1e"
1264+
integrity sha512-LrvQwXlx66uWsB9/VydaaqEpae9xtmlUkeSKF6aPDbzx8M1h7ukxaPjNCAXuFd3fUHblcri8k42lfimHfzMICA==
12651265
dependencies:
1266-
"@vue/compiler-dom" "3.2.28"
1267-
"@vue/shared" "3.2.28"
1266+
"@vue/compiler-dom" "3.2.29"
1267+
"@vue/shared" "3.2.29"
12681268

12691269
"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
12701270
version "3.1.2"
@@ -1287,53 +1287,53 @@
12871287
resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz#18723530d304f443021da2292d6ec9502826104a"
12881288
integrity sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==
12891289

1290-
"@vue/[email protected].28":
1291-
version "3.2.28"
1292-
resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.28.tgz#e0abf86694f4d182f974fbac934fc3e23e0a6d9b"
1293-
integrity sha512-zE8idNkOPnBDd2tKSIk84hOQZ+jXKvSy5FoIIVlcNEJHnCFnQ3maqeSJ9KoB2Rf6EXUhFTiTDNRlYlXmT2uHbQ==
1290+
"@vue/[email protected].29":
1291+
version "3.2.29"
1292+
resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.29.tgz#a08d606e10016b7cf588d1a43dae4db2953f9354"
1293+
integrity sha512-YF6HdOuhdOw6KyRm59+3rML8USb9o8mYM1q+SH0G41K3/q/G7uhPnHGKvspzceD7h9J3VR1waOQ93CUZj7J7OA==
12941294
dependencies:
12951295
"@babel/parser" "^7.16.4"
1296-
"@vue/compiler-core" "3.2.28"
1297-
"@vue/shared" "3.2.28"
1296+
"@vue/compiler-core" "3.2.29"
1297+
"@vue/shared" "3.2.29"
12981298
estree-walker "^2.0.2"
12991299
magic-string "^0.25.7"
13001300

1301-
"@vue/[email protected].28":
1302-
version "3.2.28"
1303-
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.28.tgz#1c3c7f434372edd867f937151897fca7efc4be18"
1304-
integrity sha512-WamM5LGv7JIarW+EYAzYFqYonZXjTnOjNW0sBO93jRE9I1ReAwfH8NvQXkPA3JZ3fuF6SGDdG8Y9/+dKjd/1Gw==
1301+
"@vue/[email protected].29":
1302+
version "3.2.29"
1303+
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.29.tgz#afdc9c111d4139b14600be17ad80267212af6052"
1304+
integrity sha512-Ryhb6Gy62YolKXH1gv42pEqwx7zs3n8gacRVZICSgjQz8Qr8QeCcFygBKYfJm3o1SccR7U+bVBQDWZGOyG1k4g==
13051305
dependencies:
1306-
"@vue/shared" "3.2.28"
1306+
"@vue/shared" "3.2.29"
13071307

1308-
"@vue/[email protected].28":
1309-
version "3.2.28"
1310-
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.28.tgz#69d8eede42957a1660b964004aa002982ae36a41"
1311-
integrity sha512-sVbBMFUt42JatTlXbdH6tVcLPw1eEOrrVQWI+j6/nJVzR852RURaT6DhdR0azdYscxq4xmmBctE0VQmlibBOFw==
1308+
"@vue/[email protected].29":
1309+
version "3.2.29"
1310+
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.29.tgz#fb8577b2fcf52e8d967bd91cdf49ab9fb91f9417"
1311+
integrity sha512-VMvQuLdzoTGmCwIKTKVwKmIL0qcODIqe74JtK1pVr5lnaE0l25hopodmPag3RcnIcIXe+Ye3B2olRCn7fTCgig==
13121312
dependencies:
1313-
"@vue/reactivity" "3.2.28"
1314-
"@vue/shared" "3.2.28"
1313+
"@vue/reactivity" "3.2.29"
1314+
"@vue/shared" "3.2.29"
13151315

1316-
"@vue/[email protected].28":
1317-
version "3.2.28"
1318-
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.28.tgz#b5a0cf38daed5534edbc95790f4eeac97dff2003"
1319-
integrity sha512-Jg7cxZanEXXGu1QnZILFLnDrM+MIFN8VAullmMZiJEZziHvhygRMpi0ahNy/8OqGwtTze1JNhLdHRBO+q2hbmg==
1316+
"@vue/[email protected].29":
1317+
version "3.2.29"
1318+
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.29.tgz#35e9a2bf04ef80b86ac2ca0e7b2ceaccf1e18f01"
1319+
integrity sha512-YJgLQLwr+SQyORzTsBQLL5TT/5UiV83tEotqjL7F9aFDIQdFBTCwpkCFvX9jqwHoyi9sJqM9XtTrMcc8z/OjPA==
13201320
dependencies:
1321-
"@vue/runtime-core" "3.2.28"
1322-
"@vue/shared" "3.2.28"
1321+
"@vue/runtime-core" "3.2.29"
1322+
"@vue/shared" "3.2.29"
13231323
csstype "^2.6.8"
13241324

1325-
"@vue/[email protected].28":
1326-
version "3.2.28"
1327-
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.28.tgz#235944dc4d969fadd387f62acc2eb8b8d50008a2"
1328-
integrity sha512-S+MhurgkPabRvhdDl8R6efKBmniJqBbbWIYTXADaJIKFLFLQCW4gcYUTbxuebzk6j3z485vpekhrHHymTF52Pg==
1325+
"@vue/[email protected].29":
1326+
version "3.2.29"
1327+
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.29.tgz#ea6afa361b9c781a868c8da18c761f9b7bc89102"
1328+
integrity sha512-lpiYx7ciV7rWfJ0tPkoSOlLmwqBZ9FTmQm33S+T4g0j1fO/LmhJ9b9Ctl1o5xvIFVDk9QkSUWANZn7H2pXuxVw==
13291329
dependencies:
1330-
"@vue/compiler-ssr" "3.2.28"
1331-
"@vue/shared" "3.2.28"
1330+
"@vue/compiler-ssr" "3.2.29"
1331+
"@vue/shared" "3.2.29"
13321332

1333-
"@vue/[email protected].28":
1334-
version "3.2.28"
1335-
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.28.tgz#5b0b1840432031d0ea1adff633b356a503e87048"
1336-
integrity sha512-eMQ8s9j8FpbGHlgUAaj/coaG3Q8YtMsoWL/RIHTsE3Ex7PUTyr7V91vB5HqWB5Sn8m4RXTHGO22/skoTUYvp0A==
1333+
"@vue/[email protected].29":
1334+
version "3.2.29"
1335+
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.29.tgz#07dac7051117236431d2f737d16932aa38bbb925"
1336+
integrity sha512-BjNpU8OK6Z0LVzGUppEk0CMYm/hKDnZfYdjSmPOs0N+TR1cLKJAkDwW8ASZUvaaSLEi6d3hVM7jnWnX+6yWnHw==
13371337

13381338
"@vue/web-component-wrapper@^1.2.0":
13391339
version "1.2.0"
@@ -7693,15 +7693,15 @@ vue@*:
76937693
integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
76947694

76957695
vue@^3.2.27:
7696-
version "3.2.28"
7697-
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.28.tgz#840d193bf9713f57a365ef115c4b1286d43e0e5d"
7698-
integrity sha512-U+jBwVh3RQ9AgceLFdT7i2FFujoC+kYuGrKo5y8aLluWKZWPS40WgA2pyYHaiSX9ydCbEGr3rc/JzdqskzD95g==
7699-
dependencies:
7700-
"@vue/compiler-dom" "3.2.28"
7701-
"@vue/compiler-sfc" "3.2.28"
7702-
"@vue/runtime-dom" "3.2.28"
7703-
"@vue/server-renderer" "3.2.28"
7704-
"@vue/shared" "3.2.28"
7696+
version "3.2.29"
7697+
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.29.tgz#3571b65dbd796d3a6347e2fd45a8e6e11c13d56a"
7698+
integrity sha512-cFIwr7LkbtCRanjNvh6r7wp2yUxfxeM2yPpDQpAfaaLIGZSrUmLbNiSze9nhBJt5MrZ68Iqt0O5scwAMEVxF+Q==
7699+
dependencies:
7700+
"@vue/compiler-dom" "3.2.29"
7701+
"@vue/compiler-sfc" "3.2.29"
7702+
"@vue/runtime-dom" "3.2.29"
7703+
"@vue/server-renderer" "3.2.29"
7704+
"@vue/shared" "3.2.29"
77057705

77067706
watchpack-chokidar2@^2.0.0:
77077707
version "2.0.0"

0 commit comments

Comments
 (0)