diff --git a/package.json b/package.json index 3f2a18e736efe070cbda8c9f41f684cb9d3497b1..05952179defb64ac29dad11b615022f9ff081d75 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@babel/preset-env": "^7.14.7", - "@dcloudio/types": "^2.5.6", + "@dcloudio/types": "2.5.8", "@jest/types": "^27.0.2", "@microsoft/api-extractor": "^7.13.2", "@rollup/plugin-alias": "^3.1.1", diff --git a/packages/uni-app-plus/src/view/framework/dom/elements/UniTextElement.ts b/packages/uni-app-plus/src/view/framework/dom/elements/UniTextElement.ts index ee5c16a2bbe8a3c89679fd2f0b27f22ddb7b5750..bddc852e6712cf8c5187b97e8aa510c48b63555b 100644 --- a/packages/uni-app-plus/src/view/framework/dom/elements/UniTextElement.ts +++ b/packages/uni-app-plus/src/view/framework/dom/elements/UniTextElement.ts @@ -43,10 +43,9 @@ export class UniTextElement extends UniAnimationElement { const { $props: { space, decode }, } = this - this.$.innerHTML = parseText(this._text, { - space, - decode, - }).join('
') + + this.$.textContent = parseText(this._text, { space, decode }).join('\n') + super.update(isMounted) } } diff --git a/packages/uni-components/style/text.css b/packages/uni-components/style/text.css index fa18781db8f66759fa1c13d5ab5a328191695c42..4e1de2f765cf25da740dfff4a3f6c290dba87ec6 100644 --- a/packages/uni-components/style/text.css +++ b/packages/uni-components/style/text.css @@ -2,3 +2,7 @@ uni-text[selectable] { cursor: auto; user-select: text; } + +uni-text { + white-space: pre; +} diff --git a/yarn.lock b/yarn.lock index e6fc00a772ce6dcb47e5b7450bde7355d08353b2..c33560158775cb033ac51f9bc61f0f69d87000a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -922,10 +922,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@dcloudio/types@^2.5.6": - version "2.5.6" - resolved "https://registry.yarnpkg.com/@dcloudio/types/-/types-2.5.6.tgz#fba90cc0420e123eab09e895d5baceb0b73ebb21" - integrity sha512-SvJ2aRViG7aMn/Sf44FnKXcuqAnuYeG2X0NvU6iFiOnC/NKo1n8lWxGy88VnNINic0M1jRaeFKLOhosuAsTndQ== +"@dcloudio/types@2.5.8": + version "2.5.8" + resolved "https://registry.yarnpkg.com/@dcloudio/types/-/types-2.5.8.tgz#3aee4b179bb4c13877309dc0fe1ba4ca1ff7d3b0" + integrity sha512-H/6I+Ui2F/g/juepMrx3wx2jfOFI8sRlKlAxOMycR2o75/ghVIhJU6GW9hU1DYNActGsM5UhcdpZYLL0qXkr4Q== "@eslint/eslintrc@^0.4.3": version "0.4.3"