af-mobile-client-vue3 1.1.44 → 1.1.46

package/package.json

@@ -1,115 +1,112 @@
-{
-  "name": "af-mobile-client-vue3",
-  "type": "module",
-  "version": "1.1.44",
-  "description": "Vue + Vite component lib",
-  "license": "MIT",
-  "engines": {
-    "node": ">=18.12.0",
-    "pnpm": ">=8.15.0"
-  },
-  "scripts": {
-    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
-    "build": "vue-tsc --noEmit && vite build",
-    "build:dev": "vue-tsc --noEmit && vite build --mode=development",
-    "preview": "vite preview",
-    "lint": "eslint . && vue-tsc --noEmit",
-    "lint:fix": "eslint . --fix",
-    "test": "vitest",
-    "release": "bumpp --commit --push --tag"
-  },
-  "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.7.2",
-    "@fortawesome/free-solid-svg-icons": "^6.7.2",
-    "@fortawesome/vue-fontawesome": "^3.0.8",
-    "@iconify/vue": "4.3.0",
-    "@micro-zoe/micro-app": "1.0.0-rc.24",
-    "@unhead/vue": "^2.0.5",
-    "@vant/area-data": "^2.0.0",
-    "@vant/touch-emulator": "^1.4.0",
-    "@vant/use": "^1.6.0",
-    "@vueuse/core": "^13.1.0",
-    "animate.css": "^4.1.1",
-    "axios": "^1.8.4",
-    "crypto-js": "^4.2.0",
-    "echarts": "^5.6.0",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "ol": "^10.5.0",
-    "pinia": "^3.0.2",
-    "pinia-plugin-persistedstate": "^4.2.0",
-    "qs": "^6.14.0",
-    "resize-detector": "^0.3.0",
-    "store": "^2.0.12",
-    "vant": "^4.9.18",
-    "vconsole": "^3.15.1",
-    "vue": "^3.5.13",
-    "vue-router": "^4.5.0",
-    "vue3-hash-calendar": "^1.1.3"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "^4.12.0",
-    "@iconify/json": "2.2.318",
-    "@types/crypto-js": "^4.2.2",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.14.1",
-    "@types/nprogress": "^0.2.3",
-    "@types/store": "^2.0.5",
-    "@unocss/eslint-plugin": "^66.1.0-beta.11",
-    "@unocss/preset-rem-to-px": "66.1.0-beta.11",
-    "@vitejs/plugin-legacy": "^6.0.2",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "autoprefixer": "^10.4.21",
-    "bumpp": "^10.1.0",
-    "commitizen": "^4.3.1",
-    "consola": "^3.4.2",
-    "cross-env": "^7.0.3",
-    "cz-emoji-chinese": "^0.3.1",
-    "eslint": "^9.24.0",
-    "eslint-ts-patch": "^8.57.0-0",
-    "husky": "^9.1.7",
-    "less": "^4.3.0",
-    "mockjs": "^1.1.0",
-    "postcss-mobile-forever": "^5.0.0",
-    "rollup": "^4.40.0",
-    "terser": "^5.39.0",
-    "typescript": "^5.8.3",
-    "unocss": "^66.1.0-beta.11",
-    "unplugin-auto-import": "^19.1.2",
-    "unplugin-vue-components": "^28.4.1",
-    "unplugin-vue-router": "^0.12.0",
-    "vite": "^6.2.6",
-    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-mock-dev-server": "^1.8.5",
-    "vite-plugin-pwa": "^1.0.0",
-    "vite-plugin-sitemap": "^0.7.1",
-    "vite-plugin-svg-icons": "^2.0.1",
-    "vite-plugin-vconsole": "^2.1.1",
-    "vite-plugin-vue-devtools": "^7.7.2",
-    "vite-plugin-vue-layouts": "^0.11.0",
-    "vitest": "^3.1.1",
-    "vue-tsc": "^2.2.8"
-  },
-  "pnpm": {
-    "peerDependencyRules": {
-      "ignoreMissing": [
-        "postcss",
-        "esbuild"
-      ],
-      "allowedVersions": {
-        "rollup": "^4.x"
-      }
-    }
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-emoji-chinese"
-    },
-    "cz-emoji-chinese": {
-      "skipQuestions": [
-        "body",
-        "scope"
-      ]
-    }
-  }
-}
+{
+  "name": "af-mobile-client-vue3",
+  "type": "module",
+  "version": "1.1.46",
+  "description": "Vue + Vite component lib",
+  "license": "MIT",
+  "engines": {
+    "node": ">=18.12.0",
+    "pnpm": ">=8.15.0"
+  },
+  "scripts": {
+    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
+    "build": "vue-tsc --noEmit && vite build",
+    "build:dev": "vue-tsc --noEmit && vite build --mode=development",
+    "preview": "vite preview",
+    "lint": "eslint . && vue-tsc --noEmit",
+    "lint:fix": "eslint . --fix",
+    "test": "vitest",
+    "release": "bumpp --commit --push --tag"
+  },
+  "dependencies": {
+    "@iconify/vue": "4.3.0",
+    "@micro-zoe/micro-app": "1.0.0-rc.24",
+    "@unhead/vue": "^2.0.5",
+    "@vant/area-data": "^2.0.0",
+    "@vant/touch-emulator": "^1.4.0",
+    "@vant/use": "^1.6.0",
+    "@vueuse/core": "^13.1.0",
+    "animate.css": "^4.1.1",
+    "axios": "^1.8.4",
+    "crypto-js": "^4.2.0",
+    "echarts": "^5.6.0",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "ol": "^10.5.0",
+    "pinia": "^3.0.2",
+    "pinia-plugin-persistedstate": "^4.2.0",
+    "qs": "^6.14.0",
+    "resize-detector": "^0.3.0",
+    "store": "^2.0.12",
+    "vant": "^4.9.18",
+    "vconsole": "^3.15.1",
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.0",
+    "vue3-hash-calendar": "^1.1.3"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "^4.12.0",
+    "@iconify/json": "2.2.318",
+    "@types/crypto-js": "^4.2.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^22.14.1",
+    "@types/nprogress": "^0.2.3",
+    "@types/store": "^2.0.5",
+    "@unocss/eslint-plugin": "^66.1.0-beta.11",
+    "@unocss/preset-rem-to-px": "66.1.0-beta.11",
+    "@vitejs/plugin-legacy": "^6.0.2",
+    "@vitejs/plugin-vue": "^5.2.3",
+    "autoprefixer": "^10.4.21",
+    "bumpp": "^10.1.0",
+    "commitizen": "^4.3.1",
+    "consola": "^3.4.2",
+    "cross-env": "^7.0.3",
+    "cz-emoji-chinese": "^0.3.1",
+    "eslint": "^9.24.0",
+    "eslint-ts-patch": "^8.57.0-0",
+    "husky": "^9.1.7",
+    "less": "^4.3.0",
+    "mockjs": "^1.1.0",
+    "postcss-mobile-forever": "^5.0.0",
+    "rollup": "^4.40.0",
+    "terser": "^5.39.0",
+    "typescript": "^5.8.3",
+    "unocss": "^66.1.0-beta.11",
+    "unplugin-auto-import": "^19.1.2",
+    "unplugin-vue-components": "^28.4.1",
+    "unplugin-vue-router": "^0.12.0",
+    "vite": "^6.2.6",
+    "vite-plugin-compression": "^0.5.1",
+    "vite-plugin-mock-dev-server": "^1.8.5",
+    "vite-plugin-pwa": "^1.0.0",
+    "vite-plugin-sitemap": "^0.7.1",
+    "vite-plugin-svg-icons": "^2.0.1",
+    "vite-plugin-vconsole": "^2.1.1",
+    "vite-plugin-vue-devtools": "^7.7.2",
+    "vite-plugin-vue-layouts": "^0.11.0",
+    "vitest": "^3.1.1",
+    "vue-tsc": "^2.2.8"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": [
+        "postcss",
+        "esbuild"
+      ],
+      "allowedVersions": {
+        "rollup": "^4.x"
+      }
+    }
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-emoji-chinese"
+    },
+    "cz-emoji-chinese": {
+      "skipQuestions": [
+        "body",
+        "scope"
+      ]
+    }
+  }
+}

package/src/components/data/XBadge/index.vue

@@ -23,8 +23,8 @@ initComponent()
 
 // 组件初始化
 function initComponent() {
-  if (!dictValue) {
-    label.value = '-'
+  if (dictValue === null || dictValue === undefined) {
+    label.value = '--'
     return
   }
   if (!dictName || dictName === '') {

package/src/components/data/XCellList/index.vue

@@ -594,7 +594,7 @@ defineExpose({
                         class="card_item_title"
                         :style="handleFunctionStyle(column.styleFunctionForValue, item)"
                       >
-                        {{ item[column.dataIndex] ? item[column.dataIndex] : '--' }}
+                        {{ item[column.dataIndex] ?? '--' }}
                       </p>
                     </div>
                     <div v-for="(column) in subTitleColumns" :key="`subtitle_${column.dataIndex}`" class="sub-title">

package/src/components/data/XCellListFilter/index.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import XGridDropOption from '@af-mobile-client-vue3/components/core/XGridDropOption/index.vue'
 import XFormItem from '@af-mobile-client-vue3/components/data/XFormItem/index.vue'
+import { Icon } from '@iconify/vue'
 import {
   showFailToast,
   Button as VanButton,
@@ -284,7 +285,7 @@ function handleCloseScanButton() {
         <VanDropdownItem v-if="showScanButton" v-model="scanMenuShow" @change="handleScanMenuChange">
           <template #title>
             <div class="filter-icon-box">
-              <font-awesome-icon :icon="['fas', 'fa-qrcode']" />
+              <Icon icon="ri:qr-scan-2-line" :width="24" />
             </div>
           </template>
 
@@ -334,7 +335,7 @@ function handleCloseScanButton() {
         <VanDropdownItem v-if="!props.buttonState || props.buttonState.filter !== false" v-model="filterMenuShow" @change="handleFilterMenuChange">
           <template #title>
             <div class="filter-icon-box">
-              <font-awesome-icon :icon="['fas', 'fa-filter']" />
+              <Icon icon="mdi:filter" :width="24" />
             </div>
           </template>
           <div class="dropdown-title">

package/src/main.ts

@@ -3,7 +3,6 @@ import bootstrap from '@af-mobile-client-vue3/bootstrap'
 import Plugins from '@af-mobile-client-vue3/plugins'
 import router from '@af-mobile-client-vue3/router'
 import pinia from '@af-mobile-client-vue3/stores'
-import FontAwesomeIcon from '@af-mobile-client-vue3/styles/fontawesome-icons'
 import { createHead } from '@unhead/vue/client'
 import { createApp } from 'vue'
 import 'virtual:uno.css'
@@ -28,7 +27,6 @@ import 'vant/es/image-preview/style'
 
 (async () => {
   const app = createApp(App)
-    .component('font-awesome-icon', FontAwesomeIcon)
   const head = createHead()
 
   app.use(head)

package/src/styles/fontawesome-icons.ts

@@ -1,7 +0,0 @@
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faFilter, faFlag, faPhone, faQrcode, faUser } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-
-library.add(faPhone, faUser, faFlag, faFilter, faQrcode)
-
-export default FontAwesomeIcon