wui-components-v2 1.1.69 → 1.1.70

package/composables/useMenus.ts

@@ -1,193 +1,193 @@
-import { computed, ref } from 'vue'
-import { useRouter } from 'uni-mini-router'
-import { fastmenu, menu } from '../api/menu'
-import { useManualTheme } from '../composables/useManualTheme'
-import { useGlobalToast } from '../composables/useGlobalToast'
-import { RainbowColorGenerator } from '../utils/index'
-// 类型
-export interface Icon {
-  id: string
-  path: string
-}
-interface Props {
-  icons: Icon[]
-  load: () => void
-  menuTopType: string
-}
-export interface MenuItem {
-  id: string
-  title: string
-  icon: string
-  color: string
-  tip: string
-  pageType: string
-  children?: MenuItem[]
-}
-export function useMenus(props?: Props, pagingRef?: Ref<any>) {
-  const router = useRouter()
-  const toast = useGlobalToast()
-  const { currentThemeColor } = useManualTheme()
-  const colorGenerator = new RainbowColorGenerator()
-  const menuList = ref<MenuItem[]>([])
-  const title = ref('')
-  const navTitle = ref('')
-  const filtermenu = computed<MenuItem[]>(() => {
-    let arr = []
-    if (currentThemeColor.value.primary) {
-      arr = filterHiddenTree(menuList.value, 'items', true)
-    }
-    return arr
-  })
-  const sheetShow = ref(false)
-  const actions = ref([])
-  // 点击菜单跳转页面
-  function gotoPage(item: MenuItem) {
-    // 跳转页面
-    if (goto(item)) return
-    // 打开动作面板
-    openSheet(item)
-  }
-
-  // 点击动作面板跳转页面
-  function sheetGotoPage(item: MenuItem) {
-    // 跳转页面
-    if (goto(item)) return
-    // 打开动作面板
-    openSheet(item, 300)
-  }
-
-  // 跳转页面
-  function goto(item: MenuItem) {
-    console.log(item.pageType)
-    switch (item.pageType) {
-      case '列表':
-        console.log(item, 'item      ')
-        router.push(`/pages/list/index?sourceId=${item.id}&title=${item.title}`)
-        return true
-      case '树':
-        router.push(`/pages/tree-page/index?sourceId=${item.id}&title=${item.title}`)
-        return true
-      case '报表':
-        // uni.navigateTo({
-        //   url: `/pages/report-table/report-table?sourceId=${item.id}&title=${item.title}`,
-        // })
-        return true
-
-      default:
-        return false
-    }
-  }
-
-  // 打开wd-action-sheet动作面板
-  function openSheet(item: any, s = 0) {
-    if (item.items) {
-      title.value = item.title
-      actions.value = item.items
-        ? item.items.map((item: any) => {
-            return {
-              name: item.title,
-              // color: '#00000073',
-              ...item,
-            }
-          })
-        : []
-
-      // 设置二次打开的过渡时间
-      const id = setTimeout(() => {
-        sheetShow.value = true
-        clearTimeout(id)
-      }, s)
-    }
-  }
-
-  /**
-   * 根据 `disabled: true` 过滤树形数组（支持自定义子节点字段）
-   * @param {Array} tree 原始树形数据
-   * @param {string} [childKey] 子节点字段名
-   * @param {boolean} [deepClone] 是否深拷贝原数据
-   * @returns {Array} 过滤后的新树形数据
-   */
-  function filterHiddenTree(tree: any, childKey = 'children', deepClone = false) {
-    // 深拷贝处理（可选）
-    const clone = (data: any) => {
-      if (!deepClone) return data
-      return JSON.parse(JSON.stringify(data))
-    }
-
-    return clone(tree)
-      .filter((node: any) => !node.disabled) // 过滤当前层隐藏节点
-      .map((node: any) => {
-        // 递归处理子节点
-        if (Array.isArray(node[childKey])) {
-          node[childKey] = filterHiddenTree(node[childKey], childKey, deepClone)
-        }
-        const icon = props?.icons.find((item: any) => {
-          return item.id === node.id
-        })
-        const color = colorGenerator.getNextColor()
-        return {
-          ...node,
-          iconPath: (icon as any)?.path,
-          color,
-        }
-      })
-  }
-
-  // @query所绑定的方法不要自己调用！！需要刷新列表数据时，只需要调用this.$refs.paging.reload()即可
-  function queryList() {
-    // 此处请求仅为演示，请替换为自己项目中的请求
-    menu()
-      .then((res: any) => {
-        // 将请求结果通过complete传给z-paging处理，同时也代表请求结束，这一行必须调用
-        if (!res?.blocks?.length) {
-          toast.warning('暂无权限，请重新登录或联系管理员')
-        }
-        navTitle.value = res?.programName || ''
-        uni.setNavigationBarTitle({ title: res?.programName || '' }) // 设置标题
-        pagingRef?.value.complete(res?.blocks || [])
-      })
-      .catch((res: any) => {
-        console.log(res)
-        // 如果请求失败写this.$refs.paging.complete(false)，会自动展示错误页面
-        // 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
-        // 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
-        pagingRef?.value.complete(false)
-      })
-  }
-
-  // 快速访问菜单
-  const sectionmenu = ref<MenuItem[]>([])
-  const filersectiomenus = computed(() => {
-    // 截取数组前4项
-    return sectionmenu.value.slice(0, 4)
-  })
-
-  const getSectionMenu = async () => {
-    try {
-      const res = await fastmenu()
-      if (res.fastMenu) {
-        sectionmenu.value = res.fastMenu.QuickQueryBar || []
-      } else {
-        sectionmenu.value = []
-      }
-    } catch (error) {
-      console.log(error)
-    }
-  }
-
-  return {
-    gotoPage,
-    sheetGotoPage,
-    filtermenu,
-    sheetShow,
-    actions,
-    title,
-    navTitle,
-    queryList,
-    menuList,
-    currentThemeColor,
-    getSectionMenu,
-    filersectiomenus,
-    sectionmenu,
-  }
-}
+import { computed, ref } from 'vue'
+import { useRouter } from 'uni-mini-router'
+import { fastmenu, menu } from '../api/menu'
+import { useManualTheme } from '../composables/useManualTheme'
+import { useGlobalToast } from '../composables/useGlobalToast'
+import { RainbowColorGenerator } from '../utils/index'
+// 类型
+export interface Icon {
+  id: string
+  path: string
+}
+interface Props {
+  icons: Icon[]
+  load: () => void
+  menuTopType: string
+}
+export interface MenuItem {
+  id: string
+  title: string
+  icon: string
+  color: string
+  tip: string
+  pageType: string
+  children?: MenuItem[]
+}
+export function useMenus(props?: Props, pagingRef?: Ref<any>) {
+  const router = useRouter()
+  const toast = useGlobalToast()
+  const { currentThemeColor } = useManualTheme()
+  const colorGenerator = new RainbowColorGenerator()
+  const menuList = ref<MenuItem[]>([])
+  const title = ref('')
+  const navTitle = ref('')
+  const filtermenu = computed<MenuItem[]>(() => {
+    let arr = []
+    if (currentThemeColor.value.primary) {
+      arr = filterHiddenTree(menuList.value, 'items', true)
+    }
+    return arr
+  })
+  const sheetShow = ref(false)
+  const actions = ref([])
+  // 点击菜单跳转页面
+  function gotoPage(item: MenuItem) {
+    // 跳转页面
+    if (goto(item)) return
+    // 打开动作面板
+    openSheet(item)
+  }
+
+  // 点击动作面板跳转页面
+  function sheetGotoPage(item: MenuItem) {
+    // 跳转页面
+    if (goto(item)) return
+    // 打开动作面板
+    openSheet(item, 300)
+  }
+
+  // 跳转页面
+  function goto(item: MenuItem) {
+    console.log(item.pageType)
+    switch (item.pageType) {
+      case '列表':
+        console.log(item, 'item      ')
+        router.push(`/pages/list/index?sourceId=${item.id}&title=${item.title}`)
+        return true
+      case '树':
+        router.push(`/pages/tree-page/index?sourceId=${item.id}&title=${item.title}`)
+        return true
+      case '报表':
+        // uni.navigateTo({
+        //   url: `/pages/report-table/report-table?sourceId=${item.id}&title=${item.title}`,
+        // })
+        return true
+
+      default:
+        return false
+    }
+  }
+
+  // 打开wd-action-sheet动作面板
+  function openSheet(item: any, s = 0) {
+    if (item.items) {
+      title.value = item.title
+      actions.value = item.items
+        ? item.items.map((item: any) => {
+            return {
+              name: item.title,
+              // color: '#00000073',
+              ...item,
+            }
+          })
+        : []
+
+      // 设置二次打开的过渡时间
+      const id = setTimeout(() => {
+        sheetShow.value = true
+        clearTimeout(id)
+      }, s)
+    }
+  }
+
+  /**
+   * 根据 `disabled: true` 过滤树形数组（支持自定义子节点字段）
+   * @param {Array} tree 原始树形数据
+   * @param {string} [childKey] 子节点字段名
+   * @param {boolean} [deepClone] 是否深拷贝原数据
+   * @returns {Array} 过滤后的新树形数据
+   */
+  function filterHiddenTree(tree: any, childKey = 'children', deepClone = false) {
+    // 深拷贝处理（可选）
+    const clone = (data: any) => {
+      if (!deepClone) return data
+      return JSON.parse(JSON.stringify(data))
+    }
+
+    return clone(tree)
+      .filter((node: any) => !node.disabled) // 过滤当前层隐藏节点
+      .map((node: any) => {
+        // 递归处理子节点
+        if (Array.isArray(node[childKey])) {
+          node[childKey] = filterHiddenTree(node[childKey], childKey, deepClone)
+        }
+        const icon = props?.icons.find((item: any) => {
+          return item.id === node.id
+        })
+        const color = colorGenerator.getNextColor()
+        return {
+          ...node,
+          iconPath: (icon as any)?.path,
+          color,
+        }
+      })
+  }
+
+  // @query所绑定的方法不要自己调用！！需要刷新列表数据时，只需要调用this.$refs.paging.reload()即可
+  function queryList() {
+    // 此处请求仅为演示，请替换为自己项目中的请求
+    menu()
+      .then((res: any) => {
+        // 将请求结果通过complete传给z-paging处理，同时也代表请求结束，这一行必须调用
+        if (!res?.blocks?.length) {
+          toast.warning('暂无权限，请重新登录或联系管理员')
+        }
+        navTitle.value = res?.programName || ''
+        uni.setNavigationBarTitle({ title: res?.programName || '' }) // 设置标题
+        pagingRef?.value.complete(res?.blocks || [])
+      })
+      .catch((res: any) => {
+        console.log(res)
+        // 如果请求失败写this.$refs.paging.complete(false)，会自动展示错误页面
+        // 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+        // 在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+        pagingRef?.value.complete(false)
+      })
+  }
+
+  // 快速访问菜单
+  const sectionmenu = ref<MenuItem[]>([])
+  const filersectiomenus = computed(() => {
+    // 截取数组前4项
+    return sectionmenu.value.slice(0, 4)
+  })
+
+  const getSectionMenu = async () => {
+    try {
+      const res = await fastmenu()
+      if (res.fastMenu) {
+        sectionmenu.value = res.fastMenu.QuickQueryBar || []
+      } else {
+        sectionmenu.value = []
+      }
+    } catch (error) {
+      console.log(error)
+    }
+  }
+
+  return {
+    gotoPage,
+    sheetGotoPage,
+    filtermenu,
+    sheetShow,
+    actions,
+    title,
+    navTitle,
+    queryList,
+    menuList,
+    currentThemeColor,
+    getSectionMenu,
+    filersectiomenus,
+    sectionmenu,
+  }
+}

package/index.ts

@@ -1,83 +1,83 @@
-import type { App } from 'vue'
-// 暗黑模式样式 - 组件库入口加载（供打包后 app.use() 时生效）
-import './styles/dark-mode.scss'
-
-import WuiSystemSettings from './components/wui-system-settings/wui-system-settings.vue'
-import WuiMenus from './components/wui-menus/wui-menus.vue'
-import WuiMenus1 from './components/wui-menus1/wui-menus.vue'
-import Wuilogin from './components/wui-login/wui-login.vue'
-import Wuilogin1 from './components/wui-login1/wui-login.vue'
-import WuiDefault from './components/wui-default/wui-default.vue'
-import WuiTabbar from './components/wui-tabbar/wui-tabbar.vue'
-import { useLocale } from './composables/useLocale'
-import { useManualTheme } from './composables/useManualTheme'
-import { useGlobalLoading } from './composables/useGlobalLoading'
-import { useGlobalMessage } from './composables/useGlobalMessage'
-import { useGlobalToast } from './composables/useGlobalToast'
-import { useLanguageStore } from './store/language'
-import { useUser } from './composables/useUser'
-import { req } from './api/index'
-import { useTabbar } from './composables/useTabbar'
-import { persistPlugin } from './store/persist'
-import WuiList from './components/wui-list/wui-list.vue'
-import WuiselectList from './components/wui-select-list/wui-select-list.vue'
-import WuieditPage from './components/wui-edit-page/wui-edit-page.vue'
-import WuidetailsPage from './components/wui-details-page/wui-details-page.vue'
-import WuiUpdateComponent from './components/wui-update-component/wui-update-component.vue'
-import WuiScanBindingSensor from './components/wui-scan-binding-sensor/wui-scan-binding-sensor.vue'
-import WuiUser from './components/wui-user/wui-user.vue'
-import WuiAutoUpdateComponent from './components/wui-auto-update-component/wui-auto-update-component.vue'
-import iData from './utils/idata-scan' // PAD扫描
-import wuiSearchHistoryBabbar from './components/wui-search-history-babbar/wui-search-history-babbar.vue'
-import wuienumeSelectControl from './components/wui-enume-select-control/wui-enume-select-control.vue'
-import './static/iconfont/iconfont.css'
-// 组件列表
-const coms: Array<{ name: string }> = [
-  WuiSystemSettings,
-  WuiMenus,
-  Wuilogin,
-  WuiDefault,
-  WuiTabbar,
-  WuiList,
-  WuiselectList,
-  WuieditPage,
-  WuidetailsPage,
-  WuiUpdateComponent,
-  WuiScanBindingSensor,
-  WuiUser,
-  WuiAutoUpdateComponent,
-  Wuilogin1,
-  WuiMenus1,
-  wuiSearchHistoryBabbar,
-  wuienumeSelectControl,
-]
-
-/**
- * 批量注册组件
- * @param app Vue 应用实例
- */
-function install(app: App): void {
-  coms.forEach(component => {
-    app.component(component.name, component)
-  })
-}
-
-/**
- * 核心功能函数集合
- */
-export {
-  useTabbar,
-  useLocale,
-  useManualTheme,
-  req, // 请求封装
-  useGlobalLoading,
-  useGlobalMessage,
-  useGlobalToast,
-  useUser,
-  persistPlugin,
-  iData, // PAD扫描
-  // nfc, // nfc读取
-  useLanguageStore, // 语言
-}
-
-export default install
+import type { App } from 'vue'
+// 暗黑模式样式 - 组件库入口加载（供打包后 app.use() 时生效）
+import './styles/dark-mode.scss'
+
+import WuiSystemSettings from './components/wui-system-settings/wui-system-settings.vue'
+import WuiMenus from './components/wui-menus/wui-menus.vue'
+import WuiMenus1 from './components/wui-menus1/wui-menus.vue'
+import Wuilogin from './components/wui-login/wui-login.vue'
+import Wuilogin1 from './components/wui-login1/wui-login.vue'
+import WuiDefault from './components/wui-default/wui-default.vue'
+import WuiTabbar from './components/wui-tabbar/wui-tabbar.vue'
+import { useLocale } from './composables/useLocale'
+import { useManualTheme } from './composables/useManualTheme'
+import { useGlobalLoading } from './composables/useGlobalLoading'
+import { useGlobalMessage } from './composables/useGlobalMessage'
+import { useGlobalToast } from './composables/useGlobalToast'
+import { useLanguageStore } from './store/language'
+import { useUser } from './composables/useUser'
+import { req } from './api/index'
+import { useTabbar } from './composables/useTabbar'
+import { persistPlugin } from './store/persist'
+import WuiList from './components/wui-list/wui-list.vue'
+import WuiselectList from './components/wui-select-list/wui-select-list.vue'
+import WuieditPage from './components/wui-edit-page/wui-edit-page.vue'
+import WuidetailsPage from './components/wui-details-page/wui-details-page.vue'
+import WuiUpdateComponent from './components/wui-update-component/wui-update-component.vue'
+import WuiScanBindingSensor from './components/wui-scan-binding-sensor/wui-scan-binding-sensor.vue'
+import WuiUser from './components/wui-user/wui-user.vue'
+import WuiAutoUpdateComponent from './components/wui-auto-update-component/wui-auto-update-component.vue'
+import iData from './utils/idata-scan' // PAD扫描
+import wuiSearchHistoryBabbar from './components/wui-search-history-babbar/wui-search-history-babbar.vue'
+import wuienumeSelectControl from './components/wui-enume-select-control/wui-enume-select-control.vue'
+import './static/iconfont/iconfont.css'
+// 组件列表
+const coms: Array<{ name: string }> = [
+  WuiSystemSettings,
+  WuiMenus,
+  Wuilogin,
+  WuiDefault,
+  WuiTabbar,
+  WuiList,
+  WuiselectList,
+  WuieditPage,
+  WuidetailsPage,
+  WuiUpdateComponent,
+  WuiScanBindingSensor,
+  WuiUser,
+  WuiAutoUpdateComponent,
+  Wuilogin1,
+  WuiMenus1,
+  wuiSearchHistoryBabbar,
+  wuienumeSelectControl,
+]
+
+/**
+ * 批量注册组件
+ * @param app Vue 应用实例
+ */
+function install(app: App): void {
+  coms.forEach(component => {
+    app.component(component.name, component)
+  })
+}
+
+/**
+ * 核心功能函数集合
+ */
+export {
+  useTabbar,
+  useLocale,
+  useManualTheme,
+  req, // 请求封装
+  useGlobalLoading,
+  useGlobalMessage,
+  useGlobalToast,
+  useUser,
+  persistPlugin,
+  iData, // PAD扫描
+  // nfc, // nfc读取
+  useLanguageStore, // 语言
+}
+
+export default install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.1.69",
+  "version": "1.1.70",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",