wui-components-v2 1.0.75 → 1.0.77

package/components/card-botom-buttons/card-botom-buttons.vue

@@ -15,6 +15,7 @@ const props = defineProps<{
   pageType?: string
   data: Entities
   rowActions?: rowActions[]
+  ractions?: rowActions[]
   zpaging?: any
 }>()
 const pageType = ref('')
@@ -25,7 +26,14 @@ const router = useRouter()
 
 // anction按钮
 const anctions = computed(() => {
-  return props.rowActions?.filter(isShowAction) || []
+  const rowActions = props.rowActions || []
+  return [...rowActions.filter(isShowAction)]
+})
+
+// raction按钮
+const ractions = computed(() => {
+  const ractions = props.ractions || []
+  return [...ractions.filter(isShowAction)]
 })
 
 // 跳转编辑页面
@@ -43,7 +51,7 @@ function edit() {
 
 const actionItem = ref<Groups>()
 const actionItemShow = ref(false)
-// 跳转action页面
+// 打开action弹框
 function action(subitem: rowActions) {
   console.log(subitem)
   actionItem.value = {
@@ -55,6 +63,11 @@ function action(subitem: rowActions) {
   // router.push(`/pages/edit-page/index?sourceId=${subitem.id}&id=${props.code}&title=${subitem.title}&pageType=`)
 }
 
+// 跳转raction页面
+function raction(subitem: rowActions) {
+  router.push(`/pages/list/index?sourceId=${subitem.id}&mainCode=${props.code}&title=${subitem.title}&pageType=${props.pageType}`)
+}
+
 // 跳转详情页面
 function detail() {
   router.push(`/pages/details-page/index?sourceId=${props.sourceId}&id=${props.code}&title=${props.item.title}`)
@@ -68,7 +81,7 @@ function isShowAction(item: rowActions) {
       return prepose.transDefaultValue.includes(props.data.fieldMap[prepose.sourceId])
     })
   }
-  return false
+  return true
 }
 </script>
 
@@ -79,6 +92,11 @@ function isShowAction(item: rowActions) {
         {{ subitem.title }}
       </wd-button>
     </view>
+    <view v-if="props.ractions" class="flex gap-1">
+      <wd-button v-for="subitem in ractions" :key="subitem.id" plain size="small" @click="raction(subitem)">
+        {{ subitem.title }}
+      </wd-button>
+    </view>
 
     <wd-button v-if="props.item.buttons.includes('dtmplEdit')" size="small" @click="edit()">
       编辑

package/components/list-top-buttons/list-top-buttons.vue

@@ -5,11 +5,11 @@ import { useRouter } from 'uni-mini-router'
 defineOptions({
   name: 'ListTopButtons',
 })
-const props = defineProps<{ buttons: string[], sourceId: string, id?: string, pageTitle: string, pageType?: string }>()
+const props = defineProps<{ mainCode: string, buttons: string[], sourceId: string, id?: string, pageTitle: string, pageType?: string }>()
 const router = useRouter()
 // 跳转添加页面
 function gotoAddPage() {
-  router.push(`/pages/edit-page/index?sourceId=${props.sourceId}&id=${props.id || ''}&title=${props.pageTitle}&mainCode=''&pageType=${props.pageType}`)
+  router.push(`/pages/edit-page/index?sourceId=${props.sourceId}&id=${props.id || ''}&title=${props.pageTitle}&mainCode=${props.mainCode}&pageType=${props.pageType}`)
 }
 </script>
 

package/components/login-form/login-form.vue

@@ -68,7 +68,6 @@ function handleSubmit() {
           }
         }
         catch (error: any) {
-          toast.error({ msg: error })
           console.log(error, 'error')
         }
       }

package/components/search/search.vue

@@ -8,6 +8,7 @@ const props = defineProps<{
   criterias: Fields[]
   primaryCriteria: Fields
   enumColumn?: Enums
+  mainCode: string
 }>()
 const emits = defineEmits(['submit'])
 const show = ref(false)

package/components/wui-list/wui-list.vue

@@ -54,11 +54,13 @@ const pageTitle = ref('')
 const searchData = ref('')
 const pageType = ref('')
 const enumColumn = ref<Enums>({})
+const mainCode = ref('')
 onLoad((option: any) => {
   console.log(option)
   sourceId.value = option.sourceId
   pageTitle.value = option.title
   pageType.value = option.pageType
+  mainCode.value = option.mainCode || ''
   uni.setNavigationBarTitle({
     title: option.title,
   })
@@ -97,7 +99,7 @@ async function queryList(pageNo: number, pageSize: number) {
   // })
 
   try {
-    const res = await pageKey(sourceId.value, '', searchData.value)// 获取key
+    const res = await pageKey(sourceId.value, mainCode.value, searchData.value)// 获取key
     const data = await listData(res.key, pageNo, pageSize)// 获取数据
     // const count = await getPageTotal(key.data?.key)// 获取总数
     Zpaging.value.complete(data.entities)
@@ -146,16 +148,16 @@ function submitSearch(data: any) {
 <template>
   <z-paging ref="Zpaging" v-model="datas" :default-page-size="5" :show-loading-more-when-reload="true" @query="queryList">
     <template #top>
-      <Search :enum-column="enumColumn" :criterias="config.criterias" :primary-criteria="config.primaryCriteria" @submit="submitSearch" />
+      <Search :main-code="mainCode" :enum-column="enumColumn" :criterias="config.criterias" :primary-criteria="config.primaryCriteria" @submit="submitSearch" />
       <view>
-        <ListTopButtons :buttons="config.buttons" :source-id="sourceId" :page-title="pageTitle" :page-type="pageType" />
+        <ListTopButtons :main-code="mainCode" :buttons="config.buttons" :source-id="sourceId" :page-title="pageTitle" :page-type="pageType" />
       </view>
       <slot name="top" />
     </template>
     <foldCard v-for="item in datas" :key="item.code" :enum-column="enumColumn" :collapse-num="5" :source-id="sourceId" :groups="config" :data="item" :columns="config.columns" :primary-column="config.primaryColumn" :second-column="config.secondColumn" :label-column="config.labelColumn" model="complex">
       <template #buttons>
         <slot name="cardBotomButtons" :data="item" />
-        <CardBotomButtons :zpaging="Zpaging" :row-actions="config.rowActions" :source-id="sourceId" :item="config" :code="item.code" :page-type="pageType" :data="item" />
+        <CardBotomButtons :zpaging="Zpaging" :row-actions="config.rowActions" :ractions="config.ractions" :source-id="sourceId" :item="config" :code="item.code" :page-type="pageType" :data="item" />
       </template>
     </foldCard>
     <template #bottom>

package/components/wui-menus/wui-menus.vue

@@ -3,9 +3,11 @@ import type { PropType } from 'vue'
 import { computed, defineOptions, defineProps, ref } from 'vue'
 import { useRouter } from 'uni-mini-router'
 import { onShow } from '@dcloudio/uni-app'
+import { set } from '@vueuse/core'
 import { menu } from '../../api/menu'
 import DemoCard from '../demo-card/demo-card.vue'
 import { useManualTheme } from '../../composables/useManualTheme'
+import { useGlobalToast } from '../../composables/useGlobalToast'
 
 defineOptions({
   name: 'WuiMenus',
@@ -21,7 +23,7 @@ const props = defineProps({
   },
 })
 const router = useRouter()
-// const toast = useGlobalToast()
+const toast = useGlobalToast()
 interface Icon {
   id: string
   path: string
@@ -144,7 +146,10 @@ function queryList() {
   menu().then((res: any) => {
     // 将请求结果通过complete传给z-paging处理，同时也代表请求结束，这一行必须调用
     if (!res?.blocks.length) {
-      router.replaceAll('/pages/login/index')
+      toast.warning('暂无权限，请联系管理员')
+      setTimeout(() => {
+        router.replaceAll('/pages/login/index')
+      }, 1000)
     }
     paging.value.complete(res?.blocks || [])
     // uni.setNavigationBarTitle({ title: res.data?.programName || '' })

package/package.json

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

package/type.ts

@@ -26,6 +26,7 @@ export interface Config extends Groups {
   criterias: Fields[]
   labelColumn?: Columns
   rowActions?: rowActions[]
+  ractions?: rowActions[]
 }
 
 // 列表数据