mali-applet-ui 1.1.80 → 1.1.81

package/config/index.js

@@ -6,4 +6,4 @@ function config (options) {
   return globalStore
 }
 
-export default config
+export default config

package/config/json.js

@@ -0,0 +1,30 @@
+import globalStore from './store'
+import XEUtils from 'xe-utils'
+
+let provincesPromise
+
+export function getProvincesJSON () {
+  if (provincesPromise) {
+    return provincesPromise
+  }
+  if (globalStore.provincesPicker && globalStore.provincesPicker.jsonUrl) {
+    provincesPromise = new Promise((resolve) => {
+      uni.request({
+        url: globalStore.provincesPicker.jsonUrl,
+        method: 'GET',
+        dataType: 'json',
+        success (res) {
+          resolve(XEUtils.isArray(res.data) ? res.data : [])
+        },
+        fail (e) {
+          provincesPromise = null
+          resolve([])
+        }
+      })
+    })
+  } else {
+    provincesPromise = Promise.resolve([])
+    console.error('缺少全局配置：provincesPicker.jsonUrl')
+  }
+  return provincesPromise
+}

package/lib/components/ml-province-city-picker/ml-province-city-picker.vue

@@ -30,36 +30,7 @@
 </template>
 
 <script>
-import provinceCityRegionData from '../ml-provinces-picker/provincesData'
-
-const codeMpas = {}
-const provinceData = []
-const provinceCityData = []
-provinceCityRegionData.forEach(provinceItem => {
-  codeMpas[provinceItem.code] = provinceItem
-  provinceData.push({
-    code: provinceItem.code,
-    name: provinceItem.name
-  })
-  provinceCityData.push({
-    code: provinceItem.code,
-    name: provinceItem.name,
-    children: provinceItem.children
-      ? provinceItem.children.map(cityItem => {
-        codeMpas[cityItem.code] = cityItem
-        if (cityItem.children) {
-          cityItem.children.forEach(regionItem => {
-            codeMpas[regionItem.code] = regionItem
-          })
-        }
-        return {
-          code: cityItem.code,
-          name: cityItem.name
-        }
-      })
-      : []
-  })
-})
+import { getProvincesJSON } from '../../../config/json'
 
 export default {
   name: 'MlProvinceCityPicker',
@@ -83,6 +54,11 @@ export default {
   },
   data () {
     return {
+      codeMpas: [],
+      provinceData: [],
+      provinceCityData: [],
+      provinceCityRegionData: [],
+
       showPopup: false,
       showPicker: false,
       selectVals: [0]
@@ -116,9 +92,9 @@ export default {
     },
     provinceList () {
       if (this.isAll) {
-        return [{ name: '全部', code: '', _all: true }].concat(provinceCityData)
+        return [{ name: '全部', code: '', _all: true }].concat(this.provinceCityData)
       }
-      return provinceCityData
+      return this.provinceCityData
     },
     selectProvinceValue () {
       return this.selectProvinceItem ? this.selectProvinceItem[this.optValueField] : ''
@@ -141,6 +117,46 @@ export default {
       this.selectVals[1] = 0
     }
   },
+  created () {
+    getProvincesJSON().then((list) => {
+      const codeMpas = {}
+      const provinceData = []
+      const provinceCityData = []
+      const provinceCityRegionData = []
+
+      list.forEach(provinceItem => {
+        codeMpas[provinceItem.code] = provinceItem
+        provinceData.push({
+          code: provinceItem.code,
+          name: provinceItem.name
+        })
+        provinceCityData.push({
+          code: provinceItem.code,
+          name: provinceItem.name,
+          children: provinceItem.children
+            ? provinceItem.children.map(cityItem => {
+              codeMpas[cityItem.code] = cityItem
+              if (cityItem.children) {
+                cityItem.children.forEach(regionItem => {
+                  codeMpas[regionItem.code] = regionItem
+                })
+              }
+              return {
+                code: cityItem.code,
+                name: cityItem.name
+              }
+            })
+            : []
+        })
+        provinceCityRegionData.push(provinceItem)
+      })
+
+      this.codeMpas = codeMpas
+      this.provinceData = provinceData
+      this.provinceCityData = provinceCityData
+      this.provinceCityRegionData = provinceCityRegionData
+    })
+  },
   methods: {
     closePopup () {
       this.showPopup = false

package/lib/components/ml-provinces-picker/ml-provinces-picker.vue

@@ -17,36 +17,7 @@
 
 <script>
 import XEUtils from 'xe-utils'
-import provinceCityRegionData from './provincesData'
-
-const codeMpas = {}
-const provinceData = []
-const provinceCityData = []
-provinceCityRegionData.forEach(provinceItem => {
-  codeMpas[provinceItem.code] = provinceItem
-  provinceData.push({
-    code: provinceItem.code,
-    name: provinceItem.name
-  })
-  provinceCityData.push({
-    code: provinceItem.code,
-    name: provinceItem.name,
-    children: provinceItem.children
-      ? provinceItem.children.map(cityItem => {
-        codeMpas[cityItem.code] = cityItem
-        if (cityItem.children) {
-          cityItem.children.forEach(regionItem => {
-            codeMpas[regionItem.code] = regionItem
-          })
-        }
-        return {
-          code: cityItem.code,
-          name: cityItem.name
-        }
-      })
-      : []
-  })
-})
+import { getProvincesJSON } from '../../../config/json'
 
 export default {
   name: 'MlProvincesPicker',
@@ -87,6 +58,11 @@ export default {
   },
   data () {
     return {
+      codeMpas: [],
+      provinceData: [],
+      provinceCityData: [],
+      provinceCityRegionData: [],
+
       selectVals: []
     }
   },
@@ -109,7 +85,7 @@ export default {
     selectLabel () {
       if (this.optValueField === 'code') {
         return this.selectVals.map(val => {
-          const item = codeMpas[val]
+          const item = this.codeMpas[val]
           return item ? item[this.optLabelField] : val
         }).join('/')
       }
@@ -117,12 +93,12 @@ export default {
     },
     optList () {
       if (this.showRegion) {
-        return provinceCityRegionData
+        return this.provinceCityRegionData
       }
       if (this.showCity) {
-        return provinceCityData
+        return this.provinceCityData
       }
-      return provinceData
+      return this.provinceData
     }
   },
   watch: {
@@ -134,6 +110,45 @@ export default {
     }
   },
   created () {
+    getProvincesJSON().then((list) => {
+      const codeMpas = {}
+      const provinceData = []
+      const provinceCityData = []
+      const provinceCityRegionData = []
+
+      list.forEach(provinceItem => {
+        codeMpas[provinceItem.code] = provinceItem
+        provinceData.push({
+          code: provinceItem.code,
+          name: provinceItem.name
+        })
+        provinceCityData.push({
+          code: provinceItem.code,
+          name: provinceItem.name,
+          children: provinceItem.children
+            ? provinceItem.children.map(cityItem => {
+              codeMpas[cityItem.code] = cityItem
+              if (cityItem.children) {
+                cityItem.children.forEach(regionItem => {
+                  codeMpas[regionItem.code] = regionItem
+                })
+              }
+              return {
+                code: cityItem.code,
+                name: cityItem.name
+              }
+            })
+            : []
+        })
+        provinceCityRegionData.push(provinceItem)
+      })
+
+      this.codeMpas = codeMpas
+      this.provinceData = provinceData
+      this.provinceCityData = provinceCityData
+      this.provinceCityRegionData = provinceCityRegionData
+    })
+
     this.selectVals = this.handleMode(this.value)
   },
   methods: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.80",
+  "version": "1.1.81",
   "description": "码里UI-小程序组件库(vue2)",
   "files": [
     "lib",

package/types/index.d.ts

@@ -20,6 +20,9 @@ export interface ConfigOptions {
   pager?: any
   notData?: any
   listSelectUserPage?: any
+  provincesPicker?: {
+    jsonUrl?: string
+  }
   [key: string]: any
 }