提交 4cfe9bc6 作者: 方治民

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

3.x

查看合并请求 !30
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
* Get the configuration file variable name * Get the configuration file variable name
* @param env * @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, '') return `__PRODUCTION__${env.VITE_GLOB_APP_SHORT_NAME || '__APP'}__CONF__`.toUpperCase().replace(/\s/g, '')
} }
...@@ -4,6 +4,7 @@ import prettier from 'prettier' ...@@ -4,6 +4,7 @@ import prettier from 'prettier'
// uni-app // uni-app
import uni from '@dcloudio/vite-plugin-uni' import uni from '@dcloudio/vite-plugin-uni'
// @dcloudio/uni-helper-json // @dcloudio/uni-helper-json
import tags from '@dcloudio/uni-helper-json/dist/tags.json' import tags from '@dcloudio/uni-helper-json/dist/tags.json'
...@@ -33,6 +34,7 @@ function generateUniComponentsTypes() { ...@@ -33,6 +34,7 @@ function generateUniComponentsTypes() {
const formatted = prettier.format(content, { const formatted = prettier.format(content, {
parser: 'typescript', parser: 'typescript',
// eslint-disable-next-line @typescript-eslint/no-require-imports
...require('../../prettier.config'), ...require('../../prettier.config'),
}) })
fs.writeFileSync('./types/uni.d.ts', formatted, 'utf8') fs.writeFileSync('./types/uni.d.ts', formatted, 'utf8')
......
...@@ -3,6 +3,7 @@ import type { Plugin } from 'vite' ...@@ -3,6 +3,7 @@ import type { Plugin } from 'vite'
// https://github.com/antfu/unplugin-auto-import // https://github.com/antfu/unplugin-auto-import
import AutoImport from 'unplugin-auto-import/vite' import AutoImport from 'unplugin-auto-import/vite'
// https://github.com/antfu/unplugin-vue-components // https://github.com/antfu/unplugin-vue-components
import Components from 'unplugin-vue-components/vite' import Components from 'unplugin-vue-components/vite'
......
...@@ -79,16 +79,16 @@ ...@@ -79,16 +79,16 @@
"@dcloudio/uni-mp-toutiao": "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-mp-weixin": "3.0.0-alpha-3071320230417001",
"@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3071320230417001", "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3071320230417001",
"@dcloudio/uni-ui": "^1.4.26", "@dcloudio/uni-ui": "^1.4.27",
"@faker-js/faker": "^7.6.0", "@faker-js/faker": "^7.6.0",
"@vue/runtime-core": "^3.2.47", "@vue/runtime-core": "^3.2.47",
"@vueuse/core": "^10.0.2", "@vueuse/core": "^10.1.0",
"axios": "^0.26.1", "axios": "^0.26.1",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"nanoid": "^4.0.2", "nanoid": "^4.0.2",
"pinia": "^2.0.34", "pinia": "^2.0.35",
"qs": "~6.9.7", "qs": "~6.9.7",
"stompjs": "^2.3.3", "stompjs": "^2.3.3",
"urijs": "^1.19.11", "urijs": "^1.19.11",
...@@ -107,16 +107,16 @@ ...@@ -107,16 +107,16 @@
"@dcloudio/uni-helper-json": "^1.0.13", "@dcloudio/uni-helper-json": "^1.0.13",
"@dcloudio/uni-stacktracey": "3.0.0-alpha-3071320230417001", "@dcloudio/uni-stacktracey": "3.0.0-alpha-3071320230417001",
"@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071320230417001", "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071320230417001",
"@iconify/json": "^2.2.52", "@iconify/json": "^2.2.55",
"@types/crypto-js": "^4.1.1", "@types/crypto-js": "^4.1.1",
"@types/lodash-es": "^4.17.7", "@types/lodash-es": "^4.17.7",
"@types/node": "^18.15.12", "@types/node": "^18.16.0",
"@types/prettier": "^2.7.2", "@types/prettier": "^2.7.2",
"@types/qs": "^6.9.7", "@types/qs": "^6.9.7",
"@types/stompjs": "^2.3.5", "@types/stompjs": "^2.3.5",
"@types/urijs": "^1.19.19", "@types/urijs": "^1.19.19",
"@typescript-eslint/eslint-plugin": "^5.59.0", "@typescript-eslint/eslint-plugin": "^5.59.1",
"@typescript-eslint/parser": "^5.59.0", "@typescript-eslint/parser": "^5.59.1",
"commitizen": "^4.3.0", "commitizen": "^4.3.0",
"conventional-changelog-cli": "^2.2.2", "conventional-changelog-cli": "^2.2.2",
"cz-conventional-changelog": "^3.3.0", "cz-conventional-changelog": "^3.3.0",
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
"cz-git": "^1.6.1", "cz-git": "^1.6.1",
"czg": "^1.6.1", "czg": "^1.6.1",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"eslint": "^8.38.0", "eslint": "^8.39.0",
"eslint-config-prettier": "^8.8.0", "eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.11.0", "eslint-plugin-vue": "^9.11.0",
...@@ -139,21 +139,21 @@ ...@@ -139,21 +139,21 @@
"postcss": "^8.4.23", "postcss": "^8.4.23",
"postcss-html": "^1.5.0", "postcss-html": "^1.5.0",
"postcss-less": "^6.0.0", "postcss-less": "^6.0.0",
"prettier": "^2.8.7", "prettier": "^2.8.8",
"rimraf": "^4.4.1", "rimraf": "^5.0.0",
"sass": "^1.62.0", "sass": "^1.62.0",
"sort-package-json": "^2.4.1", "sort-package-json": "^2.4.1",
"stylelint": "^15.5.0", "stylelint": "^15.6.0",
"stylelint-config-html": "^1.1.0", "stylelint-config-html": "^1.1.0",
"stylelint-config-recommended": "^11.0.0", "stylelint-config-recommended": "^12.0.0",
"stylelint-config-standard": "^32.0.0", "stylelint-config-standard": "^33.0.0",
"stylelint-order": "^6.0.3", "stylelint-order": "^6.0.3",
"typescript": "^5.0.4", "typescript": "^5.0.4",
"unocss": "^0.50.8", "unocss": "^0.50.8",
"unocss-preset-weapp": "^0.5.3", "unocss-preset-weapp": "^0.5.3",
"unplugin-auto-import": "^0.15.3", "unplugin-auto-import": "^0.15.3",
"unplugin-vue-components": "^0.24.1", "unplugin-vue-components": "^0.24.1",
"vite": "^4.2.2", "vite": "^4.3.1",
"vue-eslint-parser": "^9.1.1" "vue-eslint-parser": "^9.1.1"
}, },
"engines": { "engines": {
......
...@@ -8,6 +8,7 @@ const API_URL_PREFIX = '/api' ...@@ -8,6 +8,7 @@ const API_URL_PREFIX = '/api'
export default class BasicGenerator extends CodeGenerator { export default class BasicGenerator extends CodeGenerator {
checkJsonParam(inter: Interface, paramsCode: string): boolean { checkJsonParam(inter: Interface, paramsCode: string): boolean {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const prettier = require('prettier') const prettier = require('prettier')
const requestParams = inter.getRequestParams(this.surrounding) const requestParams = inter.getRequestParams(this.surrounding)
const code = prettier.format(paramsCode, { parser: 'typescript' }) const code = prettier.format(paramsCode, { parser: 'typescript' })
...@@ -29,6 +30,7 @@ export default class BasicGenerator extends CodeGenerator { ...@@ -29,6 +30,7 @@ export default class BasicGenerator extends CodeGenerator {
let requestParams = inter.getRequestParams(this.surrounding) let requestParams = inter.getRequestParams(this.surrounding)
let bodyTypeDef = '' let bodyTypeDef = ''
// eslint-disable-next-line @typescript-eslint/no-require-imports
const prettier = require('prettier') const prettier = require('prettier')
if (prettier.format(paramsCode, { parser: 'typescript' }).includes('{}')) { if (prettier.format(paramsCode, { parser: 'typescript' }).includes('{}')) {
if (!requestParams.includes('form')) { if (!requestParams.includes('form')) {
......
<script setup lang="ts"> <script setup lang="ts">
import { checkUpgrade } from '@/utils/upgrade' import { checkUpgrade } from '@/utils/upgrade'
// import * as Push from '@/utils/push' // import * as Push from '@/utils/push'
onLaunch(() => { onLaunch(() => {
......
<script> <script setup lang="ts">
export default { defineProps({
props: { /**
tips: { * 提示内容
type: String, */
default: '', tips: {
}, type: String,
tipsColor: { default: '',
type: String,
default: '#9C9C9C',
},
bgColor: {
type: String,
default: 'transparent',
},
}, },
} /**
* 提示内容颜色
*/
tipsColor: {
type: String,
default: '#9C9C9C',
},
/**
* 背景颜色
*/
bgColor: {
type: String,
default: 'transparent',
},
})
</script> </script>
<template> <template>
......
...@@ -122,6 +122,9 @@ ...@@ -122,6 +122,9 @@
default: false default: false
} }
}, },
data() {
return {}
},
methods: { methods: {
getColor(type) { getColor(type) {
const color = "#465CFF" const color = "#465CFF"
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
if (parentName === 'fui-collapse-item') { if (parentName === 'fui-collapse-item') {
await parent.init() await parent.init()
} }
parent = parent.$parent; parent = parent.$parent;
if (!parent) return false; if (!parent) return false;
parentName = parent.$options.name; parentName = parent.$options.name;
......
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
default: false default: false
} }
}, },
data() {
return {}
},
created() { created() {
this.children = [] this.children = []
}, },
......
...@@ -54,6 +54,9 @@ ...@@ -54,6 +54,9 @@
default: '#F1F4FA' default: '#F1F4FA'
} }
}, },
data() {
return {}
},
computed: { computed: {
getTop() { getTop() {
return Number(this.height) / 2 + 'rpx' return Number(this.height) / 2 + 'rpx'
......
...@@ -67,7 +67,10 @@ ...@@ -67,7 +67,10 @@
type: [Number, String], type: [Number, String],
default: 0 default: 0
} }
} },
data() {
return {}
},
} }
</script> </script>
......
...@@ -17,7 +17,10 @@ ...@@ -17,7 +17,10 @@
type: Boolean, type: Boolean,
default: false default: false
} }
} },
data() {
return {}
},
} }
</script> </script>
......
...@@ -74,6 +74,9 @@ ...@@ -74,6 +74,9 @@
default: 0 default: 0
} }
}, },
data() {
return {}
},
methods: { methods: {
onClick() { onClick() {
this.$emit("itemClick", { this.$emit("itemClick", {
......
...@@ -34,6 +34,9 @@ ...@@ -34,6 +34,9 @@
default: false default: false
} }
}, },
data() {
return {}
},
created() { created() {
this.childrens = []; this.childrens = [];
}, },
......
...@@ -114,6 +114,9 @@ ...@@ -114,6 +114,9 @@
default: 0 default: 0
} }
}, },
data() {
return {}
},
methods: { methods: {
handleClick() { handleClick() {
this.$emit('click', { this.$emit('click', {
......
...@@ -119,7 +119,10 @@ ...@@ -119,7 +119,10 @@
type: [Number, String], type: [Number, String],
default: 0 default: 0
} }
} },
data() {
return {}
},
} }
</script> </script>
......
...@@ -62,7 +62,10 @@ ...@@ -62,7 +62,10 @@
type: Boolean, type: Boolean,
default: false default: false
} }
} },
data() {
return {}
},
} }
</script> </script>
......
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
default: 0 default: 0
} }
}, },
data() {
return {}
},
computed: { computed: {
getGradientBgColor() { getGradientBgColor() {
// #ifdef APP-NVUE // #ifdef APP-NVUE
......
...@@ -113,6 +113,9 @@ ...@@ -113,6 +113,9 @@
default: 0 default: 0
} }
}, },
data() {
return {}
},
// #ifndef VUE3 // #ifndef VUE3
beforeDestroy() { beforeDestroy() {
if (this.__beforeUnmount) return if (this.__beforeUnmount) return
......
...@@ -110,6 +110,9 @@ ...@@ -110,6 +110,9 @@
default: '' default: ''
} }
}, },
data() {
return {}
},
computed: { computed: {
getSize() { getSize() {
const size = (uni.$fui && uni.$fui.fuiText && uni.$fui.fuiText.size) || 32 const size = (uni.$fui && uni.$fui.fuiText && uni.$fui.fuiText.size) || 32
......
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
// #endif // #endif
} }
}, },
data() {
return {}
},
provide() { provide() {
return { return {
timeaxis: this timeaxis: this
......
...@@ -17,6 +17,9 @@ ...@@ -17,6 +17,9 @@
default: 0 default: 0
} }
}, },
data() {
return {}
},
mounted() { mounted() {
if (this.vtabs && this.vtabs.linkage) { if (this.vtabs && this.vtabs.linkage) {
this.vtabs.children.push(this) this.vtabs.children.push(this)
......
...@@ -53,15 +53,17 @@ ...@@ -53,15 +53,17 @@
radius="14" radius="14"
size="large" size="large"
background="transparent" background="transparent"
class="!mb-5" class="!mb-3"
@click="surprise" @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">{{ title }}</text>
<text class="title">{{ $t('app.hello') }}</text> <text class="title">{{ $t('app.hello') }}</text>
<Icon icon="emojione:grinning-face" size="48" class="mt-3" /> <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> </view>
<fui-footer isFixed> <fui-footer isFixed>
<template #text> <template #text>
......
import type { AxiosError, AxiosInstance } from 'axios' import type { AxiosError, AxiosInstance } from 'axios'
/** /**
* 请求重试机制 * 请求重试机制
*/ */
......
// #ifdef APP-PLUS // #ifdef APP-PLUS
import checkVersion from '@/uni_modules/uni-upgrade-center-app/utils/check-update' import checkVersion from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
// #endif // #endif
export function checkUpgrade(toast = false) { export function checkUpgrade(toast = false) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论