@10yun/cv-mobile-ui 0.5.58 → 0.5.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.58",
+  "version": "0.5.59",
   "description": "十云cvjs移动端ui，适用uniapp",
   "homepage": "http://cvjs.cn/cv-mobile-ui/",
   "license": "Apache-2.0",

package/ui-cv/components/cv-geo-local/cv-geo-local.vue

@@ -11,14 +11,14 @@
         auto-height
       />
       <view @tap="chooseLocation" class="cv-geo-local-button">
-        <cv-icons type="actionSearch" size="20" color="#999999" />
+        <cv-icons type="geoLocateoutline" size="20" color="#999999" />
       </view>
     </view>
     <view class="cv-geo-local-map" v-if="isShowMap">
       <map
         style="width: 100%; height: 170px"
-        :longitude="map_location.longitude"
-        :latitude="map_location.latitude"
+        :longitude="localLongitude"
+        :latitude="localLatitude"
         :scale="localScale"
         show-location
         :markers="markers"
@@ -32,7 +32,7 @@ import mixin from '../../libs/mixin/mixin.js';
 export default {
   mixins: [mpMixin, mixin],
   name: 'cvGeoLocal',
-  emits: ['input', 'update:modelValue', 'location'],
+  emits: ['input', 'update:modelValue', 'update:longitude', 'update:latitude'],
   props: {
     value: {
       type: [Number, String],
@@ -42,6 +42,16 @@ export default {
       type: [Number, String],
       default: ''
     },
+    // 经度
+    longitude: {
+      type: [Number, String],
+      default: ''
+    },
+    // 纬度
+    latitude: {
+      type: [Number, String],
+      default: ''
+    },
     placeholder: {
       type: [String],
       default: '请输入定位地址'
@@ -83,7 +93,13 @@ export default {
         }
       }
     },
-    location(n) {
+    longitude(n) {
+      if (this.isShowMap) {
+        console.log('change:location');
+        this.initLocation();
+      }
+    },
+    latitude(n) {
       if (this.isShowMap) {
         console.log('change:location');
         this.initLocation();
@@ -111,10 +127,8 @@ export default {
       markers: [],
       //当前选择的位置
       localScale: 14,
-      map_location: {
-        longitude: 119.296411,
-        latitude: 26.074286
-      },
+      localLongitude: 119.296411,
+      localLatitude: 26.074286,
       parentObj: null
     };
   },
@@ -173,12 +187,12 @@ export default {
       this.funcOnInput();
     },
     initLocation() {
-      if (this.location.longitude && this.location.latitude) {
-        this.map_location = this.location;
+      if (this.longitude && this.latitude) {
+        this.localLongitude = this.longitude;
+        this.localLatitude = this.latitude;
       }
-      console.log('--', this.map_location);
       if (this.localVal) {
-        this.map_location['address'] = this.localVal;
+        this.localVal = this.localVal;
       }
     },
     chooseLocation() {
@@ -188,9 +202,11 @@ export default {
           console.log(res);
           if (res.errMsg == 'chooseLocation:ok') {
             this.localVal = res.address || '';
-            this.map_location = { ...res };
+            this.localLongitude = res.longitude || '';
+            this.localLatitude = res.latitude || '';
             this.localScale = 16;
-            this.$emit('location', { ...res });
+            this.$emit('update:longitude', this.localLongitude);
+            this.$emit('update:latitude', this.localLatitude);
             this.funcOnInput();
           }
         }
@@ -198,12 +214,11 @@ export default {
     },
     initMarkers() {
       let markers = [];
-      let map_location = this.map_location;
       markers.push({
-        latitude: map_location.latitude,
-        longitude: map_location.longitude,
+        latitude: this.localLatitude,
+        longitude: this.localLongitude,
         callout: {
-          content: map_location.address,
+          content: this.localVal,
           color: '#333333',
           borderRadius: 5,
           bgColor: '#ffffff',
@@ -224,6 +239,7 @@ export default {
   display: flex;
   flex-direction: column;
   width: 100%;
+  position: relative;
 }
 .cv-geo-local-info {
   display: flex;

package/ui-cv/components/cv-geo-region/cv-geo-region.vue

@@ -28,9 +28,21 @@ import mpMixin from '../../libs/mixin/mpMixin.js';
 import mixin from '../../libs/mixin/mixin.js';
 export default {
   mixins: [mpMixin, mixin],
-  name: 'cvPickerRegion',
-  emits: ['input', 'update:modelValue', 'onChoose'],
+  name: 'cvGeoRegion',
+  emits: ['input', 'update:modelValue', 'update:province', 'update:city', 'update:district', 'onChoose'],
   props: {
+    province: {
+      type: [String, Number],
+      default: ''
+    },
+    city: {
+      type: [String, Number],
+      default: ''
+    },
+    district: {
+      type: [String, Number],
+      default: ''
+    },
     value: {
       type: [Array, Object],
       default: () => []
@@ -54,6 +66,18 @@ export default {
     }
   },
   watch: {
+    province(newVal) {
+      this.localVal[0] = newVal;
+      this.itemsSortOut();
+    },
+    city(newVal) {
+      this.localVal[1] = newVal;
+      this.itemsSortOut();
+    },
+    district(newVal) {
+      this.localVal[2] = newVal;
+      this.itemsSortOut();
+    },
     value(newVal) {
       this.localVal = newVal;
       this.itemsSortOut();
@@ -71,7 +95,7 @@ export default {
       last_range_data: [], //最终显示页面数组
       items_index: [0, 0, 0], //当前下标
       lastRetDataIndex: [0, 0, 0], // 最终确定选中的下标
-      localDataType: 'text',
+      localValField: 'text',
       localDataValue: 'value',
       localDataText: 'label',
       localProvince: {},
@@ -81,7 +105,7 @@ export default {
   },
   created() {
     this.localVal = this.doValueGet();
-    this.localDataType = this.dataType != 'value' ? 'text' : 'value';
+    this.localValField = this.dataType != 'value' ? 'text' : 'value';
     this.itemsSortOut();
   },
   methods: {
@@ -146,7 +170,7 @@ export default {
       if (localValue) {
         /* 便利省级列表 找出省级的位置 */
         for (const key in data) {
-          if (localValue == data[key][this.localDataType]) {
+          if (localValue == data[key][this.localValField]) {
             localKey = parseInt(key);
           }
         }
@@ -203,18 +227,18 @@ export default {
       this.lastRetDataIndex = [...items_index];
       let value = [];
       let items = this.items;
-      if (this.localDataType == 'text') {
-        value[0] = this.range_data[0][items_index[0]].text;
-        value[1] = this.range_data[1][items_index[1]].text;
-        value[2] = this.range_data[2][items_index[2]].text;
-      } else {
-        value[0] = this.range_data[0][items_index[0]].value;
-        value[1] = this.range_data[1][items_index[1]].value;
-        value[2] = this.range_data[2][items_index[2]].value;
-      }
+      let item_key = this.localValField == 'text' ? 'text' : 'value';
+      value[0] = this.range_data[0][items_index[0]][item_key];
+      value[1] = this.range_data[1][items_index[1]][item_key];
+      value[2] = this.range_data[2][items_index[2]][item_key];
+
       this.$emit('input', value);
       this.$emit('update:modelValue', value);
 
+      this.$emit('update:province', value[0]);
+      this.$emit('update:city', value[1]);
+      this.$emit('update:district', value[2]);
+
       // 把选中的3个数组传递出去
 
       let selectAllArr = {

package/uview-plus/components/u-upload/file.js

@@ -145,7 +145,7 @@ export function parseFormData(data) {
   // formData['file']= file; // file 必须为最后一个表单域
   return formData;
 }
-function getFileInfo(imgStr) {
+export function getFileInfo(imgStr) {
   let index = imgStr.lastIndexOf('/');
   let strName = imgStr.substring(index + 1, imgStr.length);
   let strType = '';

package/uview-plus/components/u-upload/u-upload.vue

@@ -165,7 +165,8 @@ import {
   generateUniqidName,
   parseJsonSafe,
   parseFormData,
-  content_to_array
+  content_to_array,
+  getFileInfo
 } from './file.js';
 /**
  * upload 上传
@@ -257,6 +258,7 @@ export default {
     'delete',
     'clickPreview',
     'update:modelValue',
+    'update:initValue',
     'update:fileList',
     'afterAutoUpload'
   ],
@@ -542,6 +544,8 @@ export default {
                       let res2 = res1?.data || res1 || {};
                       // TODO 判断是否多图，
                       this.$emit('update:modelValue', res2.filelog_id || '');
+                      this.localList.push(getFileInfo(res2.cdn_full_path));
+                      this.formatFileList();
                       that.$emit(
                         'afterAutoUpload',
                         Object.assign(res2, {
@@ -666,6 +670,9 @@ export default {
     },
     deleteItem(index) {
       if (this.autoDelete) {
+        this.localList.splice(index, 1);
+        this.$emit('update:initValue', this.localList);
+
         this.fileList.splice(index, 1);
         this.$emit('update:fileList', this.fileList);
       } else {

package/other/tui-clipboard/tui-clipboard.js

@@ -1,53 +0,0 @@
-/**
- * 复制文本 兼容H5
- * 来自 ThorUI  www.thorui.cn | 文档地址： www.donarui.com
- * @author echo.
- * @version 1.0.0
- **/
-// #ifdef H5
-import ClipboardJS from '../js-sdk/clipboard.min.js';
-// #endif
-const thorui = {
-  /**
-   * data 需要复制的数据
-   * callback 回调
-   * e 当用户点击后需要先请求接口再进行复制时，需要传入此参数，或者将异步请求转为同步 （H5端）
-   * **/
-  getClipboardData: function (data, callback, e) {
-    // #ifdef APP-PLUS || MP
-    uni.setClipboardData({
-      data: data,
-      success(res) {
-        'function' == typeof callback && callback(true);
-      },
-      fail(res) {
-        'function' == typeof callback && callback(false);
-      }
-    });
-    // #endif
-
-    // #ifdef H5
-    let event = window.event || e || {};
-    let clipboard = new ClipboardJS('', {
-      text: () => data
-    });
-    clipboard.on('success', (e) => {
-      'function' == typeof callback && callback(true);
-      clipboard.off('success');
-      clipboard.off('error');
-      clipboard.destroy();
-    });
-    clipboard.on('error', (e) => {
-      'function' == typeof callback && callback(false);
-      clipboard.off('success');
-      clipboard.off('error');
-      clipboard.destroy();
-    });
-    clipboard.onClick(event);
-    // #endif
-  }
-};
-
-export default {
-  getClipboardData: thorui.getClipboardData
-};