zhb 1 месяц назад
Родитель
Сommit
b693bbfdef

+ 21 - 0
App.vue

@@ -70,6 +70,27 @@ onMounted(() => {
 @import "@/static/scss/global/global.scss";
 @import "/static/scss/style.scss";
 
+@font-face {
+	font-family: 'Google Sans';
+	src: url('/static/Google_Sans/GoogleSans-VariableFont_GRAD,opsz,wght.ttf') format('truetype-variations');
+	font-weight: 100 900;
+	/* 可变字重范围 */
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 全局应用到所有文本元素 */
+view,
+text,
+button,
+input,
+textarea,
+label {
+	font-family: 'Google Sans', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif !important;
+	font-weight: 400;
+	/* 默认常规 */
+}
+
 /* 让整个项目文字都能选中 */
 * {
 	-webkit-user-select: text !important;

+ 2 - 2
components/cwg-custom-footer.vue

@@ -10,8 +10,8 @@
                     <cwg-link type="pdf" :title="'newSignin.item13_1'" :url="'pdf/Risk-Disclosures-and-Acknowledgements-2020-08.pdf'" target="_blank" class="desc-link" />
                     <text class="desc-text" v-t="'newSignin.item13_2'" />
                 </view>
-                <text class="desc-text" v-t="'newSignin.item13_3'" />
-                <text class="desc-text" v-t="'newSignin.item13_4'" />
+                <!-- <text class="desc-text" v-t="'newSignin.item13_3'" />
+                <text class="desc-text" v-t="'newSignin.item13_4'" /> -->
             </view>
         </view>
         <view class="footer-placeholder"></view>

+ 1 - 0
components/cwg-tabel.vue

@@ -550,6 +550,7 @@ const openRowDetail = (row) => {
       }
     } else if (!isMobile.value) {
         // 只有移动端才打开详情弹窗
+        emit('go-pages', row)
         return
     } else {
         // 保存当前行和需要显示的列(有 prop 且有 label) pc 详情不展示操作按钮

+ 5 - 4
pages/common/notice.vue

@@ -6,10 +6,10 @@
                 <cwg-combox v-model:value="search.read" :options="readOptions"
                     :placeholder="t('Custom.PaymentHistory.StatusPlaceholder')" />
             </view>
-            <cwg-tabel ref="tableRef" :columns="columns" :mobilePrimaryFields="mobilePrimaryFields" :isPages="true"
+            <cwg-tabel ref="tableRef" :columns="columns" :mobilePrimaryFields="mobilePrimaryFields"
                 :queryParams="search" :api="listApi" @go-pages="goPages">
                 <template #status="{ row }">
-                    {{readOptions.find(item => item.value === row.read)?.text}}
+                    <text class="cwg-cursor">{{readOptions.find(item => item.value === row.read)?.text}}</text>
                 </template>
             </cwg-tabel>
         </view>
@@ -36,10 +36,10 @@ const tableRef = ref(null)
 
 watch(locale, () => {
     search.value.lang = locale.value
-    tableRef.value.reload()
+    tableRef.value?.reload()
 })
 watch(search, (newVal) => {
-    tableRef.value.reload()
+    tableRef.value?.reload()
 }, { immediate: true, deep: true })
 // 表格列配置(支持插槽和格式化)
 const columns = computed(() => [
@@ -104,6 +104,7 @@ const goPages = (e) => {
             type: 7
         }
     })
+    tableRef.value?.reload()
 }
 const listApi = ref(null)
 listApi.value = newsApi.newsNoticeList

BIN
static/Google_Sans/GoogleSans-Italic-VariableFont_GRAD,opsz,wght.ttf


BIN
static/Google_Sans/GoogleSans-VariableFont_GRAD,opsz,wght.ttf


+ 91 - 0
static/Google_Sans/OFL.txt

@@ -0,0 +1,91 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

+ 81 - 0
static/Google_Sans/README.txt

@@ -0,0 +1,81 @@
+Google Sans Variable Font
+=========================
+
+This download contains Google Sans as both variable fonts and static fonts.
+
+Google Sans is a variable font with these axes:
+  GRAD
+  opsz
+  wght
+
+This means all the styles are contained in these files:
+  GoogleSans-VariableFont_GRAD,opsz,wght.ttf
+  GoogleSans-Italic-VariableFont_GRAD,opsz,wght.ttf
+
+If your app fully supports variable fonts, you can now pick intermediate styles
+that aren’t available as static fonts. Not all apps support variable fonts, and
+in those cases you can use the static font files for Google Sans:
+  static/GoogleSans_17pt-Regular.ttf
+  static/GoogleSans_17pt-Medium.ttf
+  static/GoogleSans_17pt-SemiBold.ttf
+  static/GoogleSans_17pt-Bold.ttf
+  static/GoogleSans-Regular.ttf
+  static/GoogleSans-Medium.ttf
+  static/GoogleSans-SemiBold.ttf
+  static/GoogleSans-Bold.ttf
+  static/GoogleSans_17pt-Italic.ttf
+  static/GoogleSans_17pt-MediumItalic.ttf
+  static/GoogleSans_17pt-SemiBoldItalic.ttf
+  static/GoogleSans_17pt-BoldItalic.ttf
+  static/GoogleSans-Italic.ttf
+  static/GoogleSans-MediumItalic.ttf
+  static/GoogleSans-SemiBoldItalic.ttf
+  static/GoogleSans-BoldItalic.ttf
+
+Get started
+-----------
+
+1. Install the font files you want to use
+
+2. Use your app's font picker to view the font family and all the
+available styles
+
+Learn more about variable fonts
+-------------------------------
+
+  https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
+  https://variablefonts.typenetwork.com
+  https://medium.com/variable-fonts
+
+In desktop apps
+
+  https://theblog.adobe.com/can-variable-fonts-illustrator-cc
+  https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
+
+Online
+
+  https://developers.google.com/fonts/docs/getting_started
+  https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
+  https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
+
+Installing fonts
+
+  MacOS: https://support.apple.com/en-us/HT201749
+  Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
+  Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
+
+Android Apps
+
+  https://developers.google.com/fonts/docs/android
+  https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
+
+License
+-------
+Please read the full license text (OFL.txt) to understand the permissions,
+restrictions and requirements for usage, redistribution, and modification.
+
+You can use them in your products & projects – print or digital,
+commercial or otherwise.
+
+This isn't legal advice, please consider consulting a lawyer and see the full
+license for all details.

BIN
static/Google_Sans/static/GoogleSans-Bold.ttf


BIN
static/Google_Sans/static/GoogleSans-BoldItalic.ttf


BIN
static/Google_Sans/static/GoogleSans-Italic.ttf


BIN
static/Google_Sans/static/GoogleSans-Medium.ttf


BIN
static/Google_Sans/static/GoogleSans-MediumItalic.ttf


BIN
static/Google_Sans/static/GoogleSans-Regular.ttf


BIN
static/Google_Sans/static/GoogleSans-SemiBold.ttf


BIN
static/Google_Sans/static/GoogleSans-SemiBoldItalic.ttf


BIN
static/Google_Sans/static/GoogleSans_17pt-Bold.ttf


BIN
static/Google_Sans/static/GoogleSans_17pt-BoldItalic.ttf


BIN
static/Google_Sans/static/GoogleSans_17pt-Italic.ttf


BIN
static/Google_Sans/static/GoogleSans_17pt-Medium.ttf


BIN
static/Google_Sans/static/GoogleSans_17pt-MediumItalic.ttf


BIN
static/Google_Sans/static/GoogleSans_17pt-Regular.ttf


BIN
static/Google_Sans/static/GoogleSans_17pt-SemiBold.ttf


BIN
static/Google_Sans/static/GoogleSans_17pt-SemiBoldItalic.ttf