wui-components-v2 1.1.68 → 1.1.70

package/api/core/index.ts

@@ -1,74 +1,74 @@
-/**
- * 封装uni.request为Promise形式
- * @param {object} options 请求配置
- * @param {string} options.url 请求地址
- * @param {string} [options.method] 请求方法
- * @param {object} [options.data] 请求数据
- * @param {object} [options.header] 请求头
- * @param {number} [options.timeout] 超时时间(毫秒)
- * @returns {Promise} 返回Promise对象
- */
-interface RequestOptions {
-  url: string
-  method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD' | 'OPTIONS' | 'TRACE' | 'CONNECT'
-  data?: any
-  header?: any
-  timeout?: number
-}
-
-function request(options: RequestOptions): Promise<any> {
-  const baseUrl = uni.getStorageSync('BASE_URL') || '/'
-  const hydrocarbonProgramToken = uni.getStorageSync('HYDROCARBON_PROGRAM_TOKEN') || ''
-  const token = uni.getStorageSync('TOKEN') || uni.getStorageSync('token') || ''
-  const hydrocarbonClient = uni.getStorageSync('HYDROCARBON_CLIENT') || ''
-  const applicationToken = uni.getStorageSync('HYDROCARBON_APPLICATION_TOKEN') || ''
-  return new Promise((resolve, reject) => {
-    // 设置默认值
-    const defaultOptions = {
-      method: 'GET' as const,
-      data: {},
-      header: {
-        'content-type': 'application/x-www-form-urlencoded',
-        'hydrocarbon-program-token': hydrocarbonProgramToken, // 项目code
-        'hydrocarbon-token': token, // 登录token
-        'hydrocarbon-client': hydrocarbonClient, // 端类型
-        'hydrocarbon-application-token': applicationToken,
-        // #ifdef APP-PLUS
-        'hydrocarbon-app-version': '1.0.0',
-        // #endif
-        ...options.header,
-      },
-      timeout: options.timeout || 60000,
-    }
-
-    // 合并配置
-    const requestOptions = {
-      ...defaultOptions,
-      ...options,
-      url: baseUrl + options.url,
-    }
-
-    uni.request({
-      ...requestOptions,
-      success: (res: any) => {
-        // 可以根据实际业务需求调整这里的判断条件
-        if (res.statusCode >= 200 && res.statusCode < 300) {
-          if (res.data.status === 'error') {
-            uni.showToast({ title: res.data.message, icon: 'none' })
-            uni.removeStorageSync('token')
-            reject(res)
-            return
-          }
-          resolve(res.data)
-        } else {
-          reject(res)
-        }
-      },
-      fail: (err: any) => {
-        reject(err)
-      },
-    })
-  })
-}
-
-export default request
+/**
+ * 封装uni.request为Promise形式
+ * @param {object} options 请求配置
+ * @param {string} options.url 请求地址
+ * @param {string} [options.method] 请求方法
+ * @param {object} [options.data] 请求数据
+ * @param {object} [options.header] 请求头
+ * @param {number} [options.timeout] 超时时间(毫秒)
+ * @returns {Promise} 返回Promise对象
+ */
+interface RequestOptions {
+  url: string
+  method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD' | 'OPTIONS' | 'TRACE' | 'CONNECT'
+  data?: any
+  header?: any
+  timeout?: number
+}
+
+function request(options: RequestOptions): Promise<any> {
+  const baseUrl = uni.getStorageSync('BASE_URL') || '/'
+  const hydrocarbonProgramToken = uni.getStorageSync('HYDROCARBON_PROGRAM_TOKEN') || ''
+  const token = uni.getStorageSync('TOKEN') || uni.getStorageSync('token') || ''
+  const hydrocarbonClient = uni.getStorageSync('HYDROCARBON_CLIENT') || ''
+  const applicationToken = uni.getStorageSync('HYDROCARBON_APPLICATION_TOKEN') || ''
+  return new Promise((resolve, reject) => {
+    // 设置默认值
+    const defaultOptions = {
+      method: 'GET' as const,
+      data: {},
+      header: {
+        'content-type': 'application/x-www-form-urlencoded',
+        'hydrocarbon-program-token': hydrocarbonProgramToken, // 项目code
+        'hydrocarbon-token': token, // 登录token
+        'hydrocarbon-client': hydrocarbonClient, // 端类型
+        'hydrocarbon-application-token': applicationToken,
+        // #ifdef APP-PLUS
+        'hydrocarbon-app-version': '1.0.0',
+        // #endif
+        ...options.header,
+      },
+      timeout: options.timeout || 60000,
+    }
+
+    // 合并配置
+    const requestOptions = {
+      ...defaultOptions,
+      ...options,
+      url: baseUrl + options.url,
+    }
+
+    uni.request({
+      ...requestOptions,
+      success: (res: any) => {
+        // 可以根据实际业务需求调整这里的判断条件
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          if (res.data.status === 'error') {
+            uni.showToast({ title: res.data.message, icon: 'none' })
+            uni.removeStorageSync('token')
+            reject(res)
+            return
+          }
+          resolve(res.data)
+        } else {
+          reject(res)
+        }
+      },
+      fail: (err: any) => {
+        reject(err)
+      },
+    })
+  })
+}
+
+export default request

package/api/menu.ts

@@ -1,45 +1,45 @@
-import req from './core/index'
-// 获取菜单
-export function menu() {
-  return req({
-    url: `/v3/menu/blocks?l2MenuId=&blockId=`,
-  })
-}
-
-// fastmenu 请求缓存
-let fastmenuPromise: Promise<any> | null = null
-let fastmenuCacheTime = 0
-const CACHE_DURATION = 3000 // 缓存有效期 5 秒
-
-// 获取配置菜单（带请求防抖和缓存）
-export function fastmenu() {
-  const now = Date.now()
-
-  // 如果请求正在进行中，返回同一个 Promise
-  if (fastmenuPromise) {
-    return fastmenuPromise
-  }
-
-  // 如果缓存还在有效期内，重新发起请求但仍然共享 Promise
-  // （如果需要真正的缓存数据，可以在这里添加数据缓存逻辑）
-
-  fastmenuPromise = req({
-    url: `/v3/menu/fast-menu`,
-  }).finally(() => {
-    // 请求完成后，清除 Promise 引用（保持缓存时间窗口）
-    setTimeout(() => {
-      fastmenuPromise = null
-      fastmenuCacheTime = 0
-    }, CACHE_DURATION)
-  })
-
-  fastmenuCacheTime = now
-  return fastmenuPromise
-}
-
-// 菜单内容统计
-export function menuCount(sourceId: string) {
-  return req({
-    url: `/v3/ltmpl/data/count?sourceId=${sourceId}`,
-  })
-}
+import req from './core/index'
+// 获取菜单
+export function menu() {
+  return req({
+    url: `/v3/menu/blocks?l2MenuId=&blockId=`,
+  })
+}
+
+// fastmenu 请求缓存
+let fastmenuPromise: Promise<any> | null = null
+let fastmenuCacheTime = 0
+const CACHE_DURATION = 3000 // 缓存有效期 5 秒
+
+// 获取配置菜单（带请求防抖和缓存）
+export function fastmenu() {
+  const now = Date.now()
+
+  // 如果请求正在进行中，返回同一个 Promise
+  if (fastmenuPromise) {
+    return fastmenuPromise
+  }
+
+  // 如果缓存还在有效期内，重新发起请求但仍然共享 Promise
+  // （如果需要真正的缓存数据，可以在这里添加数据缓存逻辑）
+
+  fastmenuPromise = req({
+    url: `/v3/menu/fast-menu`,
+  }).finally(() => {
+    // 请求完成后，清除 Promise 引用（保持缓存时间窗口）
+    setTimeout(() => {
+      fastmenuPromise = null
+      fastmenuCacheTime = 0
+    }, CACHE_DURATION)
+  })
+
+  fastmenuCacheTime = now
+  return fastmenuPromise
+}
+
+// 菜单内容统计
+export function menuCount(sourceId: string) {
+  return req({
+    url: `/v3/ltmpl/data/count?sourceId=${sourceId}`,
+  })
+}

package/api/page.ts

@@ -1,114 +1,114 @@
-import type { PageData } from '../type'
-import req from './core/index'
-
-interface PageConfig {
-  configName: string
-  ltmplConfig: any
-  sourceId: string
-  sourceName: string
-}
-// 列表页面配置
-export async function pageConfig(sourceId: string): Promise<PageConfig> {
-  const res = await req({url: `/v3/ltmpl/config?sourceId=${sourceId}`})||{}
-  const {ltmplConfig={}}=res
-  const {extDisplayConfig={}}=ltmplConfig
-  return {  //配置结构调整
-    ...res,
-    ltmplConfig:{
-      ...ltmplConfig,
-      ...extDisplayConfig
-    }
-  }
-}
-
-// 获取列表页面数据key
-export function pageKey(sourceId: string, mainCode: string = '', query: string = '') {
-  return req({
-    url: `/v3/ltmpl/query/key?sourceId=${sourceId}&mainCode=${mainCode}&menuId=${sourceId}&${query}`,
-  })
-}
-
-// 获取列表页面数据
-export function listData(queryKey: string, pageNo: number, pageSize: number): Promise<PageData> {
-  return req({
-    url: `/v3/ltmpl/query/data?queryKey=${queryKey}&pageNo=${pageNo}&pageSize=${pageSize}`,
-  })
-}
-
-// 获取新增面配置
-export function addPageConfig(sourceId: string) {
-  return req({
-    url: `/v3/add-dtmpl/config?sourceId=${sourceId}`,
-  })
-}
-// 获取编辑页面配置
-export function editPageConfig(sourceId: string, mianCode: string) {
-  return req({
-    url: `/v3/dtmpl/config?sourceId=${sourceId}&code=${mianCode}`,
-  })
-}
-
-//
-// 新增/编辑页面提交保存
-export function editPageDataSave(sourceId: string, id: string = '', data: any, mainCode: string = '', actionId: string = '') {
-  return req({
-    url: `/v3/dtmpl/data`,
-    method: 'POST',
-    data: {
-      sourceId,
-      mainCode,
-      actionId,
-      唯一编码: id,
-      ...data,
-    },
-  })
-}
-// 获取枚举
-export function enums(mstrucIds: string) {
-  return req({
-    url: `/v3/enum`,
-    method: 'POST',
-    data: mstrucIds,
-  })
-}
-// 获取勾选数据
-export function selectDatas(sourceId: string, codes: string) {
-  return req({
-    url: `/v3/field-group/data/selected?sourceId=${sourceId}&${codes}`,
-  })
-}
-
-// 详情页面详细配置
-export function detailPageConfig(sourceId: string) {
-  return req({
-    url: `/v3/view-dtmpl/config?sourceId=${sourceId}`,
-  })
-}
-
-// 详情页面数据
-export function detailPageData(sourceId: string, code: string) {
-  return req({
-    url: `/v3/view-dtmpl/data?sourceId=${sourceId}&code=${code}`,
-  })
-}
-
-// action 按钮提交数据
-export function actionDataSave(sourceId: string, codes: string = '', data: any) {
-  return req({
-    url: `/v3/action`,
-    method: 'POST',
-    data: {
-      sourceId,
-      codes,
-      ...data,
-    },
-  })
-}
-
-// 删除
-export function deleteData(sourceId: string, code: string) {
-  return req({
-    url: `/v3/ltmpl/data?sourceId=${sourceId}&codes=${code}`,
-    method: 'DELETE',
-  })
-}
+import type { PageData } from '../type'
+import req from './core/index'
+
+interface PageConfig {
+  configName: string
+  ltmplConfig: any
+  sourceId: string
+  sourceName: string
+}
+// 列表页面配置
+export async function pageConfig(sourceId: string): Promise<PageConfig> {
+  const res = await req({url: `/v3/ltmpl/config?sourceId=${sourceId}`})||{}
+  const {ltmplConfig={}}=res
+  const {extDisplayConfig={}}=ltmplConfig
+  return {  //配置结构调整
+    ...res,
+    ltmplConfig:{
+      ...ltmplConfig,
+      ...extDisplayConfig
+    }
+  }
+}
+
+// 获取列表页面数据key
+export function pageKey(sourceId: string, mainCode: string = '', query: string = '') {
+  return req({
+    url: `/v3/ltmpl/query/key?sourceId=${sourceId}&mainCode=${mainCode}&menuId=${sourceId}&${query}`,
+  })
+}
+
+// 获取列表页面数据
+export function listData(queryKey: string, pageNo: number, pageSize: number): Promise<PageData> {
+  return req({
+    url: `/v3/ltmpl/query/data?queryKey=${queryKey}&pageNo=${pageNo}&pageSize=${pageSize}`,
+  })
+}
+
+// 获取新增面配置
+export function addPageConfig(sourceId: string) {
+  return req({
+    url: `/v3/add-dtmpl/config?sourceId=${sourceId}`,
+  })
+}
+// 获取编辑页面配置
+export function editPageConfig(sourceId: string, mianCode: string) {
+  return req({
+    url: `/v3/dtmpl/config?sourceId=${sourceId}&code=${mianCode}`,
+  })
+}
+
+//
+// 新增/编辑页面提交保存
+export function editPageDataSave(sourceId: string, id: string = '', data: any, mainCode: string = '', actionId: string = '') {
+  return req({
+    url: `/v3/dtmpl/data`,
+    method: 'POST',
+    data: {
+      sourceId,
+      mainCode,
+      actionId,
+      唯一编码: id,
+      ...data,
+    },
+  })
+}
+// 获取枚举
+export function enums(mstrucIds: string) {
+  return req({
+    url: `/v3/enum`,
+    method: 'POST',
+    data: mstrucIds,
+  })
+}
+// 获取勾选数据
+export function selectDatas(sourceId: string, codes: string) {
+  return req({
+    url: `/v3/field-group/data/selected?sourceId=${sourceId}&${codes}`,
+  })
+}
+
+// 详情页面详细配置
+export function detailPageConfig(sourceId: string) {
+  return req({
+    url: `/v3/view-dtmpl/config?sourceId=${sourceId}`,
+  })
+}
+
+// 详情页面数据
+export function detailPageData(sourceId: string, code: string) {
+  return req({
+    url: `/v3/view-dtmpl/data?sourceId=${sourceId}&code=${code}`,
+  })
+}
+
+// action 按钮提交数据
+export function actionDataSave(sourceId: string, codes: string = '', data: any) {
+  return req({
+    url: `/v3/action`,
+    method: 'POST',
+    data: {
+      sourceId,
+      codes,
+      ...data,
+    },
+  })
+}
+
+// 删除
+export function deleteData(sourceId: string, code: string) {
+  return req({
+    url: `/v3/ltmpl/data?sourceId=${sourceId}&codes=${code}`,
+    method: 'DELETE',
+  })
+}

package/api/sys.ts

@@ -1,12 +1,12 @@
-import req from './core/index'
-// 获取语言包
-export function language(language: string): Promise<any> {
-  return req({
-    url: `/v3/multilingual?language=${language}`,
-  })
-}
-export function getThemeConfig(): Promise<any> {
-  return req({
-    url: `/v3/theme-config`,
-  })
-}
+import req from './core/index'
+// 获取语言包
+export function language(language: string): Promise<any> {
+  return req({
+    url: `/v3/multilingual?language=${language}`,
+  })
+}
+export function getThemeConfig(): Promise<any> {
+  return req({
+    url: `/v3/theme-config`,
+  })
+}

package/components/action-popup/action-popup.vue

@@ -8,15 +8,15 @@ import { useGlobalToast } from '../../composables/useGlobalToast'
 defineOptions({
   name: 'ActionPopup',
 })
-const props = defineProps<
-  {
-    fieldGroup?: Groups
-    show: boolean
-    code: string
-    zpaging: any
-    enumColumn?: Enums
-  }
->()
+const props = defineProps<{
+  fieldGroup?: Groups
+  show: boolean
+  code: string
+  zpaging: any
+  enumColumn?: Enums
+  /** 提交成功后跳转的自定义页面路径，不传则默认刷新 */
+  successUrl?: string
+}>()
 const emits = defineEmits(['update:show'])
 const btnLoading = ref(false)
 const toast = useGlobalToast()
@@ -59,10 +59,14 @@ async function action() {
     await actionDataSave(props.fieldGroup?.id || '', props.code, formatFileData(data))
     btnLoading.value = false
     show.value = false
-    props.zpaging.reload()
     toast.success({ msg: '操作成功！' })
-  }
-  catch (error: any) {
+    // 如果传了 successUrl，跳转到自定义页面；否则默认刷新
+    if (props.successUrl) {
+      uni.navigateTo({ url: props.successUrl })
+    } else {
+      props.zpaging.reload()
+    }
+  } catch (error: any) {
     btnLoading.value = false
     toast.error(error)
   }
@@ -70,14 +74,39 @@ async function action() {
 </script>
 
 <template>
-  <wd-popup v-model="show" position="bottom" closable :z-index="999999" @close="() => { show = false }">
-    <view class="h-50vh w-100vw">
+  <wd-popup
+    v-model="show"
+    position="bottom"
+    closable
+    :z-index="999999"
+    @close="
+      () => {
+        show = false
+      }
+    "
+  >
+    <view class="h-50vh w-100vw bg-white dark:bg-[var(--wot-dark-background)]">
       <view class="h-44px bg-white dark:bg-[var(--wot-dark-background)]" />
       <view class="w-[calc(100%-44px)] overflow-auto bg-white dark:bg-[var(--wot-dark-background)]">
-        <formControl v-if="props.fieldGroup" ref="formControlRef" :field-group="props.fieldGroup" :enum-column="enumColumn" />
+        <formControl
+          v-if="props.fieldGroup"
+          ref="formControlRef"
+          :field-group="props.fieldGroup"
+          :enum-column="enumColumn"
+        />
         <view class="h-44px bg-white dark:bg-[var(--wot-dark-background)]" />
-        <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 bg-white dark:bg-[var(--wot-dark-background)]">
-          <wd-button :loading="btnLoading" custom-class="flex-1" @click="() => { action() }">
+        <view
+          class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 bg-white dark:bg-[var(--wot-dark-background)]"
+        >
+          <wd-button
+            :loading="btnLoading"
+            custom-class="flex-1"
+            @click="
+              () => {
+                action()
+              }
+            "
+          >
             提交
           </wd-button>
         </view>