Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
timhub66 committed Dec 14, 2024
2 parents 10a217a + 0803fa0 commit 38ac150
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Contact.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

欢迎小伙伴们加入micro-app微信群交流^ ^
![image](https://github.com/user-attachments/assets/bc2ed2a1-a5a5-4ad7-8a2f-0f3a58507490)
![image](https://github.com/user-attachments/assets/284af1ee-832d-4c8a-8977-cba507fb9137)




Expand Down
5 changes: 5 additions & 0 deletions docs/zh-cn/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
- 修订版本号:每周末会进行日常 bugfix 更新。(如果有紧急的 bugfix,则任何时候都可发布)

---
### 1.0.0-rc.17

`2024-12-14`
- **Bug Fix**
- 🐞 修复 子应用挂载到父应用中的时候,子应用写的样式全部都丢失了,因为vue语法中的style有一个scoped样式隔离,去掉就正常了,但是不加会影响全局,[issue 1466](https://github.com/micro-zoe/micro-app/issues/1466)
### 1.0.0-rc.16

`2024-12-09`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@micro-zoe/micro-app",
"version": "1.0.0-rc.16",
"version": "1.0.0-rc.17",
"description": "A lightweight, efficient and powerful micro front-end framework",
"private": false,
"main": "lib/index.min.js",
Expand Down
4 changes: 2 additions & 2 deletions src/sandbox/scoped_css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ class CSSParser {
* should be ==> micro-app[name=xxx] :where(.a, .b, .c) a {}
*/
const attributeValues: {[key: string]: any} = {}
const matchRes = m[0].replace(/\[([^=]+)=?(.+?)\]/g, (match, p1, p2) => {
const matchRes = m[0].replace(/\[([^\]=]+)(?:=([^\]]+))?\]/g, (match, p1, p2) => {
const mock = `__mock_${p1}Value__`
attributeValues[mock] = p2
return match.replace(p2, mock)
})

return matchRes.replace(/(^|,[\n\s]*)([^,]+)/g, (_, separator, selector) => {
selector = trim(selector)
selector = selector.replace(/\[[^=]+=?(.+?)\]/g, (match:string, p1: string) => {
selector = selector.replace(/\[([^\]=]+)(?:=([^\]]+))?\]/g, (match:string, p1: string) => {
if (attributeValues[p1]) {
return match.replace(p1, attributeValues[p1])
}
Expand Down

0 comments on commit 38ac150

Please sign in to comment.