From ce8851a057475e2d8eb20b6c4bfa15642b3b1bae Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Sun, 9 Feb 2025 00:29:43 +0800 Subject: [PATCH] feat: add weapp-tailwindcss style --- apps/vite-native-skyline/package.json | 2 +- apps/vite-native-ts-skyline/package.json | 2 +- apps/vite-native-ts/package.json | 2 +- apps/vite-native/app.css | 5 +- apps/vite-native/app.json | 2 +- .../navigation-bar/navigation-bar.json | 5 - .../navigation-bar/navigation-bar.ts | 106 -- .../navigation-bar/navigation-bar.wxml | 64 - .../navigation-bar/navigation-bar.wxss | 0 apps/vite-native/package.json | 4 +- apps/vite-native/pages/index/index.wxml | 31 +- packages/weapp-tailwindcss/index.css | 5 + packages/weapp-tailwindcss/package.json | 19 +- packages/weapp-tailwindcss/preflight.css | 16 + packages/weapp-tailwindcss/theme.css | 450 +++++++ packages/weapp-tailwindcss/utilities.css | 1 + pnpm-lock.yaml | 1076 +++++++---------- stylelint.config.js | 5 +- 18 files changed, 923 insertions(+), 872 deletions(-) delete mode 100644 apps/vite-native/components/navigation-bar/navigation-bar.json delete mode 100644 apps/vite-native/components/navigation-bar/navigation-bar.ts delete mode 100644 apps/vite-native/components/navigation-bar/navigation-bar.wxml delete mode 100644 apps/vite-native/components/navigation-bar/navigation-bar.wxss create mode 100644 packages/weapp-tailwindcss/index.css create mode 100644 packages/weapp-tailwindcss/preflight.css create mode 100644 packages/weapp-tailwindcss/theme.css create mode 100644 packages/weapp-tailwindcss/utilities.css diff --git a/apps/vite-native-skyline/package.json b/apps/vite-native-skyline/package.json index 5abf811da..9e346145c 100644 --- a/apps/vite-native-skyline/package.json +++ b/apps/vite-native-skyline/package.json @@ -31,6 +31,6 @@ "tailwindcss": "^3.4.17", "typescript": "^5.7.3", "weapp-tailwindcss": "workspace:*", - "weapp-vite": "^2.1.2" + "weapp-vite": "^2.1.3" } } diff --git a/apps/vite-native-ts-skyline/package.json b/apps/vite-native-ts-skyline/package.json index d0768e4ec..207fb1628 100644 --- a/apps/vite-native-ts-skyline/package.json +++ b/apps/vite-native-ts-skyline/package.json @@ -30,6 +30,6 @@ "tailwindcss": "^3.4.17", "typescript": "^5.7.3", "weapp-tailwindcss": "workspace:*", - "weapp-vite": "^2.1.2" + "weapp-vite": "^2.1.3" } } diff --git a/apps/vite-native-ts/package.json b/apps/vite-native-ts/package.json index 54d9a280e..1c3fc41fa 100644 --- a/apps/vite-native-ts/package.json +++ b/apps/vite-native-ts/package.json @@ -34,6 +34,6 @@ "tailwindcss": "^3.4.17", "typescript": "^5.7.3", "weapp-tailwindcss": "workspace:*", - "weapp-vite": "^2.1.2" + "weapp-vite": "^2.1.3" } } diff --git a/apps/vite-native/app.css b/apps/vite-native/app.css index a366e6503..0ef08f305 100644 --- a/apps/vite-native/app.css +++ b/apps/vite-native/app.css @@ -1,5 +1,8 @@ /* @import 'tailwindcss/base'; @import 'tailwindcss/components'; @import 'tailwindcss/utilities'; */ -@import 'tailwindcss'; + +/* @import 'tailwindcss'; */ + +@import 'weapp-tailwindcss'; @config "./tailwind.config.js"; diff --git a/apps/vite-native/app.json b/apps/vite-native/app.json index 74ad1b6f6..11383e3e6 100644 --- a/apps/vite-native/app.json +++ b/apps/vite-native/app.json @@ -8,7 +8,7 @@ "navigationBarBackgroundColor": "#ffffff" }, "usingComponents": { - "navigation-bar": "/components/navigation-bar/navigation-bar" + }, "subPackages": [ { diff --git a/apps/vite-native/components/navigation-bar/navigation-bar.json b/apps/vite-native/components/navigation-bar/navigation-bar.json deleted file mode 100644 index 4f0a3f08c..000000000 --- a/apps/vite-native/components/navigation-bar/navigation-bar.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "component": true, - "styleIsolation": "apply-shared", - "usingComponents": {} -} diff --git a/apps/vite-native/components/navigation-bar/navigation-bar.ts b/apps/vite-native/components/navigation-bar/navigation-bar.ts deleted file mode 100644 index 046495744..000000000 --- a/apps/vite-native/components/navigation-bar/navigation-bar.ts +++ /dev/null @@ -1,106 +0,0 @@ -Component({ - options: { - multipleSlots: true, // 在组件定义时的选项中启用多slot支持 - }, - /** - * 组件的属性列表 - */ - properties: { - extClass: { - type: String, - value: '', - }, - title: { - type: String, - value: '', - }, - background: { - type: String, - value: '', - }, - color: { - type: String, - value: '', - }, - back: { - type: Boolean, - value: true, - }, - loading: { - type: Boolean, - value: false, - }, - homeButton: { - type: Boolean, - value: false, - }, - animated: { - // 显示隐藏的时候opacity动画效果 - type: Boolean, - value: true, - }, - show: { - // 显示隐藏导航，隐藏的时候navigation-bar的高度占位还在 - type: Boolean, - value: true, - observer: '_showChange', - }, - // back为true的时候，返回的页面深度 - delta: { - type: Number, - value: 1, - }, - }, - /** - * 组件的初始数据 - */ - data: { - displayStyle: '', - }, - lifetimes: { - attached() { - const rect = wx.getMenuButtonBoundingClientRect() - wx.getSystemInfo({ - success: (res) => { - const isAndroid = res.platform === 'android' - const isDevtools = res.platform === 'devtools' - this.setData({ - ios: !isAndroid, - innerPaddingRight: `padding-right: ${res.windowWidth - rect.left}px`, - leftWidth: `width: ${res.windowWidth - rect.left}px`, - safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${res.safeArea.top}px); padding-top: ${res.safeArea.top}px` : ``, - }) - }, - }) - }, - }, - /** - * 组件的方法列表 - */ - methods: { - _showChange(show: boolean) { - const animated = this.data.animated - let displayStyle = '' - if (animated) { - displayStyle = `opacity: ${ - show ? '1' : '0' - };transition:opacity 0.5s;` - } - else { - displayStyle = `display: ${show ? '' : 'none'}` - } - this.setData({ - displayStyle, - }) - }, - back() { - const data = this.data - if (data.delta) { - wx.navigateBack({ - delta: data.delta, - }) - } - this.triggerEvent('back', { delta: data.delta }, {}) - }, - }, -}) diff --git a/apps/vite-native/components/navigation-bar/navigation-bar.wxml b/apps/vite-native/components/navigation-bar/navigation-bar.wxml deleted file mode 100644 index fb86b3c31..000000000 --- a/apps/vite-native/components/navigation-bar/navigation-bar.wxml +++ /dev/null @@ -1,64 +0,0 @@ - - -1111 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{title}} - - - - - - - - - - - - diff --git a/apps/vite-native/components/navigation-bar/navigation-bar.wxss b/apps/vite-native/components/navigation-bar/navigation-bar.wxss deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/vite-native/package.json b/apps/vite-native/package.json index 5000c9b9a..ce5e3d627 100644 --- a/apps/vite-native/package.json +++ b/apps/vite-native/package.json @@ -34,9 +34,9 @@ "@tailwindcss/vite": "^4.0.4", "autoprefixer": "^10.4.20", "postcss": "^8.5.1", - "tailwindcss": "^4.0.3", + "tailwindcss": "^4.0.4", "tailwindcss-injector": "workspace:*", "weapp-tailwindcss": "workspace:*", - "weapp-vite": "^2.1.2" + "weapp-vite": "^2.1.3" } } diff --git a/apps/vite-native/pages/index/index.wxml b/apps/vite-native/pages/index/index.wxml index c5a111d8c..0277b9bb4 100644 --- a/apps/vite-native/pages/index/index.wxml +++ b/apps/vite-native/pages/index/index.wxml @@ -1,33 +1,4 @@ - - - - {{ motto }} 111 - {{message}} - {{item}} - - - - {{m1.message}} - - Click me! + 222 - - - - -