xianniu-ui 0.8.45 → 0.8.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.8.45",
+  "version": "0.8.47",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/city/main.vue

@@ -64,6 +64,13 @@ export default {
         return {};
       },
     },
+    /**
+     * 是否全国
+     */
+    isAll:{
+      type:Boolean,
+      default:false
+    }
   },
   data() {
     return {
@@ -160,7 +167,14 @@ export default {
     },
     // 接口获取城市联动数据
     fnGetCitys() {
-      const _citys = this.$utils.deepClone(citys);
+      const cityArr = citys;
+      if(this.isAll){
+        cityArr.unshift({
+          cityName: '全国',
+          cityCode: '000000'
+        })
+      }
+      const _citys = this.$utils.deepClone(cityArr);
       this.cityList = this.toTreeDataLevel(_citys);
       this.flattenResult = this.flattenTreeData(
         this.addParentKey(this.cityList)
@@ -277,11 +291,14 @@ export default {
       if (!val) return;
       val = val.replace(/[^\u4e00-\u9fa5]/g, "");
       const cityArr = val.match(this.$reg.getCity) || [];
+      console.log("🚀 ~ str2Code ~ this.$reg.getCity:", this.$reg.getCity)
+      console.log("🚀 ~ str2Code ~ cityArr:", cityArr)
       const newarr =
         cityArr.length &&
         cityArr.map((item, idx, arr) => {
-          return ZXCITY.includes(item) && idx === 0 ? [item, ...arr] : arr;
+          return ZXCITY.includes(item) && idx === 0 && arr.length == 2 ? [item, ...arr] : arr;
         })[0];
+        console.log(newarr)
       const arr = this.getCity(this.cityList, newarr);
       const res = this.getRes(arr);
       return { ...res };