@fairys/taro-tools-react 1.0.12 → 1.0.14

package/esm/components/MainPage/index.js

@@ -4,7 +4,7 @@ import clsx from "clsx";
 import { useMemo } from "react";
 const FairysTaroMainPage = (props)=>{
     const { className: itemClassName, children, ...rest } = props;
-    const cls = useMemo(()=>clsx('fairys_taro-ui-main-page fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto', itemClassName), [
+    const cls = useMemo(()=>clsx('fairys_taro-ui-main-page fairystaro__text-red-100 fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto', itemClassName), [
         itemClassName
     ]);
     return /*#__PURE__*/ jsx(View, {

package/esm/context/page.data.instance.d.ts

@@ -1,5 +1,5 @@
 import { ProxyInstanceObjectBase } from '../utils/valtio/instance';
-export interface PageDataInstanceState extends Object {
+export interface PageDataInstanceState extends Record<string, any> {
     /**loading存储*/
     loading?: Record<string, boolean>;
     /**当前页*/

package/esm/context/page.info.data.instance.d.ts

@@ -1,5 +1,5 @@
 import { ProxyInstanceObjectBase } from '../utils/valtio/instance';
-export interface PageInfoDataInstanceState extends Object {
+export interface PageInfoDataInstanceState extends Record<string, any> {
     /**loading存储*/
     loading?: Record<string, boolean>;
     /**编辑表单数据*/
@@ -10,7 +10,6 @@ export interface PageInfoDataInstanceState extends Object {
     isInfoSuccess?: boolean;
     /**数据默认值不使用*/
     __defaultValue?: string;
-    [s: string]: any;
 }
 export declare class PageInfoDataInstance<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> extends ProxyInstanceObjectBase<T> {
     notRefFields: string[];

package/esm/styles/index.css

@@ -120,11 +120,11 @@
 }
 
 .fairystaro__gap-_zkh1_0_dl_4rem_zhk2_ {
-  gap: .4rem;
+  gap: 6.4px;
 }
 
 .fairystaro__gap-2 {
-  gap: .5rem;
+  gap: 8px;
 }
 
 .fairystaro__overflow-auto {
@@ -136,7 +136,7 @@
 }
 
 .fairystaro__rounded-md {
-  border-radius: .375rem;
+  border-radius: 6px;
 }
 
 .fairystaro__border-solid {
@@ -148,29 +148,29 @@
 }
 
 .fairystaro__p-2 {
-  padding: .5rem;
+  padding: 8px;
 }
 
 .fairystaro__p-x-_zkh1_0_dl_4rem_zhk2_ {
-  padding-left: .4rem;
-  padding-right: .4rem;
+  padding-left: 6.4px;
+  padding-right: 6.4px;
 }
 
 .fairystaro__p-y-_zkh1_0_dl_4rem_zhk2_ {
-  padding-top: .4rem;
-  padding-bottom: .4rem;
+  padding-top: 6.4px;
+  padding-bottom: 6.4px;
 }
 
 .fairystaro__p-t-_zkh1_0_dl_15rem_zhk2_ {
-  padding-top: .15rem;
+  padding-top: 2.4px;
 }
 
 .fairystaro__text-_zkh1_0_dl_6rem_zhk2_ {
-  font-size: .6rem;
+  font-size: 9.6px;
 }
 
 .fairystaro__text-_zkh1_0_dl_8rem_zhk2_ {
-  font-size: .8rem;
+  font-size: 12.8px;
 }
 
 .fairystaro__text-color-_zkh1_blue_zhk2_ {
@@ -189,6 +189,11 @@
   color: red;
 }
 
+.fairystaro__text-red-100 {
+  --un-text-opacity: 1;
+  color: rgb(254 226 226 / var(--un-text-opacity));
+}
+
 .fairystaro__font-bold {
   font-weight: 700;
 }

package/esm/utils/request.d.ts

@@ -16,6 +16,8 @@ export interface DownloadFileOptions extends Taro.downloadFile.Option, TaroReque
 export interface UploadFileOptions extends Taro.uploadFile.Option, TaroRequestOption {
     /**上传进度回调*/
     onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+    /**数据类型*/
+    dataType?: 'json' | 'text';
 }
 export interface RequestInstanceCreateOptions {
     /**
@@ -124,6 +126,8 @@ export declare class RequestInstance {
         url: string;
         /**上传进度回调*/
         onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+        /**数据类型*/
+        dataType?: "json" | "text";
         filePath: string;
         name: string;
         formData?: TaroGeneral.IAnyObject;
@@ -174,9 +178,9 @@ export declare class RequestInstance {
     /**下载文件*/
     downloadFile: (options: DownloadFileOptions) => Promise<Taro.downloadFile.FileSuccessCallbackResult>;
     /**上传文件(返回 Taro.UploadTask.UploadTaskPromise ，可显示上传进度)*/
-    uploadFileTask: (options: UploadFileOptions) => Taro.UploadTask.UploadTaskPromise;
+    uploadFileTask: (options: Omit<UploadFileOptions, "dataType">) => Taro.UploadTask.UploadTaskPromise;
     /**上传文件*/
-    uploadFile: (options: UploadFileOptions) => Promise<Taro.uploadFile.SuccessCallbackResult>;
+    uploadFile: (options: UploadFileOptions) => Promise<string | Record<string, any> | Taro.uploadFile.SuccessCallbackResult>;
 }
 /** 请求*/
 export declare const request: RequestInstance;

package/esm/utils/request.js

@@ -316,12 +316,22 @@ class RequestInstance {
         if ('function' == typeof onProgress && uploadTask) uploadTask.onProgressUpdate(onProgress);
         return uploadTask;
     };
-    uploadFile = (options)=>new Promise((resolve, reject)=>{
+    uploadFile = (options)=>{
+        const { dataType = 'json', ...rest } = options;
+        return new Promise((resolve, reject)=>{
             this.uploadFileTask({
-                ...options,
+                ...rest,
                 success: (result)=>{
                     options?.success?.(result);
-                    resolve(result);
+                    if ('json' === dataType) {
+                        let resultData = result.data;
+                        try {
+                            resultData = JSON.parse(result.data);
+                        } catch (error) {
+                            console.log("\u4E0A\u4F20\u6587\u4EF6\u89E3\u6790\u6570\u636E\u5931\u8D25", error);
+                        }
+                        resolve(resultData);
+                    } else resolve(result);
                 },
                 fail: (result)=>{
                     options?.fail?.(result);
@@ -329,6 +339,7 @@ class RequestInstance {
                 }
             });
         });
+    };
 }
 const request_request = new RequestInstance();
 const utils_request = request_request;

package/lib/components/MainPage/index.js

@@ -45,7 +45,7 @@ var external_clsx_default = /*#__PURE__*/ __webpack_require__.n(external_clsx_na
 const external_react_namespaceObject = require("react");
 const FairysTaroMainPage = (props)=>{
     const { className: itemClassName, children, ...rest } = props;
-    const cls = (0, external_react_namespaceObject.useMemo)(()=>external_clsx_default()('fairys_taro-ui-main-page fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto', itemClassName), [
+    const cls = (0, external_react_namespaceObject.useMemo)(()=>external_clsx_default()('fairys_taro-ui-main-page fairystaro__text-red-100 fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto', itemClassName), [
         itemClassName
     ]);
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.View, {

package/lib/context/index.js

@@ -6,7 +6,7 @@ var __webpack_modules__ = {
     "./global.data.instance": function(module) {
         module.exports = require("./global.data.instance.js");
     },
-    "./global.setting.data.instance": function(module) {
+    "context/global.setting.data.instance": function(module) {
         module.exports = require("./global.setting.data.instance.js");
     },
     "./page.data.instance": function(module) {
@@ -83,7 +83,7 @@ var __webpack_exports__ = {};
         return _auth_data_instance__WEBPACK_IMPORTED_MODULE_3__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./global.setting.data.instance");
+    var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("context/global.setting.data.instance");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
     for(var __WEBPACK_IMPORT_KEY__ in _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__[key];

package/lib/context/page.data.instance.d.ts

@@ -1,5 +1,5 @@
 import { ProxyInstanceObjectBase } from '../utils/valtio/instance';
-export interface PageDataInstanceState extends Object {
+export interface PageDataInstanceState extends Record<string, any> {
     /**loading存储*/
     loading?: Record<string, boolean>;
     /**当前页*/

package/lib/context/page.info.data.instance.d.ts

@@ -1,5 +1,5 @@
 import { ProxyInstanceObjectBase } from '../utils/valtio/instance';
-export interface PageInfoDataInstanceState extends Object {
+export interface PageInfoDataInstanceState extends Record<string, any> {
     /**loading存储*/
     loading?: Record<string, boolean>;
     /**编辑表单数据*/
@@ -10,7 +10,6 @@ export interface PageInfoDataInstanceState extends Object {
     isInfoSuccess?: boolean;
     /**数据默认值不使用*/
     __defaultValue?: string;
-    [s: string]: any;
 }
 export declare class PageInfoDataInstance<T extends PageInfoDataInstanceState = PageInfoDataInstanceState> extends ProxyInstanceObjectBase<T> {
     notRefFields: string[];

package/lib/styles/index.css

@@ -120,11 +120,11 @@
 }
 
 .fairystaro__gap-_zkh1_0_dl_4rem_zhk2_ {
-  gap: .4rem;
+  gap: 6.4px;
 }
 
 .fairystaro__gap-2 {
-  gap: .5rem;
+  gap: 8px;
 }
 
 .fairystaro__overflow-auto {
@@ -136,7 +136,7 @@
 }
 
 .fairystaro__rounded-md {
-  border-radius: .375rem;
+  border-radius: 6px;
 }
 
 .fairystaro__border-solid {
@@ -148,29 +148,29 @@
 }
 
 .fairystaro__p-2 {
-  padding: .5rem;
+  padding: 8px;
 }
 
 .fairystaro__p-x-_zkh1_0_dl_4rem_zhk2_ {
-  padding-left: .4rem;
-  padding-right: .4rem;
+  padding-left: 6.4px;
+  padding-right: 6.4px;
 }
 
 .fairystaro__p-y-_zkh1_0_dl_4rem_zhk2_ {
-  padding-top: .4rem;
-  padding-bottom: .4rem;
+  padding-top: 6.4px;
+  padding-bottom: 6.4px;
 }
 
 .fairystaro__p-t-_zkh1_0_dl_15rem_zhk2_ {
-  padding-top: .15rem;
+  padding-top: 2.4px;
 }
 
 .fairystaro__text-_zkh1_0_dl_6rem_zhk2_ {
-  font-size: .6rem;
+  font-size: 9.6px;
 }
 
 .fairystaro__text-_zkh1_0_dl_8rem_zhk2_ {
-  font-size: .8rem;
+  font-size: 12.8px;
 }
 
 .fairystaro__text-color-_zkh1_blue_zhk2_ {
@@ -189,6 +189,11 @@
   color: red;
 }
 
+.fairystaro__text-red-100 {
+  --un-text-opacity: 1;
+  color: rgb(254 226 226 / var(--un-text-opacity));
+}
+
 .fairystaro__font-bold {
   font-weight: 700;
 }

package/lib/utils/request.d.ts

@@ -16,6 +16,8 @@ export interface DownloadFileOptions extends Taro.downloadFile.Option, TaroReque
 export interface UploadFileOptions extends Taro.uploadFile.Option, TaroRequestOption {
     /**上传进度回调*/
     onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+    /**数据类型*/
+    dataType?: 'json' | 'text';
 }
 export interface RequestInstanceCreateOptions {
     /**
@@ -124,6 +126,8 @@ export declare class RequestInstance {
         url: string;
         /**上传进度回调*/
         onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+        /**数据类型*/
+        dataType?: "json" | "text";
         filePath: string;
         name: string;
         formData?: TaroGeneral.IAnyObject;
@@ -174,9 +178,9 @@ export declare class RequestInstance {
     /**下载文件*/
     downloadFile: (options: DownloadFileOptions) => Promise<Taro.downloadFile.FileSuccessCallbackResult>;
     /**上传文件(返回 Taro.UploadTask.UploadTaskPromise ，可显示上传进度)*/
-    uploadFileTask: (options: UploadFileOptions) => Taro.UploadTask.UploadTaskPromise;
+    uploadFileTask: (options: Omit<UploadFileOptions, "dataType">) => Taro.UploadTask.UploadTaskPromise;
     /**上传文件*/
-    uploadFile: (options: UploadFileOptions) => Promise<Taro.uploadFile.SuccessCallbackResult>;
+    uploadFile: (options: UploadFileOptions) => Promise<string | Record<string, any> | Taro.uploadFile.SuccessCallbackResult>;
 }
 /** 请求*/
 export declare const request: RequestInstance;

package/lib/utils/request.js

@@ -356,12 +356,22 @@ class RequestInstance {
         if ('function' == typeof onProgress && uploadTask) uploadTask.onProgressUpdate(onProgress);
         return uploadTask;
     };
-    uploadFile = (options)=>new Promise((resolve, reject)=>{
+    uploadFile = (options)=>{
+        const { dataType = 'json', ...rest } = options;
+        return new Promise((resolve, reject)=>{
             this.uploadFileTask({
-                ...options,
+                ...rest,
                 success: (result)=>{
                     options?.success?.(result);
-                    resolve(result);
+                    if ('json' === dataType) {
+                        let resultData = result.data;
+                        try {
+                            resultData = JSON.parse(result.data);
+                        } catch (error) {
+                            console.log("\u4E0A\u4F20\u6587\u4EF6\u89E3\u6790\u6570\u636E\u5931\u8D25", error);
+                        }
+                        resolve(resultData);
+                    } else resolve(result);
                 },
                 fail: (result)=>{
                     options?.fail?.(result);
@@ -369,6 +379,7 @@ class RequestInstance {
                 }
             });
         });
+    };
 }
 const request_request = new RequestInstance();
 const utils_request = request_request;

package/package.json

@@ -3,7 +3,7 @@
   "author": "SunLxy <1011771396@qq.com>",
   "description": "框架组件库",
   "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",

package/src/components/MainPage/index.tsx

@@ -10,7 +10,7 @@ export const FairysTaroMainPage = (props: FairysTaroMainPageProps) => {
   const cls = useMemo(
     () =>
       clsx(
-        'fairys_taro-ui-main-page fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto',
+        'fairys_taro-ui-main-page fairystaro__text-red-100 fairystaro__box-border fairystaro__w-full fairystaro__h-full fairystaro__flex fairystaro__flex-col fairystaro__overflow-auto',
         itemClassName,
       ),
     [itemClassName],

package/src/context/page.data.instance.tsx

@@ -4,7 +4,7 @@ import { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import { globalSettingDataInstance } from './global.setting.data.instance';
 import Taro, { useDidShow } from '@tarojs/taro';
 
-export interface PageDataInstanceState extends Object {
+export interface PageDataInstanceState extends Record<string, any> {
   /**loading存储*/
   loading?: Record<string, boolean>;
   /**当前页*/

package/src/context/page.info.data.instance.tsx

@@ -7,7 +7,7 @@ import { globalSettingDataInstance } from './global.setting.data.instance';
 import { useDidShow } from '@tarojs/taro';
 import Taro from '@tarojs/taro';
 
-export interface PageInfoDataInstanceState extends Object {
+export interface PageInfoDataInstanceState extends Record<string, any> {
   /**loading存储*/
   loading?: Record<string, boolean>;
   /**编辑表单数据*/
@@ -18,7 +18,6 @@ export interface PageInfoDataInstanceState extends Object {
   isInfoSuccess?: boolean;
   /**数据默认值不使用*/
   __defaultValue?: string;
-  [s: string]: any;
 }
 
 export class PageInfoDataInstance<

package/src/utils/request.ts

@@ -33,6 +33,8 @@ export interface DownloadFileOptions extends Taro.downloadFile.Option, TaroReque
 export interface UploadFileOptions extends Taro.uploadFile.Option, TaroRequestOption {
   /**上传进度回调*/
   onProgress?: Taro.UploadTask.OnProgressUpdateCallback;
+  /**数据类型*/
+  dataType?: 'json' | 'text';
 }
 /**处理提示信息*/
 const requestResponseHandle = (
@@ -433,7 +435,7 @@ export class RequestInstance {
   };
 
   /**上传文件(返回 Taro.UploadTask.UploadTaskPromise ，可显示上传进度)*/
-  uploadFileTask = (options: UploadFileOptions) => {
+  uploadFileTask = (options: Omit<UploadFileOptions, 'dataType'>) => {
     const { isShowErrorMessage } = options;
     const formattedOptions = this.formatRequestOptions(options);
     if (!formattedOptions) {
@@ -476,13 +478,27 @@ export class RequestInstance {
     return uploadTask;
   };
   /**上传文件*/
-  uploadFile = (options: UploadFileOptions): Promise<Taro.uploadFile.SuccessCallbackResult> => {
+  uploadFile = (
+    options: UploadFileOptions,
+  ): Promise<string | Record<string, any> | Taro.uploadFile.SuccessCallbackResult> => {
+    const { dataType = 'json', ...rest } = options;
     return new Promise((resolve, reject) => {
       this.uploadFileTask({
-        ...options,
+        ...rest,
         success: (result) => {
           options?.success?.(result);
-          resolve(result);
+          if (dataType === 'json') {
+            let resultData = result.data;
+            try {
+              resultData = JSON.parse(result.data);
+            } catch (error) {
+              // 解析失败，保持原始数据
+              console.log('上传文件解析数据失败', error);
+            }
+            resolve(resultData);
+          } else {
+            resolve(result);
+          }
         },
         fail: (result) => {
           options?.fail?.(result);