Merge branch 'dev' and release 1.1.6

.browserlistrc

@@ -0,0 +1 @@
+> 0.1% and not dead,iOS >= 12

app.vue

@@ -12,8 +12,15 @@ import posts from './mocks/posts'
 
 const runtimeConfig = useRuntimeConfig()
 
-let confdata = conf
+const config = useConfig()
+
+let confdata = {
+  model: config.value.model,
+  settings: config.value.url
+}
 if (runtimeConfig.chiblogConfigType !== '' && runtimeConfig.chiblogConfigUrl !== '' && process.server) {
+  config.value.model = runtimeConfig.chiblogConfigType 
+  config.value.url = runtimeConfig.chiblogConfigUrl
   confdata.model = runtimeConfig.chiblogConfigType
   confdata.settings = runtimeConfig.chiblogConfigUrl
   console.log(runtimeConfig.chiblogConfigType)
@@ -296,7 +303,7 @@ useHead({
 
 function renderNumber (num){
   if (num > 100000) {
-    return Math.round((num / 10000) * 100) / 10 + 'w'
+    return Math.round((num / 10000) * 100) / 100 + 'w'
   } else if (num > 1000) {
     return Math.round((num / 10000) * 100) / 10 + 'k'
   } else {

components/ArticleCard.vue

@@ -30,7 +30,7 @@ function renderTime (time) {
 }
 function renderNumber (num){
   if (num > 100000) {
-    return Math.round((num / 10000) * 100) / 10 + 'w'
+    return Math.round((num / 10000) * 100) / 100 + 'w'
   } else if (num > 1000) {
     return Math.round((num / 10000) * 100) / 10 + 'k'
   } else {

components/Footer.vue

@@ -7,6 +7,11 @@ const props = defineProps({
   s: String,
   textCount: String
 })
+import { nextTick, ref } from 'vue'
+const tickTime = ref(new Date())
+nextTick(() => {
+  tickTime.value = new Date()
+})
 const settings = props.settings
 </script>
 <template>
@@ -15,7 +20,7 @@ const settings = props.settings
     <div id="footer">
       <div id="cpr" v-show="settings.site.showcopyright">本页面由<a :href="settings.site.author.url" target="_blank">{{settings.site.author.name}}</a>进行维护。版权所有&copy;{{settings.site.copyright.startyear}}-{{ new Date().getFullYear() }}。</div>
       <div>
-        <span v-show="settings.site.showstats">页面生成于{{ s }}，最后渲染于{{(new Date()).toLocaleString()}}。加载&nbsp;{{ loadTime }}ms&nbsp;渲染&nbsp;{{ renderTime }}ms</span>
+        <span v-show="settings.site.showstats">页面生成于{{tickTime.toLocaleString()}}，最后渲染于{{ s }}。加载&nbsp;{{ loadTime }}ms&nbsp;渲染&nbsp;{{ renderTime }}ms</span>
         <span v-show="settings.site.textcount.global">&nbsp;站点总字数：{{ textCount }}</span> <br/>
         <span v-show="settings.site.count.enabled && settings.site.count.site">本站总访问次数：<span id="busuanzi_value_site_pv">加载中...</span>&nbsp;|&nbsp;本站访客数：<span id="busuanzi_value_site_uv">加载中...</span></span>    
       </div>

composables/useConfig.ts

@@ -0,0 +1,9 @@
+export const useConfig = () => {
+  const modifyData = useState('config', () => {
+    return {
+      model: 'mocks',
+      url: ''
+    }
+  })
+  return modifyData
+}

nuxt.config.ts

@@ -1,3 +1,6 @@
+import browserslist from 'browserslist'
+const browserslistConfig = browserslist.loadConfig({ path: '.' })
+import legacy from '@vitejs/plugin-legacy'
 export default defineNuxtConfig({
   // Global page headers: https://go.nuxtjs.dev/config-head
   app: {
@@ -35,5 +38,12 @@ export default defineNuxtConfig({
   runtimeConfig: {
     chiblogConfigType: '',
     chiblogConfigUrl: ''
-  } 
+  },
+  vite: {
+    plugins: [
+      legacy({
+        targets: browserslistConfig,
+      })
+    ]
+  }
 })

package.json

@@ -1,8 +1,8 @@
 {
   "name": "chiblog",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "private": true,
-  "author": "chihuo2104<[email protected]>",
+  "author": "chi Network Contributors<[email protected]>",
   "scripts": {
     "build": "nuxi build",
     "dev": "nuxi dev",
@@ -13,6 +13,8 @@
   "devDependencies": {},
   "dependencies": {
     "@mdi/js": "^7.1.96",
+    "@vitejs/plugin-legacy": "^4.0.3",
+    "browserslist": "^4.21.5",
     "marked": "^4.2.5",
     "md5": "^2.3.0",
     "nuxi": "^3.0.0",

pages/posts/[path].vue

@@ -99,7 +99,7 @@ const updtime = computed(() => { return (renderTime(post.value.updtime)) })
 
 function renderNumber (num){
   if (num > 100000) {
-    return Math.round((num / 10000) * 100) / 10 + 'w'
+    return Math.round((num / 10000) * 100) / 100 + 'w'
   } else if (num > 1000) {
     return Math.round((num / 10000) * 100) / 10 + 'k'
   } else {

version.ts

@@ -1,7 +1,7 @@
 export default {
-  version: '1.1.5',
-  versionReleaseDate: '20230415',
-  versionDisplay: '1.1.5(20230415)',
+  version: '1.1.6',
+  versionReleaseDate: '20230501',
+  versionDisplay: '1.1.6(20230501)',
   supportVersionDate: '20230401',
   supportVersion: '1.1.4'
 }