zhangyuhan 1 год назад
Родитель
Сommit
723e8747d8

+ 0 - 1
apps/bigmember_pc/package.json

@@ -32,7 +32,6 @@
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.1.0",
-    "@unocss/transformer-directives": "^0.58.5",
     "@unocss/transformer-variant-group": "^0.58.5",
     "@vitejs/plugin-legacy": "^4.0.4",
     "@vitejs/plugin-vue2": "^2.2.0",

+ 2 - 2
apps/bigmember_pc/src/components/common/Monitor.vue

@@ -8,7 +8,7 @@
         监控业主一旦发布与“我的订阅”相关的招标动态,会推送业主的招标项目、时间等公告信息。
       </li>
       <li
-        :class="{ 'border-2': !showList.includes(1) }"
+        :class="{ 'b-style-none': !showList.includes(1) }"
         v-show="showList.length && showList.includes(2)"
         @click="$emit('monitorStatus')"
       >
@@ -105,7 +105,7 @@ export default {
       &:last-child {
         padding: 12px 0 0;
       }
-      &.border-2 {
+      &.b-style-none {
         border: none;
       }
       .list-top {

+ 2 - 2
apps/bigmember_pc/src/components/common/MonitorPopover.vue

@@ -3,7 +3,7 @@
     <ul class="monitor-ul">
       <li class="first-bottom" v-if="showTip">{{ textConfig.tip }}</li>
       <li
-        :class="{ 'border-2': !showTip }"
+        :class="{ 'b-style-none': !showTip }"
         v-if="showMore"
         @click="$emit('click', 'more')"
       >
@@ -129,7 +129,7 @@ export default {
       &:last-child {
         padding: 12px 0 0;
       }
-      &.border-2 {
+      &.b-style-none {
         border: none;
       }
       .list-top {

+ 7 - 3
apps/bigmember_pc/src/views/article-content/components/ContentSummary.vue

@@ -175,9 +175,9 @@ function doOpenItem(item) {
               </span>
             </div>
             <div class="td-phone" v-if="scope.row[index].type === 'contact'">
-              <span @click="doOpenItem(scope.row[index])" class="text--line">{{
-                scope.row[index].label
-              }}</span>
+              <span class="text--line">
+                {{ scope.row[index].label }}
+              </span>
               <span
                 @click="doOpenItem(scope.row[index])"
                 class="go-more-action flex m-l-16px flex-(row items-center shrink-0)"
@@ -252,6 +252,10 @@ function doOpenItem(item) {
           cursor: pointer;
         }
       }
+      .td-phone .text--line {
+        color: #1d1d1d;
+        cursor: unset;
+      }
       .td-unit {
         display: flex;
         flex-direction: row;

+ 14 - 3
apps/bigmember_pc/uno.config.js

@@ -1,9 +1,20 @@
 import { defineConfig, presetUno, presetAttributify } from 'unocss'
 import transformerVariantGroup from '@unocss/transformer-variant-group'
-import transformerDirectives from '@unocss/transformer-directives'
 
+// unocss样式调试器:https://unocss.dev/tools/inspector
+// 访问 http://127.0.0.1:8081/__unocss 查看应用的规则
 export default defineConfig({
   // ...UnoCSS options
-  presets: [presetUno(), presetAttributify()],
-  transformers: [transformerVariantGroup(), transformerDirectives()]
+  presets: [
+    presetUno(),
+    presetAttributify({
+      strict: true,
+      prefix: 'uno-',
+      prefixedOnly: true
+      // ignoreAttributes: []
+    })
+  ],
+  transformers: [transformerVariantGroup()],
+  // 配置排除预设样式
+  blocklist: ['tab', 'm-24']
 })

+ 1 - 1
apps/bigmember_pc/vite.config.js

@@ -87,8 +87,8 @@ export default defineConfig({
     exclude: ['/common-module/chart-module/js/chart-common.js']
   },
   plugins: [
-    vue2(),
     UnoCSS(),
+    vue2(),
     ViteEjsPlugin({
       cdn: getCDN(),
       assets: {

+ 12 - 45
pnpm-lock.yaml

@@ -112,9 +112,6 @@ importers:
       '@rushstack/eslint-patch':
         specifier: ^1.1.0
         version: 1.1.0
-      '@unocss/transformer-directives':
-        specifier: ^0.58.5
-        version: 0.58.5
       '@unocss/transformer-variant-group':
         specifier: ^0.58.5
         version: 0.58.5
@@ -1395,7 +1392,7 @@ packages:
     resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.22.5
     dev: true
 
   /@babel/helper-skip-transparent-expression-wrappers@7.22.5:
@@ -1487,16 +1484,6 @@ packages:
       js-tokens: 4.0.0
     dev: true
 
-  /@babel/parser@7.22.7:
-    resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/helper-validator-identifier': 7.22.20
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-    dev: true
-
   /@babel/parser@7.23.9:
     resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==}
     engines: {node: '>=6.0.0'}
@@ -1708,16 +1695,6 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.22.9):
-    resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.22.9
-      '@babel/helper-plugin-utils': 7.22.5
-    dev: true
-
   /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.24.0):
     resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==}
     engines: {node: '>=6.9.0'}
@@ -4599,7 +4576,7 @@ packages:
     dependencies:
       '@babel/core': 7.22.9
       '@babel/helper-module-imports': 7.22.5
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.9)
       '@vue/babel-helper-vue-jsx-merge-props': 1.4.0
       html-tags: 2.0.0
       lodash.kebabcase: 4.1.1
@@ -4720,7 +4697,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.9
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.9)
     dev: true
 
   /@vue/babel-sugar-composition-api-render-instance@1.4.0(@babel/core@7.22.9):
@@ -4729,7 +4706,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.9
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.9)
     dev: true
 
   /@vue/babel-sugar-functional-vue@1.4.0(@babel/core@7.22.9):
@@ -4738,7 +4715,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.9
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.9)
     dev: true
 
   /@vue/babel-sugar-inject-h@1.4.0(@babel/core@7.22.9):
@@ -4747,7 +4724,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.9
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.9)
     dev: true
 
   /@vue/babel-sugar-v-model@1.4.0(@babel/core@7.22.9):
@@ -4756,7 +4733,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.9
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.9)
       '@vue/babel-helper-vue-jsx-merge-props': 1.4.0
       '@vue/babel-plugin-transform-vue-jsx': 1.4.0(@babel/core@7.22.9)
       camelcase: 5.3.1
@@ -4770,7 +4747,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.22.9
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.22.9)
+      '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.9)
       '@vue/babel-plugin-transform-vue-jsx': 1.4.0(@babel/core@7.22.9)
       camelcase: 5.3.1
     dev: true
@@ -10625,12 +10602,6 @@ packages:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  /magic-string@0.30.7:
-    resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
-
   /make-dir@2.1.0:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
     engines: {node: '>=6'}
@@ -11478,7 +11449,7 @@ packages:
     dependencies:
       jsonc-parser: 3.2.0
       mlly: 1.6.1
-      pathe: 1.1.2
+      pathe: 1.1.1
     dev: true
 
   /pluralize@8.0.0:
@@ -13450,7 +13421,7 @@ packages:
       '@antfu/utils': 0.7.6
       defu: 6.1.4
       jiti: 1.21.0
-      mlly: 1.6.1
+      mlly: 1.4.2
     dev: true
 
   /unicode-canonical-property-names-ecmascript@2.0.0:
@@ -13951,10 +13922,6 @@ packages:
     resolution: {integrity: sha512-CAEl3QuQcs/IB7DafguF8AgzZo2y+fGm1HQFBrBNMuHWLeOZTyWyIJDT4CHya52gIZ/j64pVsFrzSTSDMiTjMA==}
     dev: true
 
-  /vite-plugin-html-redirect@1.0.4:
-    resolution: {integrity: sha512-CAEl3QuQcs/IB7DafguF8AgzZo2y+fGm1HQFBrBNMuHWLeOZTyWyIJDT4CHya52gIZ/j64pVsFrzSTSDMiTjMA==}
-    dev: true
-
   /vite-plugin-legacy-qiankun@0.0.12:
     resolution: {integrity: sha512-O3C9YEtbsEmXKvhDCCVGgh8qAtckRkZgomHHN3zOFgaLx24hewgG7KaStFjAx6rAU4Te3ZV6LkmTbMIef+0tsQ==}
     dependencies:
@@ -14443,7 +14410,7 @@ packages:
       espree: 9.6.1
       esquery: 1.5.0
       lodash: 4.17.21
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -14461,7 +14428,7 @@ packages:
       espree: 9.6.1
       esquery: 1.5.0
       lodash: 4.17.21
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true