create-bubbles 0.1.8 → 0.1.10

package/template-taro-vue-eslint/src/api/common/upload.ts

@@ -0,0 +1,53 @@
+import { isH5, uploadApiAffix } from '@/utils/env'
+import { alovaUploadRequest } from '@/utils/request'
+
+interface UploadBaseParams {
+  fileMd5: string
+  fileSize: number
+  filename: string
+  companyId: string
+  projectId: string
+  indexDbId: number
+}
+
+export interface H5UploadParams extends UploadBaseParams {
+  file: Blob
+}
+
+export interface MpUploadParams extends UploadBaseParams {
+  filePath: string
+}
+
+export type UploadParams = H5UploadParams | MpUploadParams
+
+export function uploadFile(data: any) {
+  if (isH5) {
+    // H5 端用 fetch 发送 FormData，绕过 Taro 适配器的序列化问题
+    return fetch(`/${uploadApiAffix}/files/uploadFileAppend`, {
+      method: 'POST',
+      body: data,
+      // headers: {
+      // 'Content-Type': 'multipart/form-data',
+      // authorization: 'Bearer 9a2d60a8-d9a6-40a3-9b13-4288225d855d',
+      // },
+    }).then(res => res.json())
+  }
+  else {
+    // 小程序端：用 Taro uploadFile 适配器
+    const { filePath, fileMd5, fileSize, filename, companyId, projectId, indexDbId } = data
+    return alovaUploadRequest.Post(`/files/uploadFileAppend`, {
+      name: 'file',
+      filePath,
+      fileMd5,
+      fileSize,
+      filename,
+      companyId,
+      projectId,
+      indexDbId,
+    }, {
+      requestType: 'upload',
+      fileName: filename,
+      meta: { isWrapped: false },
+    })
+  }
+}

package/template-taro-vue-eslint/src/app.config.ts

@@ -1,11 +1,19 @@
 export default defineAppConfig({
   pages: [
-    'pages/index/index'
+    'pages/index/index',
+  ],
+  subPackages: [
+    {
+      root: 'pages/example',
+      pages: [
+        'upload/index',
+      ],
+    },
   ],
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#fff',
     navigationBarTitleText: 'WeChat',
-    navigationBarTextStyle: 'black'
-  }
+    navigationBarTextStyle: 'black',
+  },
 })

package/template-taro-vue-eslint/src/app.ts

@@ -1,12 +1,12 @@
 import { createApp } from 'vue'
+
 import { setupStore } from './store'
 import '@nutui/touch-emulator'
 import 'uno.css'
-import './app.css'
+import '@/styles/index.css'
 
 const App = createApp({
-  onShow(_options) {
-  },
+  onShow(_options) {},
 })
 
 setupStore(App)

package/template-taro-vue-eslint/src/pages/example/upload/index.config.ts

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '首页',
+})

package/template-taro-vue-eslint/src/pages/example/upload/index.module.scss

@@ -0,0 +1,4 @@
+.red {
+  color: #fff;
+  background-color: red;
+}

package/template-taro-vue-eslint/src/pages/example/upload/index.vue

@@ -0,0 +1,71 @@
+<script lang="ts" setup>
+import Taro from '@tarojs/taro'
+import { uploadFile } from '@/api/common/upload'
+import { canvasToFile, file2Md5 } from '@/utils'
+import { isH5 } from '@/utils/env'
+
+async function handleConfirm(canvas: any, data: string) {
+  if (isH5) {
+    const file = await canvasToFile(canvas)
+    const fileMd5 = await file2Md5(file)
+    const data = new FormData()
+    data.append('file', file)
+    data.append('companyId', 'c35bd5e0d5834eccb1cfbf4dd538eb61')
+    data.append('projectId', 'eb42a2b7e680a4124e78951ccf7f1268')
+    data.append('indexDbId', '0')
+    data.append('fileMd5', fileMd5)
+    data.append('fileSize', `${file.size}`)
+    data.append('filename', file.name)
+    try {
+      const res = await uploadFile(data)
+      if (res.code === 200) {
+        // console.log('💦res.data', res.data)
+      }
+      else {
+        Taro.showToast({
+          title: res.message,
+        })
+      }
+    }
+    catch {
+      Taro.showToast({
+        title: '服务异常',
+      })
+    }
+  }
+  else {
+    // 小程序端：用 Taro uploadFile 适配器
+    Taro.getFileSystemManager().getFileInfo({
+      filePath: data,
+      success: async (res) => {
+        const params = {
+          filePath: data,
+          companyId: 'c35bd5e0d5834eccb1cfbf4dd538eb61',
+          projectId: 'eb42a2b7e680a4124e78951ccf7f1268',
+          indexDbId: '0',
+          fileMd5: res.digest,
+          fileSize: res.size,
+          filename: `${res.digest}.png`,
+        }
+        const uploadResStr = await uploadFile(params)
+        const uploadRes = JSON.parse(uploadResStr)
+        if (uploadRes.code === 200) {
+          // console.log('💦uploadRes.data', uploadRes.data)
+        }
+        else {
+          Taro.showToast({
+            title: uploadRes.message,
+          })
+        }
+      },
+    })
+  }
+}
+</script>
+
+<template>
+  <div class="text-red">
+    1112
+    <nut-signature @confirm="handleConfirm" />
+  </div>
+</template>

package/template-taro-vue-eslint/src/pages/index/index.vue

@@ -1,18 +1,71 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
-import styles from './index.module.scss'
+import Taro from '@tarojs/taro'
+import { uploadFile } from '@/api/common/upload'
+import { canvasToFile, file2Md5 } from '@/utils'
+import { isH5 } from '@/utils/env'
 
-const msg = ref('Hello world')
+async function handleConfirm(canvas: any, data: string) {
+  if (isH5) {
+    const file = await canvasToFile(canvas)
+    const fileMd5 = await file2Md5(file)
+    const data = new FormData()
+    data.append('file', file)
+    data.append('companyId', 'c35bd5e0d5834eccb1cfbf4dd538eb61')
+    data.append('projectId', 'eb42a2b7e680a4124e78951ccf7f1268')
+    data.append('indexDbId', '0')
+    data.append('fileMd5', fileMd5)
+    data.append('fileSize', `${file.size}`)
+    data.append('filename', file.name)
+    try {
+      const res = await uploadFile(data)
+      if (res.code === 200) {
+        // console.log('💦res.data', res.data)
+      }
+      else {
+        Taro.showToast({
+          title: res.message,
+        })
+      }
+    }
+    catch {
+      Taro.showToast({
+        title: '服务异常',
+      })
+    }
+  }
+  else {
+    // 小程序端：用 Taro uploadFile 适配器
+    Taro.getFileSystemManager().getFileInfo({
+      filePath: data,
+      success: async (res) => {
+        const params = {
+          filePath: data,
+          companyId: 'c35bd5e0d5834eccb1cfbf4dd538eb61',
+          projectId: 'eb42a2b7e680a4124e78951ccf7f1268',
+          indexDbId: '0',
+          fileMd5: res.digest,
+          fileSize: res.size,
+          filename: `${res.digest}.png`,
+        }
+        const uploadResStr = await uploadFile(params)
+        const uploadRes = JSON.parse(uploadResStr)
+        if (uploadRes.code === 200) {
+          // console.log('💦uploadRes.data', uploadRes.data)
+        }
+        else {
+          Taro.showToast({
+            title: uploadRes.message,
+          })
+        }
+      },
+    })
+  }
+}
 </script>
 
 <template>
-  <div class="index">
-    <div :class="styles.red">
-      {{ msg }}
-    </div>
-    <div class="flex-1 text-green">
-      222
-    </div>
-    <nut-button>111</nut-button>
+  <div class="text-red">
+    1112
+    <nut-signature @confirm="handleConfirm" />
   </div>
 </template>

package/template-taro-vue-eslint/src/styles/index.css

@@ -0,0 +1 @@
+@import './nut-theme.css';

package/template-taro-vue-eslint/src/styles/nut-theme.css

@@ -0,0 +1,4 @@
+:root,
+page {
+  --nut-primary-color: #1677ff;
+}

package/template-taro-vue-eslint/src/utils/env.ts

@@ -1,6 +1,13 @@
-import process from 'node:process'
+const apiUrl = process.env.TARO_APP_API_URL
+const apiAffix = process.env.TARO_APP_API_AFFIX
+const uploadApiAffix = process.env.TARO_APP_UPLOAD_API_AFFIX
+const weappId = process.env.TARO_APP_ID
+const isH5 = process.env.TARO_ENV === 'h5'
 
-export const envVar = {
-  apiApi: process.env.TARO_API_URL,
-  weappId: process.env.TARO_WEAPP_ID,
+export {
+  apiAffix,
+  apiUrl,
+  isH5,
+  uploadApiAffix,
+  weappId,
 }

package/template-taro-vue-eslint/src/utils/index.ts

@@ -0,0 +1,40 @@
+import Taro from '@tarojs/taro'
+import SparkMD5 from 'spark-md5'
+
+/**
+ * H5 端：canvas 元素转 File
+ */
+export function canvasToFile(canvas, filename = 'image.png', mimeType = 'image/png', quality = 1): Promise<File> {
+  return new Promise((resolve) => {
+    canvas.toBlob((blob) => {
+      const file = new File([blob], filename, { type: mimeType })
+      resolve(file)
+    }, mimeType, quality)
+  })
+}
+
+/**
+ * 获取本地文件信息（小程序端）
+ */
+export function getFileInfo(filePath: string): Promise<Taro.getFileInfo.SuccessCallbackResult> {
+  return new Promise((resolve, reject) => {
+    Taro.getFileInfo({
+      filePath,
+      success: resolve,
+      fail: reject,
+    })
+  })
+}
+
+export function file2Md5(file): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = (e: ProgressEvent<FileReader>) => {
+      const spark = new SparkMD5.ArrayBuffer()
+      spark.append(e.target?.result)
+      resolve(spark.end())
+    }
+    reader.onerror = reject
+    reader.readAsArrayBuffer(file)
+  })
+}

package/template-taro-vue-eslint/src/utils/request/core/index.ts

@@ -134,6 +134,7 @@ export function createInstance<
         const shouldTransform = getMetaFlag(meta, 'isTransformResponse', config.isTransformResponse ?? true)
         const showSuccess = getMetaFlag(meta, 'isShowSuccessMessage', config.isShowSuccessMessage ?? false)
         const showError = getMetaFlag(meta, 'isShowErrorMessage', config.isShowErrorMessage ?? true)
+        const isWrapped = getMetaFlag(meta, 'isWrapped', config.isWrapped ?? true)
 
         if (!shouldTransform)
           return response
@@ -154,7 +155,7 @@ export function createInstance<
           return Promise.reject(response)
         }
 
-        if (!config.isWrapped) {
+        if (!isWrapped || (isWrapped === undefined || !config.isWrapped)) {
           if (showSuccess)
             config.successMessageFunc?.(config.successDefaultMessage ?? '操作成功')
           return data

package/template-taro-vue-eslint/src/utils/request/index.ts

@@ -2,7 +2,7 @@ import type { TaroConfig } from '@alova/adapter-taro'
 import type { VueHookExportType } from 'alova/vue'
 import AdapterTaroVue from '@alova/adapter-taro/vue'
 import Taro from '@tarojs/taro'
-import { envVar } from '@/utils/env'
+import { apiAffix, apiUrl, isH5, uploadApiAffix } from '@/utils/env'
 import { createInstance } from './core'
 
 type TaroResponse
@@ -20,7 +20,7 @@ const alovaRequest = createInstance<
   TaroResponseHeader,
   VueHookExportType<unknown>
 >({
-  baseUrl: `${envVar.apiApi}`,
+  baseUrl: isH5 ? `/${apiAffix}` : `${apiUrl}/${apiAffix}`,
   statusMap: { success: 200, unAuthorized: 401 },
   codeMap: { success: [200] },
   responseDataKey: 'data',
@@ -42,3 +42,32 @@ const alovaRequest = createInstance<
 })
 
 export default alovaRequest
+
+const alovaUploadRequest = createInstance<
+  TaroConfig,
+  TaroResponse,
+  TaroResponseHeader,
+  VueHookExportType<unknown>
+>({
+  baseUrl: isH5 ? `/${uploadApiAffix}` : `${apiUrl}/${uploadApiAffix}`,
+  statusMap: { success: 200, unAuthorized: 401 },
+  codeMap: { success: [200] },
+  responseDataKey: 'data',
+  responseMessageKey: 'msg',
+  commonHeaders: {},
+  successMessageFunc: (msg) => {
+    Taro.showToast({ title: msg })
+  },
+  errorMessageFunc: (msg) => {
+    Taro.showToast({ title: msg, icon: 'error' })
+  },
+  unAuthorizedResponseFunc: () => {
+    Taro.showToast({ title: '登录过期或未登录' })
+    Taro.navigateTo({ url: '/pages/login/index' })
+  },
+  statesHook: taroAdapter.statesHook,
+  requestAdapter: taroAdapter.requestAdapter,
+  storageAdapter: taroAdapter.storageAdapter,
+})
+
+export { alovaUploadRequest }

package/template-taro-vue-eslint/types/components.d.ts

@@ -7,6 +7,6 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
-    NutButton: typeof import('@nutui/nutui-taro')['Button']
+    NutSignature: typeof import('@nutui/nutui-taro')['Signature']
   }
 }

package/template-taro-vue-eslint/unocss.config.ts

@@ -19,7 +19,7 @@ export default {
     ),
     // attributify autocomplete
     presetWeappAttributify(),
-    presetUno(),
+    presetUno({ preflight: false }),
   ],
   shortcuts: [
     {

package/template-taro-vue-eslint/key/private.wxac3f99d8814754aa.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA8F9CtEfBvL1L6KpXvIbXVPktUpBQWrM6336lYy4RI7LYeQqu
-6FTuc9Xj/efpLHk25bO2B0/cbnm+fOsKqAOF/7q9KPuLVVNkCMlDrte62wuHXuU7
-c3mKNjZ1LfUCeM1oVi4w1rYYm9m9D1trHvvCSc+UJvjQeE1Zbd9ExH12eCllkU0n
-ARUAP2XoRNeXEShJiQ8EHc89Pko1v1hc3h6eOh0y4lBfqiasr/yj2Bkuc3WDSu3J
-iUHFeKBIkaH7dAG8m86SlmS4YU8av8XXQGa67iyEt2QpC+GWola4mFNCQ3hdjPqb
-uq/MQCrg4XBUYNVt+qbr8+jKymYo12j9R5AQ1QIDAQABAoIBAQCK1LpWHcvMExkw
-vJIIFWlxbqm6shd3C2XJiABGFGlZ0QYugvkav1MqHDOehr+qLCiE6xMLjhimxjI7
-PBXfjIlsdpKihQaotY1ldbld1sPZmAML0CJSQ7SMM0/ix0wyMZE9lVgn6uyzt0L3
-B7oLHyXMM9RB3huqICKyzu2M/1nZdBDktVtAX13oVcbnlsQ+2JIhrG/YoP12lPbt
-vP8DjAOuQODW+DKI20Etc+jfizNQ6XBuMtcNQM3/hHU2hGn8l7dZDVmnTaTgVfie
-HCtneTfiptiA4M/CD6efkTfxRkiVIdYEfgHOKuXYaPD7ySd1N6w87dJFcN6uU3bV
-LZkSBFhRAoGBAPhhIlgJKbMjeTmoyZJRMFd4Wm94RWJm9OlimiFRxHH76Rs1Add+
-7Gle9yoU9GKVp5B1hj1fdkQ0Su6zzi4+nzMHuVVLJDtQLtq3WE2C6oJoGeAVDIys
-lVF1L5JDp2KLzlpzvJhqkf/WSerUHtKKugC7QUwIMlvR7+hJFfEijTLDAoGBAPe/
-O+EHKL/lVZIWNq4P4HUKFk/YJgQgYt5Y+7fn7qulYPqmgm+ZDLFBBp+IFk3F25L2
-D+NhcYFtVCfhR3LYeWynZNZamHZ6zT7zRG9I9wR5oxxDYNTdsTg5L4oVmK5Stslo
-C/MpSn1Q6tNyWIvGlbH8DH3JAoFDfd+KXy3M/8SHAoGAPp3uVJdqxdiplRmyR4rk
-Twjuc6+0fkxKbhQHm2LLzZieeddxMWy0GRRx51AFFF16MvcN8qcAX813HpqB3jK3
-W9wUoyYgajuatFUIk/HvQRURgOaNlWFk+3Y5mfwoVLW+PhtzblFfoUnatLLpWlbS
-8aBDo/FlELTqcHsMZxA43JUCgYEA4SA8aFqaE+5w2MQowfkZbSFSbxGqUfuf/A5+
-BnrSrdUlD/947bH1D6lYPGVsZxXRVnUUsPmeLA9N9sNGqry9cheWkRZYDum+UmK6
-oCl8let2ZbtwZV5iqQWGBoNjb50oDlLm8PpnfwKlsKjqf3FgHBE+xJqBFTdgTV6u
-6K6tCEcCgYEAioTQ/Mq23w25O0cRo4c+m1YsrwMOjo+lPXfpTlO2DZVSVqkAEuf1
-zMD33nQwIjimnzjhOOQdOi95ky98p+3cDA/QOZC8XsGp9UUqxM8d7gdgkhj/7iQ1
-MQFlqx4BiY0sk7Aszx9EfPHS5vvntwyqv9+M5iOw4mdj10OdMovxczc=
------END RSA PRIVATE KEY-----

package/template-taro-vue-eslint/src/app.css

@@ -1 +0,0 @@
-