@10yun/cv-mobile-ui 0.5.1 → 0.5.3

package/extend/permission.js

@@ -1,10 +1,10 @@
 /// null = 未请求，1 = 已允许，0 = 拒绝|受限, 2 = 系统未开启
 
-var isIOS
+var isIOS;
 
 function album() {
   var result = 0;
-  var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+  var PHPhotoLibrary = plus.ios.import('PHPhotoLibrary');
   var authStatus = PHPhotoLibrary.authorizationStatus();
   if (authStatus === 0) {
     result = null;
@@ -19,7 +19,7 @@ function album() {
 
 function camera() {
   var result = 0;
-  var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+  var AVCaptureDevice = plus.ios.import('AVCaptureDevice');
   var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
   if (authStatus === 0) {
     result = null;
@@ -34,7 +34,7 @@ function camera() {
 
 function location() {
   var result = 0;
-  var cllocationManger = plus.ios.import("CLLocationManager");
+  var cllocationManger = plus.ios.import('CLLocationManager');
   var enable = cllocationManger.locationServicesEnabled();
   var status = cllocationManger.authorizationStatus();
   if (!enable) {
@@ -52,28 +52,28 @@ function location() {
 
 function push() {
   var result = 0;
-  var UIApplication = plus.ios.import("UIApplication");
+  var UIApplication = plus.ios.import('UIApplication');
   var app = UIApplication.sharedApplication();
   var enabledTypes = 0;
   if (app.currentUserNotificationSettings) {
     var settings = app.currentUserNotificationSettings();
-    enabledTypes = settings.plusGetAttribute("types");
+    enabledTypes = settings.plusGetAttribute('types');
     if (enabledTypes == 0) {
       result = 0;
-      console.log("推送权限没有开启");
+      console.log('推送权限没有开启');
     } else {
       result = 1;
-      console.log("已经开启推送功能!")
+      console.log('已经开启推送功能!');
     }
     plus.ios.deleteObject(settings);
   } else {
     enabledTypes = app.enabledRemoteNotificationTypes();
     if (enabledTypes == 0) {
       result = 3;
-      console.log("推送权限没有开启!");
+      console.log('推送权限没有开启!');
     } else {
       result = 4;
-      console.log("已经开启推送功能!")
+      console.log('已经开启推送功能!');
     }
   }
   plus.ios.deleteObject(app);
@@ -83,7 +83,7 @@ function push() {
 
 function contact() {
   var result = 0;
-  var CNContactStore = plus.ios.import("CNContactStore");
+  var CNContactStore = plus.ios.import('CNContactStore');
   var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
   if (cnAuthStatus === 0) {
     result = null;
@@ -98,10 +98,10 @@ function contact() {
 
 function record() {
   var result = null;
-  var avaudiosession = plus.ios.import("AVAudioSession");
+  var avaudiosession = plus.ios.import('AVAudioSession');
   var avaudio = avaudiosession.sharedInstance();
   var status = avaudio.recordPermission();
-  console.log("permissionStatus:" + status);
+  console.log('permissionStatus:' + status);
   if (status === 1970168948) {
     result = null;
   } else if (status === 1735552628) {
@@ -115,13 +115,13 @@ function record() {
 
 function calendar() {
   var result = null;
-  var EKEventStore = plus.ios.import("EKEventStore");
+  var EKEventStore = plus.ios.import('EKEventStore');
   var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
   if (ekAuthStatus == 3) {
     result = 1;
-    console.log("日历权限已经开启");
+    console.log('日历权限已经开启');
   } else {
-    console.log("日历权限没有开启");
+    console.log('日历权限没有开启');
   }
   plus.ios.deleteObject(EKEventStore);
   return result;
@@ -129,44 +129,43 @@ function calendar() {
 
 function memo() {
   var result = null;
-  var EKEventStore = plus.ios.import("EKEventStore");
+  var EKEventStore = plus.ios.import('EKEventStore');
   var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
   if (ekAuthStatus == 3) {
     result = 1;
-    console.log("备忘录权限已经开启");
+    console.log('备忘录权限已经开启');
   } else {
-    console.log("备忘录权限没有开启");
+    console.log('备忘录权限没有开启');
   }
   plus.ios.deleteObject(EKEventStore);
   return result;
 }
 
-
 function requestIOS(permissionID) {
   return new Promise((resolve, reject) => {
     switch (permissionID) {
-      case "push":
+      case 'push':
         resolve(push());
         break;
-      case "location":
+      case 'location':
         resolve(location());
         break;
-      case "record":
+      case 'record':
         resolve(record());
         break;
-      case "camera":
+      case 'camera':
         resolve(camera());
         break;
-      case "album":
+      case 'album':
         resolve(album());
         break;
-      case "contact":
+      case 'contact':
         resolve(contact());
         break;
-      case "calendar":
+      case 'calendar':
         resolve(calendar());
         break;
-      case "memo":
+      case 'memo':
         resolve(memo());
         break;
       default:
@@ -185,22 +184,22 @@ function requestAndroid(permissionID) {
         for (var i = 0; i < resultObj.granted.length; i++) {
           var grantedPermission = resultObj.granted[i];
           console.log('已获取的权限：' + grantedPermission);
-          result = 1
+          result = 1;
         }
         for (var i = 0; i < resultObj.deniedPresent.length; i++) {
           var deniedPresentPermission = resultObj.deniedPresent[i];
           console.log('拒绝本次申请的权限：' + deniedPresentPermission);
-          result = 0
+          result = 0;
         }
         for (var i = 0; i < resultObj.deniedAlways.length; i++) {
           var deniedAlwaysPermission = resultObj.deniedAlways[i];
           console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
-          result = -1
+          result = -1;
         }
         resolve(result);
       },
       function (error) {
-        console.log('result error: ' + error.message)
+        console.log('result error: ' + error.message);
         resolve({
           code: error.code,
           message: error.message
@@ -212,32 +211,32 @@ function requestAndroid(permissionID) {
 
 function gotoAppPermissionSetting() {
   if (permission.isIOS) {
-    var UIApplication = plus.ios.import("UIApplication");
+    var UIApplication = plus.ios.import('UIApplication');
     var application2 = UIApplication.sharedApplication();
-    var NSURL2 = plus.ios.import("NSURL");
-    var setting2 = NSURL2.URLWithString("app-settings:");
+    var NSURL2 = plus.ios.import('NSURL');
+    var setting2 = NSURL2.URLWithString('app-settings:');
     application2.openURL(setting2);
     plus.ios.deleteObject(setting2);
     plus.ios.deleteObject(NSURL2);
     plus.ios.deleteObject(application2);
   } else {
-    var Intent = plus.android.importClass("android.content.Intent");
-    var Settings = plus.android.importClass("android.provider.Settings");
-    var Uri = plus.android.importClass("android.net.Uri");
+    var Intent = plus.android.importClass('android.content.Intent');
+    var Settings = plus.android.importClass('android.provider.Settings');
+    var Uri = plus.android.importClass('android.net.Uri');
     var mainActivity = plus.android.runtimeMainActivity();
     var intent = new Intent();
     intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-    var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+    var uri = Uri.fromParts('package', mainActivity.getPackageName(), null);
     intent.setData(uri);
     mainActivity.startActivity(intent);
   }
 }
 
 function gotoiOSPermissionSetting() {
-  var UIApplication = plus.ios.import("UIApplication");
+  var UIApplication = plus.ios.import('UIApplication');
   var application2 = UIApplication.sharedApplication();
-  var NSURL2 = plus.ios.import("NSURL");
-  var setting2 = NSURL2.URLWithString("App-prefs:root=General");
+  var NSURL2 = plus.ios.import('NSURL');
+  var setting2 = NSURL2.URLWithString('App-prefs:root=General');
   application2.openURL(setting2);
 
   plus.ios.deleteObject(setting2);
@@ -247,12 +246,12 @@ function gotoiOSPermissionSetting() {
 
 const permission = {
   get isIOS() {
-    return typeof isIOS === 'boolean' ? isIOS : (isIOS = uni.getSystemInfoSync().platform === 'ios')
+    return typeof isIOS === 'boolean' ? isIOS : (isIOS = uni.getSystemInfoSync().platform === 'ios');
   },
   requestIOS: requestIOS,
   requestAndroid: requestAndroid,
   gotoAppSetting: gotoAppPermissionSetting,
   gotoiOSSetting: gotoiOSPermissionSetting
-}
+};
 
-module.exports = permission
+module.exports = permission;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "",
   "license": "Apache-2.0",
-  "homepage": "https://cvjs.cn/cv-mobile-ui",
+  "homepage": "https://cvjs.cn/cv-mobile-ui/",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
@@ -15,7 +15,7 @@
   "dependencies": {},
   "devDependencies": {},
   "browserslist": [
-    "Android >= 4",
-    "ios >= 8"
+    "Android >= 7",
+    "ios >= 9"
   ]
 }

package/plugins/MessageTip.js

@@ -13,7 +13,7 @@ const MessageTip = function (options) {
 
     let setting = {
       title: options.message || '提示',
-      duration: options.duration || 1200,
+      duration: options.duration || 800,
       icon: typeIcon || 'none',
       mask: true
     };
@@ -33,7 +33,7 @@ const MessageTip = function (options) {
 MessageTip['info'] = (title, duration, icon) => {
   uni.showToast({
     title: title || '提示',
-    duration: duration || 1200,
+    duration: duration || 800,
     icon: icon || 'none'
     // mask: true
   });

package/ui-cv/cv-icons/icons.js

@@ -14,5 +14,4 @@ for (let i in modules) {
     iconsAll = Object.assign({}, iconsAll, modules[i]);
   }
 }
-console.log('---iconsAll---', iconsAll);
 export default iconsAll;

package/ui-cv/cv-picker-region/cv-picker-region.vue

@@ -59,8 +59,8 @@ export default {
       items_index: [0, 0, 0], //当前下标
       lastRetDataIndex: [0, 0, 0], // 最终确定选中的下标
       localDataType: 'text',
-      dataValue: 'value',
-      dataText: 'label',
+      localDataValue: 'value',
+      localDataText: 'label',
       localProvince: {},
       localCity: {},
       localCounty: {}

package/ui-cv/cv-picker1/cv-picker1.vue

@@ -53,6 +53,9 @@ export default {
       localArr: [],
       // 当前选中下标
       localIndex: null,
+      localDataType: 'text',
+      localDataValue: 'value',
+      localDataText: 'label',
       iconTop: false,
       pickerLists: []
     };
@@ -102,14 +105,14 @@ export default {
      * 处理-选中
      */
     _dealValue() {
-      this.dataType = this.dataType != 'text' ? 'value' : 'text';
+      this.localDataType = this.dataType != 'text' ? 'value' : 'text';
       //默认Value
       let tempArr = this.localArr;
       let localIndex = null;
       for (let index = 0; index < tempArr.length; index++) {
-        if (this.dataType == 'text' && this.localVal == tempArr[index].text) {
+        if (this.localDataType == 'text' && this.localVal == tempArr[index].text) {
           localIndex = index;
-        } else if (this.dataType == 'value' && this.localVal == tempArr[index].value) {
+        } else if (this.localDataType == 'value' && this.localVal == tempArr[index].value) {
           localIndex = index;
         }
       }
@@ -145,7 +148,7 @@ export default {
 
       this.localIndex = localIndex;
       const rowData = this.localArr[localIndex];
-      if (this.dataType == 'text') {
+      if (this.localDataType == 'text') {
         this.localVal = rowData.text;
       } else {
         this.localVal = rowData.value;

package/ui-cv/cv-picker2/cv-picker2.vue

@@ -52,9 +52,9 @@ export default {
       type: String,
       default: 'text'
     },
-    free: {
+    dataTree: {
       type: String,
-      default: 'free'
+      default: 'tree'
     },
     joint: {
       type: String,
@@ -83,7 +83,9 @@ export default {
       items_sub: [],
       items_index: [0, 0], //当前下标
       lastRetDataIndex: [0, 0], // 最终确定选中的下标
-      localDataType: ''
+      localDataType: '',
+      localDataValue: 'value',
+      localDataText: 'label'
     };
   },
   created() {
@@ -107,7 +109,7 @@ export default {
       let items = [];
       let dataValue = this.dataValue ? this.dataValue : 'value';
       let dataText = this.dataText ? this.dataText : 'text';
-      let free = this.free;
+      let tree = this.dataTree;
       let items_index = this.items_index;
       let dataType = this.localDataType;
       for (let i in original) {
@@ -125,11 +127,11 @@ export default {
           value: data[dataValue].toString(),
           text: data[dataText]
         });
-        if (original[i][free]) {
-          let free_data = original[i][free];
+        if (original[i][tree]) {
+          let tree_data = original[i][tree];
           let temp = [];
-          for (const ii in free_data) {
-            let data = free_data[ii];
+          for (const ii in tree_data) {
+            let data = tree_data[ii];
 
             //查找二级绑定参数
             if (this.localVal[1]) {
@@ -144,7 +146,7 @@ export default {
               text: data[dataText]
             });
           }
-          items[i].free = temp;
+          items[i].tree = temp;
         }
       }
       if (!items) {
@@ -152,7 +154,7 @@ export default {
       }
       //默认Value
       this.items = items;
-      this.items_sub = items[items_index[0] ?? 0].free;
+      this.items_sub = items[items_index[0] ?? 0].tree;
       this.range_data = [items, this.items_sub];
       this.last_range_data = [...this.range_data];
       this.items_index = items_index;
@@ -180,7 +182,7 @@ export default {
         items_index[0] = e.detail.value;
         items_index[1] = 0;
         let range_data = this.range_data;
-        range_data[1] = range_data[0][items_index[0]].free;
+        range_data[1] = range_data[0][items_index[0]].tree;
         this.range_data = range_data;
       }
       this.items_index = items_index;
@@ -194,10 +196,10 @@ export default {
       let items = this.items;
       if (this.dataType == 'text') {
         value[0] = items[items_index[0]].text;
-        value[1] = items[items_index[0]].free[items_index[1]].text;
+        value[1] = items[items_index[0]].tree[items_index[1]].text;
       } else {
         value[0] = items[items_index[0]].value;
-        value[1] = items[items_index[0]].free[items_index[1]].value;
+        value[1] = items[items_index[0]].tree[items_index[1]].value;
       }
       this.localVal = value;
       this.$emit('input', value);

package/ui-cv/cv-picker3/cv-picker3.vue

@@ -63,9 +63,9 @@ export default {
       type: String,
       default: 'text'
     },
-    free: {
+    dataTree: {
       type: String,
-      default: 'free'
+      default: 'tree'
     },
     joint: {
       type: String,
@@ -118,7 +118,8 @@ export default {
       let items = [];
       let dataValue = this.dataValue ? this.dataValue : 'value';
       let dataText = this.dataText ? this.dataText : 'text';
-      let free = this.free;
+
+      let tree = this.dataTree;
       let items_index = this.items_index;
       let dataType = this.localDataType;
       for (let i in original) {
@@ -132,16 +133,15 @@ export default {
             items_index[0] = i;
           }
         }
-
         items.push({
           value: data[dataValue].toString(),
           text: data[dataText]
         });
-        if (original[i][free]) {
-          let free_data = original[i][free];
+        if (original[i][tree]) {
+          let tree_data = original[i][tree];
           let temp = [];
-          for (const ii in free_data) {
-            let data = free_data[ii];
+          for (const ii in tree_data) {
+            let data = tree_data[ii];
 
             //查找二级绑定参数
             if (this.localVal.length >= 2) {
@@ -155,14 +155,14 @@ export default {
               value: data[dataValue].toString(),
               text: data[dataText]
             });
-            if (free_data[ii][free] == undefined) {
-              free_data[ii][free] = [{}];
+            if (tree_data[ii][tree] == undefined) {
+              tree_data[ii][tree] = [{}];
             }
-            if (free_data[ii][free]) {
-              let free_data2 = free_data[ii][free];
+            if (tree_data[ii][tree]) {
+              let tree_data2 = tree_data[ii][tree];
               let temp2 = [];
-              for (const iii in free_data2) {
-                let data = free_data2[iii];
+              for (const iii in tree_data2) {
+                let data = tree_data2[iii];
                 //查找三级绑定参数
                 if (this.localVal.length >= 3) {
                   if (dataType == 'text' && this.localVal[2] == data[dataText]) {
@@ -183,10 +183,10 @@ export default {
                   text: data[dataText]
                 });
               }
-              temp[ii].free = temp2;
+              temp[ii].tree = temp2;
             }
           }
-          items[i].free = temp;
+          items[i].tree = temp;
         }
       }
       if (!items) {
@@ -194,8 +194,8 @@ export default {
       }
       //默认Value
       this.items = items;
-      this.items_sub = items[items_index[0] ?? 0].free;
-      this.items_sub2 = this.items_sub[items_index[1] ?? 0].free;
+      this.items_sub = items[items_index[0] ?? 0].tree;
+      this.items_sub2 = this.items_sub[items_index[1] ?? 0].tree;
       this.range_data = [items, this.items_sub, this.items_sub2];
       this.items_index = items_index;
       this.last_range_data = [...this.range_data];
@@ -225,15 +225,15 @@ export default {
         //滑动二级
         items_index[1] = e.detail.value;
         items_index[2] = 0;
-        range_data[2] = range_data[1][items_index[1]].free || [];
+        range_data[2] = range_data[1][items_index[1]].tree || [];
         // this.range_data = range_data;
       } else if (e.detail.column == 0) {
         //滑动一级
         items_index[0] = e.detail.value;
         items_index[1] = 0;
         items_index[2] = 0;
-        range_data[1] = range_data[0][items_index[0]].free || [];
-        range_data[2] = range_data[1][items_index[1]].free || [];
+        range_data[1] = range_data[0][items_index[0]].tree || [];
+        range_data[2] = range_data[1][items_index[1]].tree || [];
         // this.range_data = range_data;
       }
       this.$set(this, 'range_data', range_data);
@@ -249,17 +249,17 @@ export default {
       let value = [];
       let items = this.items;
       // 2022-07-22,修复三级选项为空时取值异常
-      if (!items[items_index[0]].free[items_index[1]].free || items[items_index[0]].free[items_index[1]].free.length == 0) {
-        items[items_index[0]].free[items_index[1]].free = [{ text: '', value: '' }];
+      if (!items[items_index[0]].tree[items_index[1]].tree || items[items_index[0]].tree[items_index[1]].tree.length == 0) {
+        items[items_index[0]].tree[items_index[1]].tree = [{ text: '', value: '' }];
       }
-      if (this.dataType == 'text') {
+      if (this.localDataType == 'text') {
         value[0] = items[items_index[0]].text;
-        value[1] = items[items_index[0]].free[items_index[1]].text;
-        value[2] = items[items_index[0]].free[items_index[1]].free[items_index[2]].text;
+        value[1] = items[items_index[0]].tree[items_index[1]].text;
+        value[2] = items[items_index[0]].tree[items_index[1]].tree[items_index[2]].text;
       } else {
         value[0] = items[items_index[0]].value;
-        value[1] = items[items_index[0]].free[items_index[1]].value;
-        value[2] = items[items_index[0]].free[items_index[1]].free[items_index[2]].value;
+        value[1] = items[items_index[0]].tree[items_index[1]].value;
+        value[2] = items[items_index[0]].tree[items_index[1]].tree[items_index[2]].value;
       }
       this.$emit('input', value);
     }