feat(core): export locale, add mergeLocale prop

Author: abichinger

core/src/core.vue

@@ -2,6 +2,7 @@
 import multiple from './fields/multiple'
 import types from './types'
 import locale from './locale'
+import util from './util'
 
 const {getLocale, defaultItems, getSuffix, getPrefix} = locale
 const {Field} = types
@@ -48,10 +49,12 @@ export default {
         customLocale: {
             type: Object,
             default: function() {
-
                 return getLocale(this.locale)
-
             }
+        },
+        mergeLocale: {
+            type: Boolean,
+            default: true
         }
     },
     data(){
@@ -93,6 +96,15 @@ export default {
                 return this.computedFields[i]
             })
         },
+        computedLocale(){
+            if(this.mergeLocale){
+                let defaultLocale = getLocale(this.locale)
+                return util.deepMerge(defaultLocale, this.customLocale)
+            }
+            else{
+                return this.customLocale
+            }
+        }
     },
     
     watch: {
@@ -143,11 +155,11 @@ export default {
             fieldProps.push({
                 ...field,
                 cron: this.splitValue[i],
-                selectedStr: multiple.arrayToStr(values, field).getText(this.customLocale, this.selectedPeriod.id),
+                selectedStr: multiple.arrayToStr(values, field).getText(this.computedLocale, this.selectedPeriod.id),
                 events,
                 attrs,
-                prefix: getPrefix(this.customLocale, this.selectedPeriod.id, field.id),
-                suffix: getSuffix(this.customLocale, this.selectedPeriod.id, field.id)
+                prefix: getPrefix(this.computedLocale, this.selectedPeriod.id, field.id),
+                suffix: getSuffix(this.computedLocale, this.selectedPeriod.id, field.id)
             })
         }
 
@@ -166,8 +178,8 @@ export default {
                     }
                 },
                 items: this.periods,
-                prefix: this.customLocale.periodPrefix,
-                suffix: this.customLocale.periodSuffix
+                prefix: this.computedLocale.periodPrefix,
+                suffix: this.computedLocale.periodSuffix
             }
         })
     },

core/src/index.js

@@ -1,5 +1,6 @@
 // Import vue component
 import util from './util'
+import locale from './locale'
 import component from './core.vue';
 
 // Declare install function executed by Vue.use()
@@ -13,7 +14,8 @@ export function install(Vue) {
 const plugin = {
 	install,
 	component,
-	util
+	util,
+	locale
 };
 
 // Auto-install when vue is found (eg. in browser via <script> tag)

core/src/util.js

@@ -76,10 +76,39 @@ function pad(n, width){
     return (n.length < width) ? new Array(width - n.length).fill('0').join('') + n : n;
 }
 
+function isObject(obj){
+    return (obj && typeof obj == 'object' && !Array.isArray(obj))
+}
+
+function deepMerge(target, ...sources){
+    if(!isObject(target) || sources.length == 0) return
+    let source = sources.shift()
+
+    if(isObject(source)){
+        for(let [key, value] of Object.entries(source)){
+            if(isObject(value)){
+                if(!isObject(target[key])){
+                    target[key] = {}
+                }
+                deepMerge(target[key], source[key])
+            }
+            
+            else {
+                target[key] = source[key]
+            }
+        }
+    }
+
+    if(sources.length > 0) deepMerge(target, sources)
+    return target
+}
+
 export default {
     range,
     Range,
     format,
     genItems,
-    pad
+    pad,
+    deepMerge,
+    isObject
 }

core/test/util.test.js

@@ -13,4 +13,10 @@ test('test Range', () => {
     expect(r[0]).toBe(0)
     expect(r[5]).toBe(10)
     expect(Array.from(r)).toEqual([0,2,4,6,8,10])
-});
+});
+
+test('test deepMerge', () => {
+    expect(util.deepMerge({ a: { a: 1 } }, { a: { b: 1 }, b: 1 })).toEqual({ a: { a: 1, b: 1 }, b: 1 })
+    expect(util.deepMerge({}, { a: { b: 1 }})).toEqual({ a: { b: 1 }})
+    expect(util.deepMerge({ a: { b: 1 }}, { a: { b: 2 }})).toEqual({ a: { b: 2 }})
+})