@10yun/cv-mobile-ui 0.5.26 → 0.5.29

package/plugins/request.js

@@ -57,6 +57,7 @@ const EnumStatusToMsg = {
 class RequestClass {
   constructor(options = {}) {
     this.flagMap = options.flagMap || {};
+    this.flagAuth = options.flagAuth || {};
     this.flagFunc = options.flagFunc;
     this.baseURL = options.baseURL || '';
     this.requests = Object.assign({}, options.requests || {});
@@ -118,23 +119,23 @@ class RequestClass {
   }
 
   /**
-   * 设置flag参数
+   * 设置API
    */
-  setFlag(options) {
+  setApiFlag(options) {
+    this.flagMap = options || {};
+    return this;
+  }
+  appendApiFlag(options) {
     this.flagMap = Object.assign({}, this.flagMap, options || {});
     return this;
   }
-  getFlag(oldFlag) {
-    // 类型对
-    // 不存在
-    // 重新获取flag方法存在
-    if (typeof oldFlag == 'string' && !this.flagMap[oldFlag] && typeof this.flagFunc == 'function') {
-      // 重新加载flag
-      let newFlagArr = this.flagFunc();
-      // console.log(newFlagArr);
-      this.setFlag(newFlagArr);
-    }
-    return oldFlag;
+  setApiAuth(options) {
+    this.authMap = options || {};
+    return this;
+  }
+  appendApiAuth(options) {
+    this.authMap = Object.assign({}, this.authMap, options || {});
+    return this;
   }
   /**
    * 设置header参数
@@ -143,7 +144,7 @@ class RequestClass {
    */
   setDefHeaders(options) {
     this.headers = Object.assign({}, this.headers, options || {});
-    // this.reqObj.defaults.headers = this.headers;
+    // this.requestHandle.defaults.headers = this.headers;
     return this;
   }
   setHeaders(options) {
@@ -157,7 +158,7 @@ class RequestClass {
    */
   setDefRequests(options) {
     this.requests = Object.assign({}, this.requests, options || {});
-    // this.reqObj.defaults.requests = this.requests;
+    // this.requestHandle.defaults.requests = this.requests;
     return this;
   }
   setRequests(options) {
@@ -284,7 +285,6 @@ class RequestClass {
         return apiResData;
         break;
     }
-    console.log('---');
   }
   /**
    * 调用 API 统一 请求 方法
@@ -316,64 +316,56 @@ class RequestClass {
 
     reqData = reqData || {};
     reqData = Object.assign({}, this.requests, reqData);
-    type = type || 'request';
-    type = type.toLowerCase();
     /*
      * 全局 uni.request 配置过滤不需要登录的页面
      */
-
     // uni.showNavigationBarLoading(); // 顶部加载动画
 
     // 初始化句柄
     let $requestHandle = null;
-    let request_setttings = {
-      url: request_url,
-      header: this.headers
-    };
-    if (type == 'upload') {
+    /**
+     * 判断是否加密
+     */
+    let encryptFlag = this.__encryp_parse(apiUrl);
+    /**
+     * 最后 type
+     */
+    let last_type = this.__parse_method_type(type);
+
+    // if (last_type == 'POST') {
+    // } else
+    if (last_type == 'UPLOAD') {
       /* 文件上传 */
       // 一定要删除这个，让uni.uploadFile自己携带
-      delete request_setttings.header['Content-Type'];
-      request_setttings = Object.assign({}, request_setttings, reqData);
-      $requestHandle = uni.uploadFile(request_setttings);
-    } else if (type == 'download') {
+      delete this.headers['Content-Type'];
+      $requestHandle = uni.uploadFile({
+        url: request_url,
+        header: this.headers,
+        // data: reqData,
+        ...reqData
+      });
+    } else if (last_type == 'DOWNLOAD') {
       /* 文件下载 */
     } else {
       /* request */
 
-      request_setttings.header['Content-Type'] = 'application/json';
-      // request_setttings.header['Content-Type'] = 'application/x-www-form-urlencoded';
-      // request_setttings.header['connection'] = 'close';
-
-      let MetSupport = this.needMethods || [];
-
-      if (MetSupport.length > 0) {
-        // 转大写
-        let typeDaxie = type.toUpperCase();
-        // console.log(MetSupport, type, MetSupport.indexOf(typeDaxie));
-        if (MetSupport.indexOf(typeDaxie) !== -1) {
-          type = 'POST';
-          request_setttings.header['X-HTTP-Method-Override'] = typeDaxie;
-        } else {
-          delete request_setttings.header['X-HTTP-Method-Override'];
-        }
-      }
+      this.headers['Content-Type'] = 'application/json';
+      // this.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+      // this.headers['connection'] = 'close';
 
-      // 全部默认加上 login_type
-      Object.assign(request_setttings, {
-        data: reqData,
-        method: type
+      $requestHandle = uni.request({
+        //   header: {
+        //     ...this.headers
+        //   },
+        //   data: {
+        //     ...this.requests,
+        //     reqData,
+        //   },
+        url: request_url,
+        header: this.headers,
+        method: last_type,
+        data: reqData
       });
-      // xxx = {
-      //   header: {
-      //     ...this.headers
-      //   },
-      //   data: {
-      //     ...this.requests,
-      //     reqData,
-      //   },
-      // }
-      $requestHandle = uni.request(request_setttings);
     }
     return $requestHandle.then((uniRes) => {
       _hideUniapp();
@@ -386,8 +378,8 @@ class RequestClass {
         // apiResData 为 接口返回 拼接的数据，一般 success 成功，开发者只需要 apiResData
         // let apiResData = JSON.parse(uniRes.data, true);
 
-        // upload需要json转数组
-        if (type == 'upload') {
+        // upload 需要json转数组
+        if (type == 'UPLOAD') {
           apiResData = JSON.parse(apiResData, true);
         }
         return _this.resetNetResponse(apiResData);
@@ -401,6 +393,25 @@ class RequestClass {
     //   return Promise.reject(uniRes);
     // });
   }
+  __encryp_parse(url) {
+    //
+  }
+  __parse_method_type(type) {
+    let last_type = type;
+    let MetSupport = this.needMethods || [];
+    if (MetSupport.length > 0) {
+      // 转大写
+      let typeDaxie = last_type.toUpperCase();
+      // console.log(MetSupport, last_type, MetSupport.indexOf(typeDaxie));
+      if (MetSupport.indexOf(typeDaxie) !== -1) {
+        last_type = 'POST';
+        this.headers['X-HTTP-Method-Override'] = typeDaxie;
+      } else {
+        delete this.headers['X-HTTP-Method-Override'];
+      }
+    }
+    return last_type;
+  }
   /**
    * GET 请求
    */
@@ -490,7 +501,7 @@ class RequestClass {
     let apiUrl = '';
     let apiUrlNoMsg = '';
     if (flagOrUrl == 'flag') {
-      let apiFlag = this.getFlag(argumentsArr[0]);
+      let apiFlag = argumentsArr[0];
       if (typeof apiFlag === 'string') {
         apiFlag = apiFlag || '';
         apiUrl = apiFlag == '' ? '' : this.flagMap[apiFlag] || '';
@@ -522,12 +533,14 @@ class RequestClass {
       let arg2Type = Object.prototype.toString.call(arg2Val);
       // let argType2_2 = typeof argumentsArr[1] === 'object';
       if (arg2Type === '[object String]' || arg2Type === '[object Number]') {
-        // console.log('----转换-----', BigInt(arg2Val), Number(arg2Val)); 超过17位
-        if (!isNaN(arg2Val)) {
-          // console.log('---数字');
-          let bigIntNum = BigInt(`${arg2Val}`);
-          let isEndId = bigIntNum.toString();
-          if (!confirmEnding(apiUrl, '/')) {
+        // console.log('----转换-----', parseInt(arg2Val), BigInt(arg2Val), Number(arg2Val)); // 超过17位;
+        let isEndId = Number(arg2Val);
+        if (!isNaN(isEndId)) {
+          // 检查是否精度丢失（当原始值有超过17位或转换后不等时）
+          if (isEndId.toString() !== String(arg2Val).trim()) {
+            isEndId = BigInt(`${arg2Val}`).toString(); // 回退到BigInt
+          }
+          if (!apiUrl.endsWith('/')) {
             apiUrl = apiUrl + '/';
           }
           apiUrl = apiUrl + isEndId;
@@ -543,6 +556,8 @@ class RequestClass {
         }
       } else if (arg2Type === '[object Object]') {
         reqData = arg2Val || {};
+      } else if (arg2Type === '[object FormData]') {
+        reqData = arg2Val || new FormData();
       }
       return _this.apiAll(methodType, apiUrl, reqData);
     } else {

package/ui-cv/components/cv-btn-base/cv-btn-base.vue

@@ -1,5 +1,12 @@
 <template>
-  <button class="cv-button-wrap" :type="type" :size="size" @click="parentClick"><slot /></button>
+  <button class="cv-button-wrap" :type="type" :size="size" @click="parentClick" :disabled="loadingStatus">
+    <view class="cv-button-box">
+      <view :class="loadingStatus ? 'cv-button-rotateloop' : ''">
+        <u-loading-icon v-if="loadingStatus" size="20"></u-loading-icon>
+      </view>
+      <slot>{{ text }}</slot>
+    </view>
+  </button>
 </template>
 <script>
 import mpMixin from '../../libs/mixin/mpMixin.js';
@@ -15,7 +22,7 @@ export default {
     },
     type: {
       type: [String],
-      default: 'primary'
+      default: 'default'
     },
     click: {
       type: [Function]
@@ -27,7 +34,7 @@ export default {
   },
   data() {
     return {
-      loadingStatus: true
+      loadingStatus: false
     };
   },
   created() {},
@@ -39,10 +46,10 @@ export default {
     },
     parentClick(evt) {
       if (this.autoLoading) {
-        if (this.loadingStatus) {
-          this.loadingStatus = false;
+        if (!this.loadingStatus) {
+          this.loadingStatus = true;
           this.$emit('click', () => {
-            this.loadingStatus = true;
+            this.loadingStatus = false;
           });
         }
       } else {
@@ -55,19 +62,64 @@ export default {
 <style>
 .cv-button-wrap {
   padding: 0 10px;
-  margin: 0 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 10px;
   margin-bottom: 10px;
   font-size: 15px;
+  width: 90%;
+}
+.cv-button-box {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
 }
 .cv-button-wrap:last-child {
   margin-bottom: 0;
 }
-.cv-button-item2 {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 275px;
-  height: 40px;
-  margin: 10px auto;
+/* 旋转动画 */
+.cv-button-rotateloop {
+  -webkit-transition-property: -webkit-transform;
+  -webkit-transition-duration: 1s;
+  -moz-transition-property: -moz-transform;
+  -moz-transition-duration: 1s;
+  -webkit-animation: rotate 1s linear infinite;
+  -moz-animation: rotate 1s linear infinite;
+  -o-animation: rotate 1s linear infinite;
+  animation: rotate 1s linear infinite;
+}
+@-webkit-keyframes rotate {
+  from {
+    -webkit-transform: rotate(0deg);
+  }
+  to {
+    -webkit-transform: rotate(360deg);
+  }
+}
+@-moz-keyframes rotate {
+  from {
+    -moz-transform: rotate(0deg);
+  }
+  to {
+    -moz-transform: rotate(359deg);
+  }
+}
+@-o-keyframes rotate {
+  from {
+    -o-transform: rotate(0deg);
+  }
+  to {
+    -o-transform: rotate(359deg);
+  }
+}
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(359deg);
+  }
 }
 </style>

package/ui-cv/components/cv-code-sms/cv-code-sms.vue

@@ -15,7 +15,7 @@
       <button
         size="mini"
         class="cv-code-button-item"
-        :class="btnDisabled ? 'cv-code-button-wait' : ''"
+        :class="[btnType, btnDisabled ? 'cv-code-button-wait' : '']"
         :disabled="btnDisabled"
         @tap="getSmsCode"
       >
@@ -60,10 +60,18 @@ export default {
       type: Function,
       default: null
     },
+    apiParam: {
+      type: Object,
+      default: {}
+    },
     // 短信发送间隔
     waitTime: {
       type: [Number, String],
       default: 60
+    },
+    btnType: {
+      type: [String],
+      default: 'default'
     }
   },
   watch: {
@@ -141,7 +149,8 @@ export default {
           this.apiFunc({
             cto_sms_type: 'alterMobile',
             sendCode: '发送验证码',
-            [this.mobileParam]: this.localMobile
+            [this.mobileParam]: this.localMobile,
+            ...this.apiParam
           })
             .then((successRes) => {
               let apiData = successRes;
@@ -193,15 +202,11 @@ export default {
   }
 };
 </script>
-
 <style>
 .cv-code-area {
-  height: 35px;
+  min-height: 35px;
   line-height: 35px;
   font-size: 14px;
-  width: 100%;
-  padding-right: 10px;
-
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -210,22 +215,24 @@ export default {
 }
 .cv-code-input-area {
   width: calc(100% - 120px - 10px);
-  float: left;
+  display: flex;
+  align-items: center;
 }
 .cv-code-input-item {
-  height: 35px;
-  line-height: 35px;
+  height: 100%;
 }
 .cv-code-input-item-placeholder {
   font-size: 14px;
 }
 .cv-code-button-area {
-  float: right;
-  height: 35px;
+  display: flex;
+  align-items: center;
 }
-.cv-code-button-item {
-  height: 35px;
-  line-height: 35px;
+.cv-code-button-item.default {
+  background-color: #f8f8f8;
+  color: #333;
+}
+.cv-code-button-item.primary {
   background-color: #007aff;
   color: #ffffff;
 }

package/ui-cv/components/cv-date-base/cv-date-base.vue

@@ -100,7 +100,7 @@ export default {
   height: 35px;
   line-height: 35px;
   width: 100%;
-  margin-left: 20px;
+  /* margin-left: 20px; */
 }
 .cv-date-base-placeholder {
   color: grey;

package/ui-cv/components/cv-input-text/input.css

@@ -1,3 +1,16 @@
+.cv-input-password {
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+}
+.cv-input-password .cv-input__right {
+  position: unset;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  justify-content: center;
+}
 .cv-input__content {
   /* min-height: 28px; */
   /* line-height: 36px; */

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

@@ -48,7 +48,7 @@ export default {
     //数据类型text的名称
     dataText: {
       type: String,
-      default: 'text'
+      default: 'label'
     },
     // 占位符
     placeholder: {

package/uni-ui/lib/uni-icons/changelog.md

@@ -0,0 +1,22 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范

package/uni-ui/lib/uni-icons/package.json

@@ -0,0 +1,42 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+  ],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  }
+}

package/uni-ui/lib/uni-icons/readme.md

@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

package/uview-plus/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 www.uviewui.com
+Copyright (c) 2024 https://uiadmin.net/uview-plus
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/uview-plus/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-    <img alt="logo" src="https://uviewui.com/common/logo.png" width="120" height="120" style="margin-bottom: 10px;">
+    <img alt="logo" src="https://uiadmin.net/uview-plus/common/logo.png" width="120" height="120" style="margin-bottom: 10px;">
 </p>
 <h3 align="center" style="margin: 30px 0 30px;font-weight: bold;font-size:40px;">uview-plus 3.0</h3>
 <h3 align="center">多平台快速开发的UI框架</h3>
@@ -7,14 +7,24 @@
 [![stars](https://img.shields.io/github/stars/ijry/uview-plus?style=flat-square&logo=GitHub)](https://github.com/ijry/uview-plus)
 [![forks](https://img.shields.io/github/forks/ijry/uview-plus?style=flat-square&logo=GitHub)](https://github.com/ijry/uview-plus)
 [![issues](https://img.shields.io/github/issues/ijry/uview-plus?style=flat-square&logo=GitHub)](https://github.com/ijry/uview-plus/issues)
-[![release](https://img.shields.io/github/v/release/ijry/uview-plus?style=flat-square)](https://gitee.com/uiadmin/uview-plus/releases)
+[![release](https://img.shields.io/github/v/release/ijry/uview-plus?style=flat-square)](https://gitee.com/jry/uview-plus/releases)
 [![license](https://img.shields.io/github/license/ijry/uview-plus?style=flat-square)](https://en.wikipedia.org/wiki/MIT_License)
 
 ## 说明
 
-uview-plus，是uni-app全面兼容vue3/nvue的uni-app生态框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水。uview-plus是基于uView2.x移植的支持vue3的版本，感谢uView。
+uview-plus，是uni-app全面兼容vue3/nvue/鸿蒙/uni-app-x的uni-app生态框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水。uview-plus是基于uView2.x移植的支持vue3的版本，感谢uView。
 
-## [官方文档：https://uiadmin.net/uview-plus](https://uiadmin.net/uview-plus)
+## 可视化设计
+
+uview-plus现已推出免费可视化设计，可以方便的进行页面可视化设计，导出源码即可使用。极大提高前端页面开发效率；如产品经理设计师直接使用更可作为高保真高可用原型制作工具，让设计稿即代码，无需传统的设计稿开发还原步骤。
+
+<img src="https://s3.bmp.ovh/imgs/2024/11/24/fd58d00071e6e5df.png" width="900" height="auto" >
+<img src="https://s3.bmp.ovh/imgs/2024/11/24/8e85a519fe627fb1.png" width="900" height="auto" >
+
+
+## 文档
+[官方文档：https://uview-plus.jiangruyi.com](https://uview-plus.jiangruyi.com)
+[备用文档：https://uiadmin.net/uview-plus](https://uiadmin.net/uview-plus)
 
 
 ## 预览
@@ -22,18 +32,18 @@ uview-plus，是uni-app全面兼容vue3/nvue的uni-app生态框架，全面的
 您可以通过**微信**扫码，查看最佳的演示效果。
 <br>
 <br>
-<img src="https://uiadmin.net/uview-plus/common/h5_qrcode.png" width="220" height="220" >
+<img src="https://uview-plus.jiangruyi.com/common/h5_qrcode.png" width="220" height="220" >
 
 ## 链接
 
-- [官方文档](https://uiadmin.net/uview-plus)
-- [更新日志](https://uiadmin.net/uview-plus/components/changelog.html)
-- [升级指南](https://uiadmin.net/uview-plus/components/changeGuide.html)
-- [关于我们](https://uiadmin.net/uview-plus/cooperation/about.html)
+- [官方文档](https://uview-plus.jiangruyi.com)
+- [更新日志](https://uview-plus.jiangruyi.com/components/changelog.html)
+- [升级指南](https://uview-plus.jiangruyi.com/components/changeGuide.html)
+- [关于我们](https://uview-plus.jiangruyi.com/cooperation/about.html)
 
 ## 交流反馈
 
-欢迎加入我们的QQ群交流反馈：[点此跳转](https://uiadmin.net/uview-plus/components/addQQGroup.html)
+欢迎加入我们的QQ群交流反馈：[点此跳转](https://uview-plus.jiangruyi.com/components/addQQGroup.html)
 
 ## 关于PR
 
@@ -44,11 +54,11 @@ uview-plus，是uni-app全面兼容vue3/nvue的uni-app生态框架，全面的
 
 #### **uni-app插件市场链接** —— [https://ext.dcloud.net.cn/plugin?name=uview-plus](https://ext.dcloud.net.cn/plugin?name=uview-plus)
 
-请通过[官网安装文档](https://uiadmin.net/uview-plus/components/install.html)了解更详细的内容
+请通过[官网安装文档](https://uview-plus.jiangruyi.com/components/install.html)了解更详细的内容
 
 ## 快速上手
 
-请通过[快速上手](https://uiadmin.net/uview-plus/components/quickstart.html)了解更详细的内容
+请通过[快速上手](https://uview-plus.jiangruyi.com/components/quickstart.html)了解更详细的内容
 
 ## 使用方法
 配置easycom规则后，自动按需引入，无需`import`组件，直接引用即可。