t20-common-lib 0.10.3 → 0.10.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.10.3",
+  "version": "0.10.5",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/date-picker-por/src/main.vue

@@ -315,7 +315,7 @@ export default {
   methods: {
     applyDefaultShortcut() {
       const defaultKey = localStorage.getItem('t20-datepicker-default-shortcut')
-      if (defaultKey && !this.value) {
+      if (defaultKey) {
         const allShortcuts = getShortcutDefinitions()
         const shortcut = allShortcuts[defaultKey]
         if (shortcut) {

package/packages/multi-currency-statistics/src/main.vue

@@ -164,6 +164,10 @@ export default {
       }
       const allStatistics = []
       const selectedStatistics = []
+      let defaultCurrencyName = this.$l('人民币')
+      if (this.$store && this.$store.state && this.$store.state.user && this.$store.state.user.defaultCurrencyName) {
+        defaultCurrencyName = this.$store.state.user.defaultCurrencyName
+      }
       this.views.forEach(item => {
         allStatistics.push({
           title: item.currencyName,
@@ -171,7 +175,16 @@ export default {
           statis: [
             {
               type: this.$l('全部合计'), //全部合计
-              list: this.config.map(c => ({label: c.label, value: item[c.code] || '0'}))
+              list: this.config.map((c, i) => {
+                let label = c.label
+                if (i !== 0) {
+                  label = c.currencyType === 'origin' ? `${c.label}(${this.$l('原币')})` : `${c.label}(${this.$l('折')}${this.$l(defaultCurrencyName)})`
+                }
+                return {
+                  label, 
+                  value: item[c.code] || '0'
+                }
+              })
             }
           ]
         })