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

package/build/parse-pages.js

@@ -81,7 +81,7 @@ function getMainData() {
     .reduce((promise, fileName) => {
       return promise.then(() => {
         console.log('【主包配置】 ' + fileName);
-        var temp = JSON.parse(filter_comments(fs.readFileSync(path.join(fileName), 'utf-8')));
+        let temp = JSON.parse(filter_comments(fs.readFileSync(path.join(fileName), 'utf-8')));
         pages_main_data = pages_main_data.concat(temp);
       });
     }, Promise.resolve([]))
@@ -97,7 +97,7 @@ function getSubData() {
       return promise.then(() => {
         console.log('【分包配置】 ' + fileName);
         let root = fileName.match(/pages\/(\S*)\//)[0];
-        var temp = JSON.parse(filter_comments(fs.readFileSync(path.join(fileName), 'utf-8')));
+        let temp = JSON.parse(filter_comments(fs.readFileSync(path.join(fileName), 'utf-8')));
         ergodic(temp, 'path', root);
         temp = {
           root: root,
@@ -158,7 +158,7 @@ function filter_comments(string) {
   return string;
 }
 
-/* 抽取自定义配置diy-plus到 pages-diy-plus.js */
+/* 抽取自定义配置 meta 到 router/menu.js */
 function pages_diy(pages) {
   if (argv !== 'plus') {
     return pages;
@@ -168,11 +168,11 @@ function pages_diy(pages) {
   // 遍历主包配置
 
   for (const key in pages.pages) {
-    if (pages.pages[key]['diy-plus']) {
+    if (pages.pages[key]['meta']) {
       let k = pages.pages[key].path.replace(/\//g, '_');
-      console.log('【抽取diy-plus】 ' + pages.pages[key].path, ' -> ', k);
-      diyPlus[k] = pages.pages[key]['diy-plus'];
-      delete pages.pages[key]['diy-plus'];
+      console.log('【抽取meta】 ' + pages.pages[key].path, ' -> ', k);
+      diyPlus[k] = pages.pages[key]['meta'];
+      delete pages.pages[key]['meta'];
     }
   }
 
@@ -180,19 +180,55 @@ function pages_diy(pages) {
   for (const key in pages.subPackages) {
     for (const index in pages.subPackages[key].pages) {
       let root = pages.subPackages[key].root;
-      if (pages.subPackages[key].pages[index]['diy-plus']) {
+      if (pages.subPackages[key].pages[index]['meta']) {
         let full_path = root + pages.subPackages[key].pages[index].path;
         let k = full_path.replace(/\//g, '_');
-        console.log('【抽取diy-plus】 ' + full_path, ' -> ', k);
-        diyPlus[k] = pages.subPackages[key].pages[index]['diy-plus'];
-        delete pages.subPackages[key].pages[index]['diy-plus'];
+        console.log('【抽取meta】 ' + full_path, ' -> ', k);
+        diyPlus[k] = pages.subPackages[key].pages[index]['meta'];
+        delete pages.subPackages[key].pages[index]['meta'];
       }
     }
   }
   if (diyPlus) {
-    diyPlus = 'export default ' + JSON.stringify(diyPlus);
-    console.log('【更新文件】' + projectSrc + '/pages-diy-plus.js');
-    fs.writeFileSync(projectSrc + '/pages-diy-plus.js', diyPlus);
+    //let  content = 'export default ' + JSON.stringify(diyPlus);
+    //let  content = 'export default ' + JSON.stringify(diyPlus, null, 2);
+    let content = 'export default {\n';
+    const entries = Object.entries(diyPlus);
+    for (let i = 0; i < entries.length; i++) {
+      const [key, value] = entries[i];
+
+      // 处理 value，手动转成类似 JSON 但键名无引号、字符串用单引号的格式
+      let formattedValue = '{ ';
+      const valueEntries = Object.entries(value);
+      for (let j = 0; j < valueEntries.length; j++) {
+        const [subKey, subVal] = valueEntries[j];
+        formattedValue += `${subKey}: `;
+
+        if (typeof subVal === 'string') {
+          formattedValue += `'${subVal}'`; // 字符串值用单引号
+        } else {
+          formattedValue += subVal; // 非字符串直接输出
+        }
+
+        if (j < valueEntries.length - 1) {
+          formattedValue += ', '; // 非最后一个属性加逗号
+        }
+      }
+      formattedValue += ' }';
+
+      // 拼接当前行的内容
+      content += `  ${key}: ${formattedValue}`;
+
+      // 如果不是最后一个元素，加逗号换行
+      if (i < entries.length - 1) {
+        content += ',\n';
+      } else {
+        content += '\n'; // 最后一行不加逗号，只换行
+      }
+    }
+    content += '};';
+    console.log('【更新文件】' + projectSrc + '/router/menu.js');
+    fs.writeFileSync(projectSrc + '/router/menu.js', content);
   }
   return pages;
 }

package/build/parse-pages2.js

@@ -130,6 +130,7 @@ function getCommonData() {
       return promise.then(() => {
         console.log('【主要配置】' + fileName);
         var temp = JSON.parse(filter_comments(fs.readFileSync(path.join(fileName), 'utf-8')));
+
         Object.assign(pages_common_data, temp);
       });
     }, Promise.resolve([]))
@@ -169,7 +170,7 @@ function getSubData() {
       return promise.then(() => {
         console.log('【分包配置】 ' + fileName);
         let root = fileName.match(/pages\/(\S*)\//)[0];
-        var temp = JSON.parse(filter_comments(fs.readFileSync(path.join(fileName), 'utf-8')));
+        let temp = JSON.parse(filter_comments(fs.readFileSync(path.join(fileName), 'utf-8')));
 
         let temp_rbac = parseRbacMenu(temp, root);
         rbacAll.push(...temp_rbac);
@@ -240,7 +241,7 @@ function filter_comments(string) {
   return string;
 }
 
-/* 抽取自定义配置diy-plus到 pages-diy-plus.js */
+/* 抽取自定义配置 meta 到 router/menu.js */
 function pages_diy(pages) {
   if (argv !== 'plus') {
     return pages;
@@ -250,11 +251,11 @@ function pages_diy(pages) {
   // 遍历主包配置
 
   for (const key in pages.pages) {
-    if (pages.pages[key]['diy-plus']) {
+    if (pages.pages[key]['meta']) {
       let k = pages.pages[key].path.replace(/\//g, '_');
-      console.log('【抽取diy-plus】 ' + pages.pages[key].path, ' -> ', k);
-      diyPlus[k] = pages.pages[key]['diy-plus'];
-      delete pages.pages[key]['diy-plus'];
+      console.log('【抽取meta】 ' + pages.pages[key].path, ' -> ', k);
+      diyPlus[k] = pages.pages[key]['meta'];
+      delete pages.pages[key]['meta'];
     }
   }
 
@@ -262,12 +263,12 @@ function pages_diy(pages) {
   for (const key in pages.subPackages) {
     for (const index in pages.subPackages[key].pages) {
       let root = pages.subPackages[key].root;
-      if (pages.subPackages[key].pages[index]['diy-plus']) {
+      if (pages.subPackages[key].pages[index]['meta']) {
         let full_path = root + pages.subPackages[key].pages[index].path;
         let k = full_path.replace(/\//g, '_');
-        console.log('【抽取diy-plus】 ' + full_path, ' -> ', k);
-        diyPlus[k] = pages.subPackages[key].pages[index]['diy-plus'];
-        delete pages.subPackages[key].pages[index]['diy-plus'];
+        console.log('【抽取meta】 ' + full_path, ' -> ', k);
+        diyPlus[k] = pages.subPackages[key].pages[index]['meta'];
+        delete pages.subPackages[key].pages[index]['meta'];
       }
     }
   }

package/other/uParse/components/wxParseAudio.vue

@@ -1 +1 @@
-<template>
  <cv-base-audio
    :id="node.attr.id"
    :class="node.classStr"
    :style="node.styleStr"
    :src="node.attr.src"
    :loop="node.attr.loop"
    :poster="node.attr.poster"
    :name="node.attr.name"
    :author="node.attr.author"
    controls
  />
  name: 'wxParseAudio',
  props: {
    node: {
      type: Object,
      default() {
        return {};
      }
    }
  }
+<template>
  <audio
    :id="node.attr.id"
    :class="node.classStr"
    :style="node.styleStr"
    :src="node.attr.src"
    :loop="node.attr.loop"
    :poster="node.attr.poster"
    :name="node.attr.name"
    :author="node.attr.author"
    controls
  />
  name: 'wxParseAudio',
  props: {
    node: {
      type: Object,
      default() {
        return {};
      }
    }
  }

package/other/uParse/components/wxParseVideo.vue

@@ -1,7 +1,7 @@
 <template>
   <!--增加video标签支持，并循环添加-->
   <view :class="node.classStr" :style="node.styleStr">
-    <video :class="node.classStr" class="video-video" :src="node.attr.src" :style="node.styleStr" ></video>
+    <video :class="node.classStr" class="video-video" :src="node.attr.src" :style="node.styleStr"></video>
   </view>
 </template>
 <script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.27",
+  "version": "0.5.29",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "10yun",
   "license": "Apache-2.0",

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(newFlagMap) {
-    this.flagMap = Object.assign({}, this.flagMap, newFlagMap || {});
+  setApiFlag(options) {
+    this.flagMap = options || {};
     return this;
   }
-  parseFlag(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;
+  appendApiFlag(options) {
+    this.flagMap = Object.assign({}, this.flagMap, options || {});
+    return this;
+  }
+  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.parseFlag(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;