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

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.30",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "10yun",
   "license": "Apache-2.0",

package/plugins/luch-request/adapters/index.js

@@ -0,0 +1,131 @@
+import buildURL from '../helpers/buildURL';
+import buildFullPath from '../core/buildFullPath';
+import settle from '../core/settle';
+import { isUndefined } from '../utils';
+
+/**
+ * 返回可选值存在的配置
+ * @param {Array} keys - 可选值数组
+ * @param {Object} config2 - 配置
+ * @return {{}} - 存在的配置项
+ */
+const mergeKeys = (keys, config2) => {
+  let config = {};
+  keys.forEach((prop) => {
+    if (!isUndefined(config2[prop])) {
+      config[prop] = config2[prop];
+    }
+  });
+  return config;
+};
+export default (config) => {
+  return new Promise((resolve, reject) => {
+    let fullPath = buildURL(buildFullPath(config.baseURL, config.url), config.params, config.paramsSerializer);
+    const _config = {
+      url: fullPath,
+      header: config.header,
+      complete: (response) => {
+        config.fullPath = fullPath;
+        response.config = config;
+        response.rawData = response.data;
+        try {
+          let jsonParseHandle = false;
+          const forcedJSONParsingType = typeof config.forcedJSONParsing;
+          if (forcedJSONParsingType === 'boolean') {
+            jsonParseHandle = config.forcedJSONParsing;
+          } else if (forcedJSONParsingType === 'object') {
+            const includesMethod = config.forcedJSONParsing.include || [];
+            jsonParseHandle = includesMethod.includes(config.method);
+          }
+
+          // 对可能字符串不是json 的情况容错
+          if (jsonParseHandle && typeof response.data === 'string') {
+            response.data = JSON.parse(response.data);
+          }
+          // eslint-disable-next-line no-empty
+        } catch (e) {}
+        settle(resolve, reject, response);
+      }
+    };
+    let requestTask;
+    if (config.method === 'UPLOAD') {
+      delete _config.header['content-type'];
+      delete _config.header['Content-Type'];
+      let otherConfig = {
+        // #ifdef MP-ALIPAY
+        fileType: config.fileType,
+        // #endif
+        filePath: config.filePath,
+        name: config.name
+      };
+      const optionalKeys = [
+        // #ifdef APP-PLUS || H5
+        'files',
+        // #endif
+        // #ifdef H5
+        'file',
+        // #endif
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        'formData'
+      ];
+      requestTask = uni.uploadFile({ ..._config, ...otherConfig, ...mergeKeys(optionalKeys, config) });
+    } else if (config.method === 'DOWNLOAD') {
+      const optionalKeys = [
+        // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+        'timeout',
+        // #endif
+        // #ifdef MP
+        'filePath'
+        // #endif
+      ];
+      requestTask = uni.downloadFile({ ..._config, ...mergeKeys(optionalKeys, config) });
+    } else {
+      const optionalKeys = [
+        'data',
+        'method',
+        // #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+        'timeout',
+        // #endif
+        'dataType',
+        // #ifndef MP-ALIPAY
+        'responseType',
+        // #endif
+        // #ifdef APP-PLUS
+        'sslVerify',
+        // #endif
+        // #ifdef H5
+        'withCredentials',
+        // #endif
+        // #ifdef APP-PLUS
+        'firstIpv4',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttp2',
+        'enableQuic',
+        // #endif
+        // #ifdef MP-TOUTIAO || MP-WEIXIN
+        'enableCache',
+        // #endif
+        // #ifdef MP-WEIXIN
+        'enableHttpDNS',
+        'httpDNSServiceId',
+        'enableChunked',
+        'forceCellularNetwork',
+        // #endif
+        // #ifdef MP-ALIPAY
+        'enableCookie',
+        // #endif
+        // #ifdef MP-BAIDU
+        'cloudCache',
+        'defer'
+        // #endif
+      ];
+      requestTask = uni.request({ ..._config, ...mergeKeys(optionalKeys, config) });
+    }
+    if (config.getTask) {
+      config.getTask(requestTask, config);
+    }
+  });
+};

package/plugins/luch-request/core/InterceptorManager.js

@@ -0,0 +1,50 @@
+'use strict';
+
+function InterceptorManager() {
+  this.handlers = [];
+}
+
+/**
+ * Add a new interceptor to the stack
+ *
+ * @param {Function} fulfilled The function to handle `then` for a `Promise`
+ * @param {Function} rejected The function to handle `reject` for a `Promise`
+ *
+ * @return {Number} An ID used to remove interceptor later
+ */
+InterceptorManager.prototype.use = function use(fulfilled, rejected) {
+  this.handlers.push({
+    fulfilled: fulfilled,
+    rejected: rejected
+  });
+  return this.handlers.length - 1;
+};
+
+/**
+ * Remove an interceptor from the stack
+ *
+ * @param {Number} id The ID that was returned by `use`
+ */
+InterceptorManager.prototype.eject = function eject(id) {
+  if (this.handlers[id]) {
+    this.handlers[id] = null;
+  }
+};
+
+/**
+ * Iterate over all the registered interceptors
+ *
+ * This method is particularly useful for skipping over any
+ * interceptors that may have become `null` calling `eject`.
+ *
+ * @param {Function} fn The function to call for each interceptor
+ */
+InterceptorManager.prototype.forEach = function forEach(fn) {
+  this.handlers.forEach((h) => {
+    if (h !== null) {
+      fn(h);
+    }
+  });
+};
+
+export default InterceptorManager;

package/plugins/luch-request/core/Request.js

@@ -0,0 +1,199 @@
+/**
+ * @Class Request
+ * @description luch-request http请求插件
+ * @Author lu-ch
+ * @Email webwork.s@qq.com
+ * 文档: https://www.quanzhan.co/luch-request/
+ * github: https://github.com/lei-mu/luch-request
+ * DCloud: http://ext.dcloud.net.cn/plugin?id=392
+ */
+
+import dispatchRequest from './dispatchRequest';
+import InterceptorManager from './InterceptorManager';
+import mergeConfig from './mergeConfig';
+import defaults from './defaults';
+import { isPlainObject } from '../utils';
+import clone from '../utils/clone';
+
+export default class Request {
+  /**
+   * @param {Object} arg - 全局配置
+   * @param {String} arg.baseURL - 全局根路径
+   * @param {Object} arg.header - 全局header
+   * @param {String} arg.method = [GET|POST|PUT|DELETE|CONNECT|HEAD|OPTIONS|TRACE] - 全局默认请求方式
+   * @param {String} arg.dataType = [json] - 全局默认的dataType
+   * @param {String} arg.responseType = [text|arraybuffer] - 全局默认的responseType。支付宝小程序不支持
+   * @param {Object} arg.custom - 全局默认的自定义参数
+   * @param {Number} arg.timeout - 全局默认的超时时间，单位 ms。默认60000。H5(HBuilderX 2.9.9+)、APP(HBuilderX 2.9.9+)、微信小程序（2.10.0）、支付宝小程序
+   * @param {Boolean} arg.sslVerify - 全局默认的是否验证 ssl 证书。默认true.仅App安卓端支持（HBuilderX 2.3.3+）
+   * @param {Boolean} arg.withCredentials - 全局默认的跨域请求时是否携带凭证（cookies）。默认false。仅H5支持（HBuilderX 2.6.15+）
+   * @param {Boolean} arg.firstIpv4 - 全DNS解析时优先使用ipv4。默认false。仅 App-Android 支持 (HBuilderX 2.8.0+)
+   * @param {Function(statusCode):Boolean} arg.validateStatus - 全局默认的自定义验证器。默认statusCode >= 200 && statusCode < 300
+   */
+  constructor(arg = {}) {
+    if (!isPlainObject(arg)) {
+      arg = {};
+      console.warn('设置全局参数必须接收一个Object');
+    }
+    this.config = clone({ ...defaults, ...arg });
+    this.interceptors = {
+      request: new InterceptorManager(),
+      response: new InterceptorManager()
+    };
+  }
+
+  /**
+   * @Function
+   * @param {Request~setConfigCallback} f - 设置全局默认配置
+   */
+  setConfig(f) {
+    this.config = f(this.config);
+  }
+
+  middleware(config) {
+    config = mergeConfig(this.config, config);
+    let chain = [dispatchRequest, undefined];
+    let promise = Promise.resolve(config);
+
+    this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) {
+      chain.unshift(interceptor.fulfilled, interceptor.rejected);
+    });
+
+    this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) {
+      chain.push(interceptor.fulfilled, interceptor.rejected);
+    });
+
+    while (chain.length) {
+      promise = promise.then(chain.shift(), chain.shift());
+    }
+
+    return promise;
+  }
+
+  /**
+   * @Function
+   * @param {Object} config - 请求配置项
+   * @prop {String} options.url - 请求路径
+   * @prop {Object} options.data - 请求参数
+   * @prop {Object} [options.responseType = config.responseType] [text|arraybuffer] - 响应的数据类型
+   * @prop {Object} [options.dataType = config.dataType] - 如果设为 json，会尝试对返回的数据做一次 JSON.parse
+   * @prop {Object} [options.header = config.header] - 请求header
+   * @prop {Object} [options.method = config.method] - 请求方法
+   * @returns {Promise<unknown>}
+   */
+  request(config = {}) {
+    return this.middleware(config);
+  }
+
+  get(url, options = {}) {
+    return this.middleware({
+      url,
+      method: 'GET',
+      ...options
+    });
+  }
+
+  post(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'POST',
+      ...options
+    });
+  }
+
+  // #ifndef MP-ALIPAY || MP-KUAISHOU || MP-JD
+  put(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'PUT',
+      ...options
+    });
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  delete(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'DELETE',
+      ...options
+    });
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  connect(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'CONNECT',
+      ...options
+    });
+  }
+
+  // #endif
+
+  // #ifdef  H5 || MP-WEIXIN || MP-BAIDU
+  head(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'HEAD',
+      ...options
+    });
+  }
+
+  // #endif
+
+  // #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-BAIDU
+  options(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'OPTIONS',
+      ...options
+    });
+  }
+
+  // #endif
+
+  // #ifdef H5 || MP-WEIXIN
+  trace(url, data, options = {}) {
+    return this.middleware({
+      url,
+      data,
+      method: 'TRACE',
+      ...options
+    });
+  }
+
+  // #endif
+
+  upload(url, config = {}) {
+    config.url = url;
+    config.method = 'UPLOAD';
+    return this.middleware(config);
+  }
+
+  download(url, config = {}) {
+    config.url = url;
+    config.method = 'DOWNLOAD';
+    return this.middleware(config);
+  }
+
+  get version() {
+    return '3.1.0';
+  }
+}
+
+/**
+ * setConfig回调
+ * @return {Object} - 返回操作后的config
+ * @callback Request~setConfigCallback
+ * @param {Object} config - 全局默认config
+ */

package/plugins/luch-request/core/buildFullPath.js

@@ -0,0 +1,20 @@
+'use strict';
+
+import isAbsoluteURL from '../helpers/isAbsoluteURL';
+import combineURLs from '../helpers/combineURLs';
+
+/**
+ * Creates a new URL by combining the baseURL with the requestedURL,
+ * only when the requestedURL is not already an absolute URL.
+ * If the requestURL is absolute, this function returns the requestedURL untouched.
+ *
+ * @param {string} baseURL The base URL
+ * @param {string} requestedURL Absolute or relative URL to combine
+ * @returns {string} The combined full path
+ */
+export default function buildFullPath(baseURL, requestedURL) {
+  if (baseURL && !isAbsoluteURL(requestedURL)) {
+    return combineURLs(baseURL, requestedURL);
+  }
+  return requestedURL;
+}

package/plugins/luch-request/core/defaults.js

@@ -0,0 +1,32 @@
+/**
+ * 默认的全局配置
+ */
+
+export default {
+  baseURL: '',
+  header: {},
+  method: 'GET',
+  dataType: 'json',
+  paramsSerializer: null,
+  // #ifndef MP-ALIPAY
+  responseType: 'text',
+  // #endif
+  custom: {},
+  // #ifdef H5 || APP-PLUS || MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO || MP-KUAISHOU
+  timeout: 60000,
+  // #endif
+  // #ifdef APP-PLUS
+  sslVerify: true,
+  // #endif
+  // #ifdef H5
+  withCredentials: false,
+  // #endif
+  // #ifdef APP-PLUS
+  firstIpv4: false,
+  // #endif
+  validateStatus: function validateStatus(status) {
+    return status >= 200 && status < 300;
+  },
+  // 是否尝试将响应数据json化
+  forcedJSONParsing: true
+};

package/plugins/luch-request/core/dispatchRequest.js

@@ -0,0 +1,5 @@
+import adapter from '../adapters/index';
+
+export default (config) => {
+  return adapter(config);
+};