合并分支 '3.x' 到 'main'

3.x

查看合并请求 hntq/zjtq-v5!3

.gitignore

 node_modules
 .DS_Store
 dist
-.npmrc
 .cache
 
 tests/server/static

.npmrc

+strict-peer-dependencies=false
+shell-emulator=true

.nvmrc

+v18

.prettierignore

 /dist/*
 .local
 .output.js
+.npmrc
+.nvmrc
 /node_modules/**
 
 **/*.svg

build/getConfigFileName.ts

@@ -2,6 +2,6 @@
  * Get the configuration file variable name
  * @param env
  */
-export const getConfigFileName = (env: Record<string, any>) => {
+export function getConfigFileName(env: Record<string, any>) {
     return `__PRODUCTION__${env.VITE_GLOB_APP_SHORT_NAME || '__APP'}__CONF__`.toUpperCase().replace(/\s/g, '')
 }

build/vite/uni.ts

@@ -4,6 +4,7 @@ import prettier from 'prettier'
 
 // uni-app
 import uni from '@dcloudio/vite-plugin-uni'
+
 // @dcloudio/uni-helper-json
 import tags from '@dcloudio/uni-helper-json/dist/tags.json'
 
@@ -21,7 +22,9 @@ function generateUniComponentsTypes() {
             type ComponentCustomOptions = Hooks
 
             // uni-app components
-            type UniComponent = HTMLElement
+            interface UniComponent {
+                [key in string]: any
+            }
             export interface GlobalComponents {
                 ${components.join(',\n\t')}
             }
@@ -31,6 +34,7 @@ function generateUniComponentsTypes() {
 
     const formatted = prettier.format(content, {
         parser: 'typescript',
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         ...require('../../prettier.config'),
     })
     fs.writeFileSync('./types/uni.d.ts', formatted, 'utf8')

build/vite/unplugin.ts

@@ -3,6 +3,7 @@ import type { Plugin } from 'vite'
 
 // https://github.com/antfu/unplugin-auto-import
 import AutoImport from 'unplugin-auto-import/vite'
+
 // https://github.com/antfu/unplugin-vue-components
 import Components from 'unplugin-vue-components/vite'
 
@@ -39,7 +40,7 @@ export function configComponentsImportPlugin(): Plugin {
             (name: string) => {
                 // FIX: 修复 easycom 在 APP 下不生效问题（原因不明
                 if (name.startsWith('fui-')) {
-                    return path.resolve(__dirname, `src/components/FirstUI/${name}/${name}.vue`).replaceAll('\\', '/')
+                    return path.resolve(__dirname, `src/components/firstui/${name}/${name}.vue`).replaceAll('\\', '/')
                 }
                 // if (name.startsWith('uni-')) {
                 //     return `@dcloudio/uni-ui/lib/${name}/${name}.vue`

package.json

@@ -66,29 +66,29 @@
         }
     },
     "dependencies": {
-        "@dcloudio/uni-app": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-app-plus": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-components": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-h5": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-alipay": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-baidu": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-jd": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-lark": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-qq": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-ui": "^1.4.26",
+        "@dcloudio/uni-app": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-app-plus": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-components": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-h5": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-mp-alipay": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-mp-baidu": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-mp-jd": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-mp-lark": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-mp-qq": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-ui": "^1.4.27",
         "@faker-js/faker": "^7.6.0",
         "@vue/runtime-core": "^3.2.47",
-        "@vueuse/core": "^9.13.0",
+        "@vueuse/core": "^10.1.0",
         "axios": "^0.26.1",
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.7",
         "lodash-es": "^4.17.21",
         "nanoid": "^4.0.2",
-        "pinia": "^2.0.33",
+        "pinia": "^2.0.35",
         "qs": "~6.9.7",
         "stompjs": "^2.3.3",
         "urijs": "^1.19.11",
@@ -98,25 +98,25 @@
         "vue-types": "^5.0.2"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^0.38.2",
-        "@commitlint/cli": "^17.5.1",
-        "@commitlint/config-conventional": "^17.4.4",
+        "@antfu/eslint-config": "^0.38.5",
+        "@commitlint/cli": "^17.6.1",
+        "@commitlint/config-conventional": "^17.6.1",
         "@dcloudio/types": "^3.3.2",
-        "@dcloudio/uni-automator": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331002",
+        "@dcloudio/uni-automator": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/uni-cli-shared": "3.0.0-alpha-3071320230417001",
         "@dcloudio/uni-helper-json": "^1.0.13",
-        "@dcloudio/uni-stacktracey": "3.0.0-alpha-3071220230331002",
-        "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071220230331002",
-        "@iconify/json": "^2.2.43",
+        "@dcloudio/uni-stacktracey": "3.0.0-alpha-3071320230417001",
+        "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071320230417001",
+        "@iconify/json": "^2.2.54",
         "@types/crypto-js": "^4.1.1",
         "@types/lodash-es": "^4.17.7",
-        "@types/node": "^18.15.11",
+        "@types/node": "^18.15.13",
         "@types/prettier": "^2.7.2",
         "@types/qs": "^6.9.7",
         "@types/stompjs": "^2.3.5",
         "@types/urijs": "^1.19.19",
-        "@typescript-eslint/eslint-plugin": "^5.57.0",
-        "@typescript-eslint/parser": "^5.57.0",
+        "@typescript-eslint/eslint-plugin": "^5.59.0",
+        "@typescript-eslint/parser": "^5.59.0",
         "commitizen": "^4.3.0",
         "conventional-changelog-cli": "^2.2.2",
         "cz-conventional-changelog": "^3.3.0",
@@ -124,37 +124,36 @@
         "cz-git": "^1.6.1",
         "czg": "^1.6.1",
         "dotenv": "^16.0.3",
-        "eslint": "^8.37.0",
+        "eslint": "^8.39.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
-        "eslint-plugin-vue": "^9.10.0",
+        "eslint-plugin-vue": "^9.11.0",
         "husky": "^8.0.3",
         "jest": "27.0.4",
         "jest-environment-node": "27.5.1",
         "less": "^4.1.3",
-        "lint-staged": "^13.2.0",
+        "lint-staged": "^13.2.1",
         "npm-run-all": "^4.1.5",
         "picocolors": "^1.0.0",
         "pont-engine": "^1.5.7",
-        "postcss": "^8.4.21",
+        "postcss": "^8.4.23",
         "postcss-html": "^1.5.0",
         "postcss-less": "^6.0.0",
         "prettier": "^2.8.7",
-        "rimraf": "^4.4.1",
-        "sass": "^1.60.0",
+        "rimraf": "^5.0.0",
+        "sass": "^1.62.0",
         "sort-package-json": "^2.4.1",
-        "stylelint": "^15.4.0",
+        "stylelint": "^15.6.0",
         "stylelint-config-html": "^1.1.0",
-        "stylelint-config-recommended": "^11.0.0",
-        "stylelint-config-standard": "^32.0.0",
+        "stylelint-config-recommended": "^12.0.0",
+        "stylelint-config-standard": "^33.0.0",
         "stylelint-order": "^6.0.3",
-        "terser": "^5.16.8",
-        "typescript": "^5.0.3",
-        "unocss": "^0.50.6",
-        "unocss-preset-weapp": "^0.5.2",
-        "unplugin-auto-import": "^0.15.2",
+        "typescript": "^5.0.4",
+        "unocss": "^0.50.8",
+        "unocss-preset-weapp": "^0.5.3",
+        "unplugin-auto-import": "^0.15.3",
         "unplugin-vue-components": "^0.24.1",
-        "vite": "^4.2.1",
+        "vite": "^4.3.1",
         "vue-eslint-parser": "^9.1.1"
     },
     "engines": {

pont-template.ts

@@ -8,6 +8,7 @@ const API_URL_PREFIX = '/api'
 
 export default class BasicGenerator extends CodeGenerator {
     checkJsonParam(inter: Interface, paramsCode: string): boolean {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         const prettier = require('prettier')
         const requestParams = inter.getRequestParams(this.surrounding)
         const code = prettier.format(paramsCode, { parser: 'typescript' })
@@ -29,6 +30,7 @@ export default class BasicGenerator extends CodeGenerator {
         let requestParams = inter.getRequestParams(this.surrounding)
         let bodyTypeDef = ''
 
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         const prettier = require('prettier')
         if (prettier.format(paramsCode, { parser: 'typescript' }).includes('{}')) {
             if (!requestParams.includes('form')) {

src/App.vue

 <script setup lang="ts">
     import { checkUpgrade } from '@/utils/upgrade'
+
     // import * as Push from '@/utils/push'
 
     onLaunch(() => {

src/components/Empty/index.vue

-<script>
-    export default {
-        props: {
+<script setup lang="ts">
+    defineProps({
+        /**
+         * 提示内容
+         */
         tips: {
             type: String,
             default: '',
         },
+        /**
+         * 提示内容颜色
+         */
         tipsColor: {
             type: String,
             default: '#9C9C9C',
         },
+        /**
+         * 背景颜色
+         */
         bgColor: {
             type: String,
             default: 'transparent',
         },
-        },
-    }
+    })
 </script>
 
 <template>

src/components/firstui/README.md

+# 组件更新说明
+
+1. 从 https://firstui.cn/user/order 下载更新版本包
+2. 在本地解压，找到 \FirstUI\components\firstui 目录，使用 vscode 打开当前目录
+3. 清理掉组件文件头部的 license 信息，使用 vscode 全局替换
+4. 全局替换换行符 \r\n 为 \n [引用](https://segmentfault.com/q/1010000011799577)
+5. 将文件拷贝到 src\components\FirstUI\ 目录下，检查 git diff，手动处理哪些文件需要更新

src/components/firstui/fui-alert/fui-alert.vue

@@ -122,6 +122,9 @@
 				default: false
 			}
 		},
+        data() {
+            return {}
+        },
 		methods: {
 			getColor(type) {
 				const color = "#465CFF"

src/components/firstui/fui-autograph/fui-autograph.vue

-<!--本文件由FirstUI授权予长沙壹润信息科技发展有限公司（手机号：1  5616  2 6 019    5，身份证尾号：  5 0 375T）专用，请尊重知识产权，勿私下传播，违者追究法律责任。-->
 <template>
 	<view class="fui-autograph__wrap" :style="{ width: w + 'px', height:h + 'px',background:background  }"
 		ref="fui_gcanvas_ag">

src/components/firstui/fui-autograph/gcanvas/index.js

 import GCanvas from './env/canvas';
 import GImage from './env/image';
 
-import GWebGLRenderingContext from './context-webgl/RenderingContext';
+import GWebGLRenderingContext from './context-webgl/RenderingContext';// 2021-5-6变更
 import GContext2D from './context-2d/RenderingContext';
 
 import GBridgeWeex from './bridge/bridge-weex';
@@ -12,12 +12,12 @@ export let WeexBridge = GBridgeWeex;
 
 export function enable(el, {
 	bridge,
-	debug,
+	debug,// 2021-5-6变更
 	disableAutoSwap,
 	disableComboCommands
 } = {}) {
 
-	const GBridge = GImage.GBridge = GCanvas.GBridge = GWebGLRenderingContext.GBridge = GContext2D.GBridge = bridge;
+	const GBridge = GImage.GBridge = GCanvas.GBridge = GWebGLRenderingContext.GBridge = GContext2D.GBridge = bridge;// 功能需要优化
 
 	GBridge.callEnable(el.ref, [
 		0, // renderMode: 0--RENDERMODE_WHEN_DIRTY, 1--RENDERMODE_CONTINUOUSLY
@@ -29,7 +29,7 @@ export function enable(el, {
 		false // sameLevel: newCanvasMode = true && true => GCanvasView and Webview is same level
 	]);
 
-	if (debug === true) {
+	if (debug === true) {// echo建议
 		GBridge.callEnableDebug();
 	}
 	if (disableComboCommands) {
@@ -41,7 +41,7 @@ export function enable(el, {
 	});
 	let pixelRatio = uni.getSystemInfoSync().pixelRatio;
 	canvas.width = el.style.width * pixelRatio;
-	canvas.height = el.style.height * pixelRatio;
+	canvas.height = el.style.height * pixelRatio;// 新特性待增加
 
 	return canvas;
 };

src/components/firstui/fui-bubble-box/fui-bubble-box.vue

@@ -159,11 +159,11 @@
 					styl += `width:${this.width}rpx;`
 				}
 				if (this.position === 'fixed') {
-					let tb = this.top ? `top:${this.top}rpx;` : '';
-					tb += this.bottom ? `bottom:${this.bottom}rpx;` : '';
+					let tb = Number(this.top) ? `top:${this.top}rpx;` : '';
+					tb += Number(this.bottom) ? `bottom:${this.bottom}rpx;` : '';
 					styl += tb ? tb : `top:${this.top}rpx;`
-					let lr = this.left ? `left:${this.left}rpx;` : '';
-					lr += this.right ? `right:${this.right}rpx;` : '';
+					let lr = Number(this.left) ? `left:${this.left}rpx;` : '';
+					lr += Number(this.right) ? `right:${this.right}rpx;` : '';
 					styl += lr ? lr : `left:${this.left}rpx;`;
 				} else {
 					// #ifdef APP-NVUE
@@ -184,6 +184,13 @@
 							break;
 					}
 					// #endif
+
+					let tb = Number(this.top) ? `margin-top:${this.top}rpx;` : '';
+					tb += Number(this.bottom) ? `margin-top:-${this.bottom}rpx;` : '';
+					styl += tb ? tb : `margin-top:${this.top}rpx;`
+					let lr = Number(this.left) ? `margin-left:${this.left}rpx;` : '';
+					lr += Number(this.right) ? `margin-left:-${this.right}rpx;` : '';
+					styl += lr ? lr : `margin-left:${this.left}rpx;`;
 				}
 				return styl
 			},
@@ -320,6 +327,9 @@
 		/* #ifdef APP-NVUE */
 		transition: opacity 0.3s ease-in-out;
 		/* #endif */
+		/* margin-top: -120rpx; */
+		/* margin-left: 20rpx; */
+
 	}
 
 

src/components/firstui/fui-collapse/fui-collapse.vue

@@ -14,6 +14,9 @@
 				default: false
 			}
 		},
+        data() {
+            return {}
+        },
 		created() {
 			this.children = []
 		},

src/components/firstui/fui-digital-keyboard/fui-digital-keyboard.vue

@@ -203,9 +203,8 @@
 				let iphonex = false;
 				let models = ['iphonex', 'iphonexr', 'iphonexsmax', 'iphone11', 'iphone11pro', 'iphone11promax',
 					'iphone12', 'iphone12mini', 'iphone12pro', 'iphone12promax', 'iphone13', 'iphone13mini',
-					'iphone13pro', 'iphone13promax', 'iphone14', 'iphone14mini', 'iphone14plus',
-					'iphone14pro', 'iphone14promax', 'iphone15', 'iphone15mini', 'iphone15plus',
-					'iphone15pro', 'iphone15promax'
+					'iphone13pro', 'iphone13promax', 'iphone14', 'iphone14mini',
+					'iphone14pro', 'iphone14promax'
 				]
 				const model = res.model.replace(/\s/g, "").toLowerCase()
 				const newModel = model.split('<')[0]

src/components/firstui/fui-divider/fui-divider.vue

@@ -54,6 +54,9 @@
 				default: '#F1F4FA'
 			}
 		},
+        data() {
+            return {}
+        },
 		computed: {
 			getTop() {
 				return Number(this.height) / 2 + 'rpx'

src/components/firstui/fui-drag/fui-drag.vue

@@ -5,22 +5,24 @@
 		:class="[dragging?'fui-drag-item__show':'fui-drag-item__hidden']">
 		<!-- #endif -->
 		<!-- #ifdef APP-VUE || MP-WEIXIN || H5 -->
-		<view class="fui-drag__wrap" :class="[dragging?'fui-drag-item__show':'fui-drag-item__hidden']" ref="fui_drag"
-			:id="elId" :style="{width:wrapWidth+'px',height:(rows * cellHeight)+'px'}" :list="list"
+		<!-- #ifdef VUE2 -->
+		<view class="fui-drag__wrap" :catch:touchmove="wxDrag?handler.stopTouchMove:''"
+			:class="[dragging?'fui-drag-item__show':'fui-drag-item__hidden']" ref="fui_drag" :id="elId"
+			:style="{width:wrapWidth+'px',height:(rows * cellHeight)+'px'}" :list="list"
 			:change:list="handler.listChange" :param="param" :change:param="handler.paramChange">
-			<!-- #ifndef MP-WEIXIN -->
+			<!-- #endif -->
+			<!-- #ifdef VUE3 -->
+			<!-- vue3下编译到小程序data数据与wxs混用中无法获取 $data数据无法直接应用到页面，uni-app官方编译bug-->
+			<view class="fui-drag__wrap" :catch:touchmove="wxDrag?true:''"
+				:class="[dragging?'fui-drag-item__show':'fui-drag-item__hidden']" ref="fui_drag" :id="elId"
+				:style="{width:wrapWidth+'px',height:(rows * cellHeight)+'px'}" :list="list"
+				:change:list="handler.listChange" :param="param" :change:param="handler.paramChange">
+				<!-- #endif -->
 				<view class="fui-drag-item__wrap" :style="{width:cellWidth+'px',height:cellHeight+'px'}"
 					v-for="(item, index) in list" :key="item.id" :data-index="index" @longpress="handler.longPress"
 					:data-param="param" :data-isdrag="isDrag && dragging?1:0" @touchstart="handler.touchStart"
 					@touchmove="handler.touchMove" @touchend="handler.touchEnd" @mousedown="handler.mousedown"
 					@tap="itemClick(index)">
-				<!-- #endif -->
-				<!-- #ifdef MP-WEIXIN -->
-				<view class="fui-drag-item__wrap" :style="{width:cellWidth+'px',height:cellHeight+'px'}"
-					v-for="(item, index) in list" :key="item.id" :data-index="index" @longpress="handler.longPress"
-					:data-param="param" :data-isdrag="isDrag && dragging?1:0" @touchstart="handler.touchStart"
-					:catch:touchmove="wxDrag?handler.touchMove:''" @touchend="handler.touchEnd" @tap="itemClick(index)">
-					<!-- #endif -->
 					<template v-if="custom">
 						<slot :model="item.entity" :width="cellWidth" :height="cellHeight" :index="index"></slot>
 					</template>

src/components/firstui/fui-drag/index.wxs

@@ -273,6 +273,10 @@ function mousedown(e, ins) {
 }
 
 
+function stopTouchMove(e) {
+	return true
+}
+
 module.exports = {
 	longPress: longPress,
 	touchStart: touchStart,
@@ -280,5 +284,6 @@ module.exports = {
 	touchEnd: touchEnd,
 	paramChange: paramChange,
 	listChange: listChange,
-	mousedown: mousedown
+	mousedown: mousedown,
+	stopTouchMove:stopTouchMove
 }

src/components/firstui/fui-empty/fui-empty.vue

@@ -67,7 +67,10 @@
 				type: [Number, String],
 				default: 0
 			}
-		}
+		},
+        data() {
+            return {}
+        },
 	}
 </script>
 

src/components/firstui/fui-form-field/fui-form-field.vue

@@ -17,7 +17,10 @@
 				type: Boolean,
 				default: false
 			}
-		}
+		},
+        data() {
+            return {}
+        },
 	}
 </script>
 

src/components/firstui/fui-form-item/fui-form-item.vue

@@ -3,7 +3,7 @@
 		:style="{paddingTop:padding[0] || 0,paddingRight:padding[1] || 0,paddingBottom:padding[2] || padding[0] || 0,paddingLeft:padding[3] || padding[1] || 0,background:background,marginTop:marginTop+'rpx',marginBottom:marginBottom+'rpx',borderRadius:radius}"
 		@tap="handleClick">
 		<!-- #ifdef APP-NVUE -->
-		<view class="fui-form__asterisk" v-if="asterisk">
+		<view class="fui-form__asterisk" :style="{left:getAkPosi}" v-if="asterisk">
 			<text :style="{color:asteriskColor || akColor || '#FF2B2B'}">*</text>
 		</view>
 		<!-- #endif -->
@@ -145,7 +145,7 @@
 				return `${this.labelWidth || this.lWidth || labelWidth}rpx`
 			},
 			getLabelRight() {
-				const labelRight = (uni.$fui && uni.$fui.fuiFormItem && uni.$fui.fuiFormItem.labelRight) || 16
+				const labelRight = (uni.$fui && uni.$fui.fuiFormItem && uni.$fui.fuiFormItem.labelRight) || 30
 				return `${this.labelRight || labelRight}rpx`
 			},
 			getLabelAlign() {

src/components/firstui/fui-grid-item/fui-grid-item.vue

@@ -11,6 +11,7 @@
 <script>
 	export default {
 		name: "fui-grid-item",
+		emits: ['click'],
 		inject: ['grid'],
 		// #ifdef MP-WEIXIN
 		options: {
@@ -79,11 +80,13 @@
 				}
 			},
 			handleClick() {
-				this.grid.handleClick({
+				const e = {
 					detail: {
 						index: this.index
 					}
-				})
+				}
+				this.grid && this.grid.handleClick(e)
+				this.$emit('click', e)
 			}
 		}
 	}

src/components/firstui/fui-index-list/f-index-list-item.vue

@@ -74,6 +74,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		methods: {
 			onClick() {
 				this.$emit("itemClick", {

src/components/firstui/fui-input-number/fui-input-number.vue

@@ -307,6 +307,13 @@
 		font-weight: 500;
 	}
 
+	/* #ifdef H5 */
+	input::-webkit-outer-spin-button,
+	input::-webkit-inner-spin-button {
+	    -webkit-appearance: none;
+	}
+	/* #endif */
+
 	.fui-number__disabled {
 		opacity: 0.6;
 	}

src/components/firstui/fui-label/fui-label.vue

@@ -34,6 +34,9 @@
 				default: false
 			}
 		},
+        data() {
+            return {}
+        },
 		created() {
 			this.childrens = [];
 		},

src/components/firstui/fui-license-plate/fui-license-plate.js

@@ -64,7 +64,7 @@ export default [{
 		cn: '晋',
 		en: 'P'
 	}]
-}, {
+}, {// echo建议
 	id: 'f_p3',
 	keys: [{
 		cn: '蒙',
@@ -82,7 +82,7 @@ export default [{
 		cn: '贵',
 		en: 'G'
 	}, {
-		cn: '粤',
+		cn: '粤',// 功能需要优化
 		en: 'H'
 	}, {
 		cn: '青',
@@ -97,10 +97,10 @@ export default [{
 		cn: '宁',
 		en: ''
 	}]
-}, {
+}, {// 新特性待增加
 	id: 'f_p4',
 	keys: [{
-		cn: 'ABC',
+		cn: 'ABC',// echo建议
 		en: '返回'
 	}, {
 		cn: '琼',
@@ -119,7 +119,7 @@ export default [{
 		en: 'B'
 	}, {
 		cn: '港',
-		en: 'N'
+		en: 'N'// 新特性待增加
 	}, {
 		cn: '澳',
 		en: 'M'

src/components/firstui/fui-list-cell/fui-list-cell.vue

@@ -114,6 +114,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		methods: {
 			handleClick() {
 				this.$emit('click', {

src/components/firstui/fui-list/fui-list.vue

@@ -119,7 +119,10 @@
 				type: [Number, String],
 				default: 0
 			}
-		}
+		},
+        data() {
+            return {}
+        },
 	}
 </script>
 

src/components/firstui/fui-load-ani/fui-load-ani.vue

@@ -62,7 +62,10 @@
 				type: Boolean,
 				default: false
 			}
-		}
+		},
+        data() {
+            return {}
+        },
 	}
 </script>
 

src/components/firstui/fui-modal/fui-modal.vue

@@ -15,10 +15,10 @@
 				<view class="fui-modal__button"
 					:class="{'fui-modal__button-col':direction==='column' && index!==vals.length-1,'fui-modal__button-bg':!entity.plain && !entity.background,'fui-modal__button-border':entity.plain,'fui-modal__button-bc':entity.plain && !entity.background}"
 					:style="{borderRadius:radius+'rpx',background:entity.plain?'transparent':(entity.background || '#465CFF'),borderColor:entity.plain?(entity.background || '#465CFF'):'transparent'}"
-					v-for="(entity,index) in vals" :key="index" @tap.stop="handleClick($event,index)">
+					v-for="(entity,index) in vals" :key="index">
 					<text class="fui-modal__button-inner"
 						:class="{'fui-modal__button-color': !entity.color && entity.plain}"
-						:style="{color:entity.color || (entity.plain?'#465CFF':'#fff')}">{{entity.text}}</text>
+						:style="{color:entity.color || (entity.plain?'#465CFF':'#fff'),borderRadius:radius+'rpx'}" @tap.stop="handleClick($event,index)">{{entity.text}}</text>
 				</view>
 			</view>
 		</view>
@@ -338,6 +338,9 @@
 		border-width: 1rpx;
 		transform: translateZ(0);
 		/* #endif */
+		/* #ifdef H5 */
+		border-width: 1px;
+		/* #endif */
 		border-style: solid;
 	}
 

src/components/firstui/fui-overflow-hidden/fui-overflow-hidden.vue

@@ -84,6 +84,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		computed: {
 			getGradientBgColor() {
 				// #ifdef APP-NVUE

src/components/firstui/fui-select/fui-select.vue

@@ -34,9 +34,10 @@
 							<view class="fui-select__flex">
 								<view class="fui-select__icon-box"
 									:class="{'fui-select__icon-ml':!isReverse && type==='select','fui-select__icon-mr':isReverse}"
-									:style="{width:iconWidth+'rpx',height:iconWidth+'rpx'}" v-if="model.src">
+									:style="{width:iconWidth+'rpx',height:iconWidth+'rpx',backgroundColor:iconBgColor}"
+									v-if="model.src">
 									<image :src="model.src" :style="{width:iconWidth+'rpx',height:iconWidth+'rpx'}"
-										mode="widthFix"></image>
+										:mode="iconMode"></image>
 								</view>
 								<text class="fui-select__item-text"
 									:class="{'fui-select__text-pl':!isReverse && (type==='select' || model.src),'fui-select__text-pr':isReverse && (type==='select' || model.src)}"
@@ -181,6 +182,14 @@
 				type: [Number, String],
 				default: 48
 			},
+			iconBgColor: {
+				type: String,
+				default: 'rgba(0,0,0,0)'
+			},
+			iconMode: {
+				type: String,
+				default: 'widthFix'
+			},
 			size: {
 				type: [Number, String],
 				default: 30
@@ -484,7 +493,9 @@
 		/* #ifndef APP-NVUE */
 		width: 100%;
 		/* #endif */
-		flex: 1;
+		/* #ifdef APP-NVUE */
+		width: 750rpx;
+		/* #endif */
 	}
 
 	.fui-select__list {
@@ -600,10 +611,12 @@
 
 	.fui-select__icon-box {
 		overflow: hidden;
-		background-color: #F1F4FA;
 		/* #ifndef APP-NVUE */
 		flex-shrink: 0;
+		display: flex;
 		/* #endif */
+		align-items: center;
+		justify-content: center;
 	}
 
 	.fui-select__icon-ml {
@@ -619,13 +632,14 @@
 		width: 100%;
 		display: flex;
 		/* #endif */
-		flex: 1;
+		/* #ifdef APP-NVUE */
+		width: 750rpx;
+		/* #endif */
 		height: 98rpx;
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
 		position: relative;
-
 	}
 
 	.fui-select__header-line {

src/components/firstui/fui-swipe-action/bindingx.js

@@ -9,7 +9,7 @@ export default {
 	},
 	watch: {
 		show(newVal) {
-			// if (this.autoClose) return
+			if (this.autoClose) return
 			if (this.stop) return
 			this.stop = true
 			if (newVal) {
@@ -55,6 +55,7 @@ export default {
 			})
 		},
 		touchstart(e) {
+			if (this.disabled) return
 			// 每次只触发一次，避免多次监听造成闪烁
 			if (this.stop) return
 			this.stop = true
@@ -62,7 +63,7 @@ export default {
 				this.group.closeAuto(this)
 			}
 
-			const rightWidth = this.button.right.width
+			const rightWidth = this.button.right.width || 0
 			let expression = this.range(this.x, -rightWidth, 0)
 			let rightExpression = this.range(this.x + rightWidth, 0, rightWidth)
 
@@ -93,7 +94,7 @@ export default {
 		},
 		bindTiming(x) {
 			const left = this.x
-			const rightWidth = this.button.right.width
+			const rightWidth = this.button.right.width || 0
 			const threshold = Number(this.threshold)
 			if (!this.isopen) {
 				if (left < -threshold) {
@@ -102,7 +103,7 @@ export default {
 					this.open(false)
 				}
 			} else {
-				if ((x < threshold && x > 0) || (x + leftWidth < -threshold)) {
+				if ((x < threshold && x > 0) || (x < -threshold)) {
 					this.open(true)
 				} else {
 					this.open(false)
@@ -120,7 +121,7 @@ export default {
 		},
 		animation(type) {
 			const time = 300
-			const rightWidth = this.button.right.width
+			const rightWidth = this.button.right.width || 0
 			if (this.eventpan && this.eventpan.token) {
 				BindingX.unbind({
 					token: this.eventpan.token,

src/components/firstui/fui-swipe-action/fui-swipe-action.vue

@@ -113,6 +113,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		// #ifndef VUE3
 		beforeDestroy() {
 			if (this.__beforeUnmount) return

src/components/firstui/fui-swipe-action/index.wxs

@@ -24,8 +24,12 @@ function getDom(ins, ownerInstance) {
 		return;
 	}
 	if (isH5 || isPC()) {
+		if (rightDom['$el']) {
 			state.rightWidth = rightDom['$el'].offsetWidth || 0
 		} else {
+			state.rightWidth = 0
+		}
+	} else {
 		var rightStyles = rightDom.getBoundingClientRect()
 		state.rightWidth = rightStyles.width || 0
 	}

src/components/firstui/fui-swipe-action/mpwxs.js

@@ -25,9 +25,13 @@ export default {
 		}
 	},
 	mounted() {
+		this.$nextTick(() => {
+			setTimeout(() => {
 				this.isShow = this.show
 				this.isDisabled = this.disabled
 				this.thresholdVal = Number(this.threshold)
+			}, 10)
+		})
 	},
 	methods: {
 		closeSwipe(e) {
@@ -37,7 +41,7 @@ export default {
 		change(e) {
 			this.$emit('change', {
 				isOpen: e.open === 'right',
-				param:this.param
+				param: this.param
 			})
 			if (this.isShow !== e.open) {
 				this.isShow = e.open

src/components/firstui/fui-switch/fui-switch.vue

@@ -9,7 +9,7 @@
 		<view class="fui-switch__input-def" :style="{background:val?color:'#dfdfdf',borderColor:val?color:borderColor}"
 			:class="{'fui-switch__input--checked':val,'fui-checkbox__disabled':disabled,'fui-switch__color':val && !color}"
 			v-if="type==='switch'">
-			<switch class="fui-switch__hidden" @change="change" :name="name" :checked="val" :disabled="disabled"
+			<switch class="fui-switch__hidden" :class="{'fui-pointer__events':isLabel}" @change="change" :name="name" :checked="val" :disabled="disabled"
 				:color="color">
 			</switch>
 		</view>
@@ -18,7 +18,8 @@
 			:style="{background:val?color:'#fff',border:val?`1px solid ${color}`:`1px solid ${borderColor}`}" v-else>
 			<view class="fui-check__mark" :style="{borderBottomColor:checkMarkColor,borderRightColor:checkMarkColor}"
 				v-if="val"></view>
-			<switch class="fui-switch__hidden" style="opacity: 0;position: absolute;" @change="change" :name="name" :type="isNvue?'switch':'checkbox'"
+			<switch class="fui-switch__hidden" :class="{'fui-pointer__events':isLabel}"
+				style="opacity: 0;position: absolute;" @change="change" :name="name" :type="isNvue?'switch':'checkbox'"
 				:checked="val" :disabled="disabled"></switch>
 		</view>
 	</view>
@@ -87,7 +88,8 @@
 			// #endif
 			return {
 				val: false,
-				isNvue: isNvue
+				isNvue: isNvue,
+				isLabel: false
 			};
 		},
 		watch: {
@@ -99,6 +101,7 @@
 			this.val = this.checked;
 			this.label = this.getParent();
 			if (this.label) {
+				this.isLabel = true
 				this.label.childrens.push(this)
 			}
 		},
@@ -273,6 +276,13 @@
 		/* #endif */
 	}
 
+	/* #ifdef H5 */
+	.fui-pointer__events {
+		pointer-events: none;
+	}
+
+	/* #endif */
+
 	.fui-checkbox__disabled {
 		opacity: 0.6;
 	}

src/components/firstui/fui-tabs/fui-tabs.vue

@@ -482,6 +482,7 @@
 
 	.fui-tabs__line-center {
 		justify-content: center;
+		left: 0;
 	}
 
 	.fui-tabs__ac-line {
@@ -492,10 +493,6 @@
 		width: 45rpx !important;
 	}
 
-	.fui-tabs__line-center {
-		left: 0;
-	}
-
 	/* #ifndef APP-NVUE */
 	.fui-tabs__selected-color {
 		color: var(--fui-color-primary, #465CFF) !important;

src/components/firstui/fui-text/fui-text.vue

@@ -110,6 +110,9 @@
 				default: ''
 			}
 		},
+        data() {
+            return {}
+        },
 		computed: {
 			getSize() {
 				const size = (uni.$fui && uni.$fui.fuiText && uni.$fui.fuiText.size) || 32

src/components/firstui/fui-timeaxis/fui-timeaxis.vue

@@ -37,6 +37,9 @@
 				// #endif
 			}
 		},
+        data() {
+            return {}
+        },
 		provide() {
 			return {
 				timeaxis: this

src/components/firstui/fui-vtabs-content/fui-vtabs-content.vue

@@ -17,6 +17,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		mounted() {
 			if (this.vtabs && this.vtabs.linkage) {
 				this.vtabs.children.push(this)

src/main.ts

@@ -6,7 +6,7 @@ import App from './App.vue'
 import { setupAppConfig } from '@/config/app'
 import { setupStore } from '@/store'
 import { setupI18n } from '@/locales'
-import FuiConfig from '@/components/FirstUI/fui-config'
+import FuiConfig from '@/components/firstui/fui-config'
 
 export function createApp() {
     const app = createSSRApp(App)

src/pages.json

@@ -55,7 +55,7 @@
         "autoscan": true,
         "custom": {
             // https://doc.firstui.cn/docs/introduce.html
-            "^fui-(.*)": "@/components/FirstUI/fui-$1/fui-$1.vue",
+            "^fui-(.*)": "@/components/firstui/fui-$1/fui-$1.vue",
             // https://ext.dcloud.net.cn/plugin?id=55#detail
             "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
         }

src/pages/index/index.vue

@@ -53,15 +53,17 @@
             radius="14"
             size="large"
             background="transparent"
-            class="!mb-5"
+            class="!mb-3"
             @click="surprise"
         />
-        <view class="flex-center flex-col mb-5">
+        <view class="flex-center flex-col mb-3">
             <text class="title">{{ title }}</text>
             <text class="title">{{ $t('app.hello') }}</text>
             <Icon icon="emojione:grinning-face" size="48" class="mt-3" />
 
-            <uni-icons type="hand-up" size="30" class="mt-3" :class="[animate]" @click="handUp" />
+            <fui-divider />
+
+            <uni-icons type="hand-up" size="30" :class="[animate]" @click="handUp" />
         </view>
         <fui-footer isFixed>
             <template #text>

src/utils/http/axios/axiosRetry.ts

 import type { AxiosError, AxiosInstance } from 'axios'
+
 /**
  *  请求重试机制
  */

src/utils/upgrade/index.ts

 // #ifdef APP-PLUS
 import checkVersion from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
+
 // #endif
 
 export function checkUpgrade(toast = false) {

types/uni.d.ts

@@ -6,7 +6,9 @@ declare module 'vue' {
     type ComponentCustomOptions = Hooks
 
     // uni-app components
-    type UniComponent = HTMLElement
+    interface UniComponent {
+        [key in string]: any
+    }
     export interface GlobalComponents {
         block: UniComponent
         view: UniComponent

unocss.config.ts

 import { defineConfig } from 'unocss'
+// https://github.com/MellowCo/unocss-preset-weapp
 import presetWeapp from 'unocss-preset-weapp'
 import { defaultAttributes, transformerAttributify, transformerClass } from 'unocss-preset-weapp/transformer'
 

vite.config.ts

@@ -30,6 +30,9 @@ export default ({ mode }: ConfigEnv): UserConfig => {
         optimizeDeps: {
             include: ['lodash-es', '@vueuse/core'],
         },
+        esbuild: {
+            drop: ['console', 'debugger'],
+        },
         build: {
             target: 'es2015',
             sourcemap: !!isDevFn(mode),