From ef6fd2888ac71c0f274fb25552ae5ef221f7a342 Mon Sep 17 00:00:00 2001 From: * <*> Date: Wed, 17 May 2023 15:39:26 +0800 Subject: [PATCH 1/3] Match-id-dc2c8508a5e1dec65fe87e6d8a44d2e02af52459 --- libs/horizon/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/horizon/package.json b/libs/horizon/package.json index 5cf8027c..b4640a73 100644 --- a/libs/horizon/package.json +++ b/libs/horizon/package.json @@ -4,7 +4,7 @@ "keywords": [ "horizon" ], - "version": "0.0.45", + "version": "0.0.47", "homepage": "", "bugs": "", "main": "index.js", From 8a9fdd01a63dcfd2ba508b6b581aa78d1a3d1bb5 Mon Sep 17 00:00:00 2001 From: * <*> Date: Wed, 17 May 2023 21:30:53 +0800 Subject: [PATCH 2/3] Match-id-bf925df05da50203ca4baf87357f2a25d21ca829 --- .cloudbuild/test.yml | 2 +- .../src/dom/DOMPropertiesHandler/StyleHandler.ts | 12 ++++++++++++ scripts/__tests__/DomTest/Attribute.test.js | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.cloudbuild/test.yml b/.cloudbuild/test.yml index a5c7242f..10f27393 100644 --- a/.cloudbuild/test.yml +++ b/.cloudbuild/test.yml @@ -13,7 +13,7 @@ env: resource: type: docker image: kweecr04.his.huawei.com:80/ecr-build-arm-gzkunpeng/euleros_v2r7spc522_x64_opmt_cs5.0_sz:v5.0 - class: 4U8G + class: 8U16G mode: toolbox cache: - type: workspace diff --git a/libs/horizon/src/dom/DOMPropertiesHandler/StyleHandler.ts b/libs/horizon/src/dom/DOMPropertiesHandler/StyleHandler.ts index 3c3a9a24..e2fca141 100644 --- a/libs/horizon/src/dom/DOMPropertiesHandler/StyleHandler.ts +++ b/libs/horizon/src/dom/DOMPropertiesHandler/StyleHandler.ts @@ -33,6 +33,17 @@ const noUnitCSS = [ 'zoom', ]; +const length = noUnitCSS.length; +for (let i = 0; i < length; i++) { + const cssKey = noUnitCSS[i]; + const attributeKey = cssKey.charAt(0).toUpperCase() + cssKey.slice(1); + + // css 兼容性前缀 webkit: chrome, mo: IE或者Edge, Moz: 火狐 + noUnitCSS.push('Webkit' + attributeKey); + noUnitCSS.push('mo' + attributeKey); + noUnitCSS.push('Moz' + attributeKey); +} + function isNeedUnitCSS(styleName: string) { return !( noUnitCSS.includes(styleName) || @@ -78,6 +89,7 @@ export function setStyles(dom, styles) { if (name.indexOf('--') === 0) { style.setProperty(name, styleVal); } else { + // 使用这种赋值方式,浏览器可以将'WebkitLineClamp', 'backgroundColor'分别识别为'-webkit-line-clamp'和'backgroud-color' style[name] = adjustStyleValue(name, styleVal); } }); diff --git a/scripts/__tests__/DomTest/Attribute.test.js b/scripts/__tests__/DomTest/Attribute.test.js index 90823780..56004668 100755 --- a/scripts/__tests__/DomTest/Attribute.test.js +++ b/scripts/__tests__/DomTest/Attribute.test.js @@ -83,6 +83,12 @@ describe('Dom Attribute', () => { expect(window.getComputedStyle(div).getPropertyValue('height')).toBe('20px'); }); + it('WebkitLineClamp和lineClamp样式不会把数字转换成字符串或者追加"px"', () => { + Horizon.render(
, container); + // 浏览器可以将WebkitLineClamp识别为-webkit-line-clamp,测试框架不可以 + expect(container.querySelector('div').style.WebkitLineClamp).toBe(2); + }); + it('空字符串做属性名', () => { const emptyStringProps = { '': '' }; expect(() => { From 58e1de39576649f8e42a0ffef1c35f34e8af004b Mon Sep 17 00:00:00 2001 From: * <*> Date: Thu, 18 May 2023 21:46:59 +0800 Subject: [PATCH 3/3] Match-id-40ac0e7e6e1927b826730b3937fe6f00c7a4b394 --- CHANGELOG.md | 3 +++ libs/horizon/package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d019e752..bffc742f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.0.48 (2023-05-18) +- **core**: 解决style中属性WebkitLineClamp值被转换成字符串问题 + ## 0.0.45 (2023-05-10) - **core**: 修改belongClassVNode属性为Symbol提升性能 - **core**: 优化内部循环实现,提升性能 diff --git a/libs/horizon/package.json b/libs/horizon/package.json index b4640a73..71fad88d 100644 --- a/libs/horizon/package.json +++ b/libs/horizon/package.json @@ -4,7 +4,7 @@ "keywords": [ "horizon" ], - "version": "0.0.47", + "version": "0.0.48", "homepage": "", "bugs": "", "main": "index.js",