wui-components-v2 1.0.13 → 1.0.14

package/components/privacy-popup/privacy-popup.vue

@@ -0,0 +1,178 @@
+<script lang="ts" setup>
+import { defineEmits, defineOptions, defineProps, onBeforeMount, ref, withDefaults } from 'vue'
+
+defineOptions({
+  name: 'PrivacyPopup',
+})
+
+withDefaults(defineProps<Props>(), {
+  title: '用户隐私保护提示',
+  desc: '感谢您使用本应用，您使用本应用的服务之前请仔细阅读并同意',
+  subDesc: '。当您点击同意并开始时用产品服务时，即表示你已理解并同意该条款内容，该条款将对您产生法律约束力。如您拒绝，将无法使用相应服务。',
+  protocol: '《用户隐私保护指引》',
+})
+
+const emit = defineEmits(['agree', 'disagree'])
+
+interface Props {
+  title?: string // 标题
+  desc?: string // 描述
+  subDesc?: string // 字描述
+  protocol?: string // 协议名称
+}
+
+const showPopup = ref<boolean>(false) // 是否展示popup
+
+const privacyResolves = ref(new Set()) // onNeedPrivacyAuthorization的reslove
+
+function privacyHandler(resolve: any) {
+  showPopup.value = true
+  privacyResolves.value.add(resolve)
+}
+
+onBeforeMount(() => {
+  // 注册监听
+  if (wx.onNeedPrivacyAuthorization) {
+    wx.onNeedPrivacyAuthorization((resolve: any) => {
+      if (typeof privacyHandler === 'function') {
+        privacyHandler(resolve)
+      }
+    })
+  }
+})
+
+/**
+ * 同意隐私协议
+ */
+function handleAgree() {
+  showPopup.value = false
+  privacyResolves.value.forEach((resolve: any) => {
+    resolve({
+      event: 'agree',
+      buttonId: 'agree-btn',
+    })
+  })
+  privacyResolves.value.clear()
+  emit('agree')
+}
+
+/**
+ * 拒绝隐私协议
+ */
+function handleDisagree() {
+  showPopup.value = false
+  privacyResolves.value.forEach((resolve: any) => {
+    resolve({
+      event: 'disagree',
+    })
+  })
+  privacyResolves.value.clear()
+}
+
+/**
+ * 打开隐私协议
+ */
+function openPrivacyContract() {
+  wx.openPrivacyContract({})
+}
+
+/**
+ * 弹出框关闭时清空
+ */
+function handleClose() {
+  privacyResolves.value.clear()
+}
+</script>
+
+<script lang="ts">
+export default {
+  options: {
+    virtualHost: true,
+    addGlobalClass: true,
+    styleIsolation: 'shared',
+  },
+}
+</script>
+
+<template>
+  <view>
+    <wd-popup v-model="showPopup" :close-on-click-modal="false" custom-class="wd-privacy-popup" @close="handleClose">
+      <view class="wd-privacy-popup__header">
+        <!-- 标题 -->
+        <view class="wd-picker__title">
+          {{ title }}
+        </view>
+      </view>
+      <view class="wd-privacy-popup__container">
+        <text>{{ desc }}</text>
+        <text class="wd-privacy-popup__container-protocol" @click="openPrivacyContract">
+          {{ protocol }}
+        </text>
+        <text>{{ subDesc }}</text>
+      </view>
+      <view class="wd-privacy-popup__footer">
+        <button id="disagree-btn" class="is-block is-round is-medium is-plain wd-privacy-popup__footer-disagree wd-button" @click="handleDisagree">
+          拒绝
+        </button>
+        <button
+          id="agree-btn"
+          class="wd-button is-block is-round is-medium is-primary wd-privacy-popup__footer-agree"
+          open-type="agreePrivacyAuthorization"
+          @agreeprivacyauthorization="handleAgree"
+        >
+          同意
+        </button>
+      </view>
+    </wd-popup>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+@import 'wot-design-uni/components/wd-button/index.scss';
+:deep(.wd-privacy-popup) {
+  width: 600rpx;
+  padding: 0 24rpx;
+  box-sizing: border-box;
+  border-radius: 32rpx;
+  overflow: hidden;
+}
+
+.wd-privacy-popup {
+  &__header {
+    width: 100%;
+    height: 128rpx;
+    line-height: 128rpx;
+    color: rgba(0, 0, 0, 0.85);
+    font-size: 30rpx;
+    padding: 0 12rpx;
+    box-sizing: border-box;
+  }
+
+  &__container {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 12rpx;
+    margin-bottom: 32rpx;
+
+    font-size: 28rpx;
+    line-height: 1.8;
+    color: #3e3e3e;
+    text-align: left;
+    font-weight: 550;
+    &-protocol {
+      color: #4d80f0;
+    }
+  }
+
+  &__footer {
+    display: flex;
+    justify-content: space-between;
+    padding-bottom: 36rpx;
+
+    button {
+      border: none;
+      outline: none;
+    }
+  }
+}
+</style>

package/components/{system-settings.vue → system-settings/system-settings.vue}

@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { computed, defineOptions } from 'vue'
-import { useManualTheme } from '../composables/useManualTheme'
-import type { LocaleOption, ThemeColorOption } from '../composables/useManualTheme'
+import { useManualTheme } from '../../composables/useManualTheme'
+import type { LocaleOption, ThemeColorOption } from '../../composables/useManualTheme'
+import demoBlock from '../demo-block/demo-block.vue'
 
 defineOptions({
   name: 'SystemSettings',

package/composables/types/user.ts

@@ -0,0 +1,5 @@
+export interface UserInfo {
+  id: string
+  name: string
+  nickName: string
+}

package/composables/useGlobalLoading.ts

@@ -0,0 +1,46 @@
+/*
+ * @Author: weisheng
+ * @Date: 2025-04-18 10:46:28
+ * @LastEditTime: 2025-06-14 21:24:21
+ * @LastEditors: weisheng
+ * @Description:
+ * @FilePath: /wot-demo/src/composables/useGlobalLoading.ts
+ * 记得注释
+ */
+import { defineStore } from 'pinia'
+import type { ToastOptions } from 'wot-design-uni/components/wd-toast/types'
+import { getCurrentPath } from '../utils/index'
+
+interface GlobalLoading {
+  loadingOptions: ToastOptions
+  currentPage: string
+}
+
+const defaultOptions: ToastOptions = {
+  show: false,
+}
+export const useGlobalLoading = defineStore('global-loading', {
+  state: (): GlobalLoading => ({
+    loadingOptions: defaultOptions,
+    currentPage: '',
+  }),
+  getters: {},
+  actions: {
+    // 加载提示
+    loading(option: ToastOptions | string) {
+      this.currentPage = getCurrentPath()
+      this.loadingOptions = CommonUtil.deepMerge({
+        iconName: 'loading',
+        duration: 0,
+        cover: true,
+        position: 'middle',
+        show: true,
+      }, typeof option === 'string' ? { msg: option } : option) as ToastOptions
+    },
+    // 关闭Toast
+    close() {
+      this.loadingOptions = defaultOptions
+      this.currentPage = ''
+    },
+  },
+})

package/composables/useGlobalMessage.ts

@@ -0,0 +1,54 @@
+import { defineStore } from 'pinia'
+import type { MessageOptions, MessageResult } from 'wot-design-uni/components/wd-message-box/types'
+
+import { getCurrentPath } from '../utils/index'
+
+export type GlobalMessageOptions = MessageOptions & {
+  success?: (res: MessageResult) => void
+  fail?: (res: MessageResult) => void
+}
+
+interface GlobalMessage {
+  messageOptions: GlobalMessageOptions | null
+  currentPage: string
+}
+
+export const useGlobalMessage = defineStore('global-message', {
+  state: (): GlobalMessage => ({
+    messageOptions: null,
+    currentPage: '',
+  }),
+  actions: {
+    show(option: GlobalMessageOptions | string) {
+      this.currentPage = getCurrentPath()
+      this.messageOptions = {
+        ...(CommonUtil.isString(option) ? { title: option } : option),
+        cancelButtonProps: {
+          round: false,
+        },
+        confirmButtonProps: {
+          round: false,
+        },
+      }
+    },
+    alert(option: GlobalMessageOptions | string) {
+      const messageOptions = CommonUtil.deepMerge({ type: 'alert' }, CommonUtil.isString(option) ? { title: option } : option) as MessageOptions
+      messageOptions.showCancelButton = false
+      this.show(messageOptions)
+    },
+    confirm(option: GlobalMessageOptions | string) {
+      const messageOptions = CommonUtil.deepMerge({ type: 'confirm' }, CommonUtil.isString(option) ? { title: option } : option) as MessageOptions
+      messageOptions.showCancelButton = true
+      this.show(messageOptions)
+    },
+    prompt(option: GlobalMessageOptions | string) {
+      const messageOptions = CommonUtil.deepMerge({ type: 'prompt' }, CommonUtil.isString(option) ? { title: option } : option) as MessageOptions
+      messageOptions.showCancelButton = true
+      this.show(messageOptions)
+    },
+    close() {
+      this.messageOptions = null
+      this.currentPage = ''
+    },
+  },
+})

package/composables/useGlobalToast.ts

@@ -0,0 +1,62 @@
+import { defineStore } from 'pinia'
+import type { ToastOptions } from 'wot-design-uni/components/wd-toast/types'
+import { getCurrentPath } from '../utils/index'
+
+interface GlobalToast {
+  toastOptions: ToastOptions
+  currentPage: string
+}
+
+const defaultOptions: ToastOptions = {
+  duration: 2000,
+  show: false,
+}
+export const useGlobalToast = defineStore('global-toast', {
+  state: (): GlobalToast => ({
+    toastOptions: defaultOptions,
+    currentPage: '',
+  }),
+  getters: {},
+  actions: {
+  // 打开Toast
+    show(option: ToastOptions | string) {
+      this.currentPage = getCurrentPath()
+      const options = CommonUtil.deepMerge(defaultOptions, typeof option === 'string' ? { msg: option } : option) as ToastOptions
+      this.toastOptions = CommonUtil.deepMerge(options, {
+        show: true,
+        position: options.position || 'middle',
+      }) as ToastOptions
+    },
+    // 成功提示
+    success(option: ToastOptions | string) {
+      this.show(CommonUtil.deepMerge({
+        iconName: 'success',
+        duration: 1500,
+      }, typeof option === 'string' ? { msg: option } : option) as ToastOptions)
+    },
+    // 关闭提示
+    error(option: ToastOptions | string) {
+      this.show(CommonUtil.deepMerge({
+        iconName: 'error',
+        direction: 'vertical',
+      }, typeof option === 'string' ? { msg: option } : option) as ToastOptions)
+    },
+    // 常规提示
+    info(option: ToastOptions | string) {
+      this.show(CommonUtil.deepMerge({
+        iconName: 'info',
+      }, typeof option === 'string' ? { msg: option } : option) as ToastOptions)
+    },
+    // 警告提示
+    warning(option: ToastOptions | string) {
+      this.show(CommonUtil.deepMerge({
+        iconName: 'warning',
+      }, typeof option === 'string' ? { msg: option } : option) as ToastOptions)
+    },
+    // 关闭Toast
+    close() {
+      this.toastOptions = defaultOptions
+      this.currentPage = ''
+    },
+  },
+})

package/composables/useTheme.ts

@@ -1,6 +1,6 @@
 import { computed, onBeforeMount, onUnmounted } from 'vue'
 import type { ThemeMode } from '../composables/types/theme'
-
+import { useThemeStore } from '../store/themeStore'
 /**
  * 简化版系统主题管理组合式API
  *

package/composables/useUser.ts

@@ -0,0 +1,21 @@
+import useUserStore from '../store/userStore'
+import type { UserInfo } from './types/user'
+
+export function useUser() {
+  const userStore = useUserStore()
+
+  function setUserInfo(userInfo: UserInfo) {
+    userStore.setUserInfo(userInfo)
+  }
+
+  return {
+    getUserInfo: (): UserInfo => {
+      return {
+        id: userStore.id,
+        name: userStore.name,
+        nickName: userStore.nickName,
+      }
+    },
+    setUserInfo,
+  }
+}

package/index.ts

@@ -1,8 +1,8 @@
 import type { App } from 'vue'
-import SystemSettings from './components/system-settings.vue'
+import SystemSettings from './components/system-settings/system-settings.vue'
 import { useLocale } from './composables/useLocale'
 import { useManualTheme } from './composables/useManualTheme'
-
+import { req } from './api/index'
 // 组件列表
 const coms: Array<{ name: string }> = [
   SystemSettings,
@@ -24,6 +24,7 @@ function install(app: App): void {
 export {
   useLocale,
   useManualTheme,
+  req, // 请求封装
 }
 
 export default install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",
@@ -11,5 +11,10 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+    "dayjs": "^1.11.13",
+    "jsencrypt": "^3.3.2",
+    "z-paging": "^2.8.5"
   }
 }

package/store/userStore.ts

@@ -0,0 +1,22 @@
+import { defineStore } from 'pinia'
+
+const useUserStore = defineStore('userInfo', {
+  state: () => ({
+    id: '',
+    name: '',
+    nickName: '',
+  }),
+  getters: {
+
+  },
+  actions: {
+    setUserInfo(userInfo: any) {
+      this.id = userInfo.id
+      this.name = userInfo.name
+      this.nickName = userInfo.nickName
+    },
+
+  },
+})
+
+export default useUserStore

package/utils/index.ts

@@ -0,0 +1,9 @@
+/**
+ * 获取当前页面路径
+ * @returns 当前页面路径
+ */
+export function getCurrentPath() {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  return currentPage.route || ''
+}

package/utils/rsaEncrypt.ts

@@ -0,0 +1,10 @@
+import { JSEncrypt } from 'jsencrypt'
+
+// 加密
+function rsaEncrypt(word: string, keyStr: string) {
+  const encrypt = new JSEncrypt()
+  encrypt.setPublicKey(keyStr)
+  return encrypt.encrypt(word)
+}
+
+export default rsaEncrypt

package/api/core/handlers.ts

@@ -1,106 +0,0 @@
-/*
- * @Author: weisheng
- * @Date: 2025-04-17 15:58:11
- * @LastEditTime: 2025-06-15 21:47:22
- * @LastEditors: weisheng
- * @Description: Alova response and error handlers
- * @FilePath: /wot-demo/src/api/core/handlers.ts
- */
-import type { Method } from 'alova'
-import router from '@/router'
-
-// Custom error class for API errors
-export class ApiError extends Error {
-  code: number
-  data?: any
-
-  constructor(message: string, code: number, data?: any) {
-    super(message)
-    this.name = 'ApiError'
-    this.code = code
-    this.data = data
-  }
-}
-
-// Define a type for the expected API response structure
-interface ApiResponse {
-  code: number
-  msg?: string
-  data?: any
-  success?: boolean
-  total?: number
-  more?: boolean
-}
-
-// 处理成功的响应
-export async function handleAlovaResponse(
-  response: UniApp.RequestSuccessCallbackResult | UniApp.UploadFileSuccessCallbackResult | UniApp.DownloadSuccessData,
-) {
-  const globalToast = useGlobalToast()
-  // Extract status code and data from UniApp response
-  const { statusCode, data } = response as UniNamespace.RequestSuccessCallbackResult
-
-  // 处理401/403错误（如果不是在handleAlovaResponse中处理的）
-  if ((statusCode === 401 || statusCode === 403)) {
-    // 如果是未授权错误，清除用户信息并跳转到登录页
-    globalToast.error({ msg: '登录已过期，请重新登录！', duration: 500 })
-    const timer = setTimeout(() => {
-      clearTimeout(timer)
-      router.replaceAll({ name: 'login' })
-    }, 500)
-
-    throw new ApiError('登录已过期，请重新登录！', statusCode, data)
-  }
-
-  // Handle HTTP error status codes
-  if (statusCode >= 400) {
-    globalToast.error(`请求失败，状态为: ${statusCode}`)
-    throw new ApiError(`请求失败，状态为: ${statusCode}`, statusCode, data)
-  }
-
-  // The data is already parsed by UniApp adapter
-  const json = data as ApiResponse
-  // Log response in development
-  if (import.meta.env.MODE === 'development') {
-    console.log('[Alova Response]', json)
-  }
-
-  // Return data for successful responses
-  return json
-}
-
-// 处理失败的响应
-export function handleAlovaError(error: any, method: Method) {
-  const globalToast = useGlobalToast()
-  // Log error in development
-  if (import.meta.env.MODE === 'development') {
-    console.error('[Alova Error]', error, method)
-  }
-
-  // 处理401/403错误（如果不是在handleAlovaResponse中处理的）
-  if (error instanceof ApiError && (error.code === 401 || error.code === 403)) {
-    // 如果是未授权错误，清除用户信息并跳转到登录页
-    globalToast.error({ msg: '登录已过期，请重新登录！', duration: 500 })
-    const timer = setTimeout(() => {
-      clearTimeout(timer)
-      router.replaceAll({ name: 'login' })
-    }, 500)
-    throw new ApiError('登录已过期，请重新登录！', error.code, error.data)
-  }
-
-  // Handle different types of errors
-  if (error.name === 'NetworkError') {
-    globalToast.error('网络错误，请检查您的网络连接')
-  }
-  else if (error.name === 'TimeoutError') {
-    globalToast.error('请求超时，请重试')
-  }
-  else if (error instanceof ApiError) {
-    globalToast.error(error.message || '请求失败')
-  }
-  else {
-    globalToast.error('发生意外错误')
-  }
-
-  throw error
-}

package/api/core/instance.ts

@@ -1,60 +0,0 @@
-/*
- * @Author: weisheng
- * @Date: 2025-04-10 18:02:00
- * @LastEditTime: 2025-06-15 22:41:52
- * @LastEditors: weisheng
- * @Description: Alova instance configuration
- * @FilePath: /wot-demo/src/api/core/instance.ts
- */
-import { createAlova } from 'alova'
-import vueHook from 'alova/vue'
-import AdapterUniapp from '@alova/adapter-uniapp'
-import { handleAlovaError, handleAlovaResponse } from './handlers'
-
-export const alovaInstance = createAlova({
-  baseURL: import.meta.env.VITE_API_BASE_URL || 'https://petstore3.swagger.io/api/v3',
-  ...AdapterUniapp(),
-  statesHook: vueHook,
-  beforeRequest: (method) => {
-    // 为POST/PUT/PATCH请求添加内容类型
-    if (['POST', 'PUT', 'PATCH'].includes(method.type)) {
-      method.config.headers['Content-Type'] = 'application/json'
-    }
-
-    // 添加时间戳以防止缓存GET请求
-    if (method.type === 'GET' && CommonUtil.isObj(method.config.params)) {
-      method.config.params._t = Date.now()
-    }
-
-    // 开发中的日志请求
-    if (import.meta.env.MODE === 'development') {
-      console.log(`[Alova Request] ${method.type} ${method.url}`, method.data || method.config.params)
-      console.log(`[API Base URL] ${import.meta.env.VITE_API_BASE_URL}`)
-      console.log(`[Environment] ${import.meta.env.VITE_ENV_NAME}`)
-    }
-  },
-
-  // 响应处理程序
-  responded: {
-    // 成功处理程序
-    onSuccess: handleAlovaResponse,
-
-    // 错误处理程序
-    onError: handleAlovaError,
-
-    // 完整处理程序-成功或错误后运行
-    onComplete: async () => {
-      // Any cleanup or logging can be done here
-    },
-  },
-
-  // 我们将在钩子中使用中间件
-  // createAlova选项中不直接支持中间件
-
-  // 默认请求超时（10秒）
-  timeout: 60000,
-  // 设置为null即可全局关闭全部请求缓存
-  cacheFor: null,
-})
-
-export default alovaInstance