wui-components-v2 1.1.77 → 1.1.79

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

@@ -28,6 +28,8 @@ const props = defineProps<{
   addEvent?: string
   primaryColumn: Columns
   detailButtonHandle?: (data: Entities) => void
+  buttonDeleteAction?: { [key: string]: any }
+  buttonEditAction?: { [key: string]: any }
 }>()
 const toast = useGlobalToast()
 const message = useGlobalMessage()
@@ -114,8 +116,8 @@ function detail() {
 }
 
 // 判断按钮是否满足条件显示
-function isShowAction(item: rowActions) {
-  if (item.preposes.length > 0) {
+function isShowAction(item?: { preposes?: Fields[] }) {
+  if (item?.preposes?.length) {
     return item.preposes.every((prepose: Fields) => {
       // 判断字段值是否满足要求
       return comparator(prepose.comparator || 'equal', props.data.fieldMap[prepose.sourceId], prepose.defaultValue)
@@ -246,25 +248,26 @@ console.log(props, '3333333333333')
         更多
       </wd-button>
       <view v-else class="flex gap-2 flex-wrap">
-        <wd-button
-          v-for="subitem in morebutns"
-          :key="subitem.id"
-          plain
-          size="small"
-          @click="
-            () => {
-              select({ item: subitem })
-            }
-          "
-        >
-          {{ subitem.title }}
-        </wd-button>
+        <template v-for="subitem in morebutns" :key="subitem.id">
+          <wd-button
+            v-if="isShowAction(subitem)"
+            plain
+            size="small"
+            @click="
+              () => {
+                select({ item: subitem })
+              }
+            "
+          >
+            {{ subitem.title }}
+          </wd-button>
+        </template>
       </view>
     </view>
 
-    <wd-button v-if="props.item.buttons.includes('dtmplEdit')" size="small" @click="edit()">编辑</wd-button>
+    <wd-button v-if="props.item.buttons.includes('dtmplEdit') && isShowAction(props.buttonEditAction)" size="small" @click="edit()">编辑</wd-button>
     <wd-button v-if="props.item.buttons.includes('detail')" size="small" type="info" @click="detail()">详情</wd-button>
-    <wd-button v-if="props.item.buttons.includes('singleDelete')" size="small" type="danger" @click="del()">
+    <wd-button v-if="props.item.buttons.includes('singleDelete') && isShowAction(props.buttonDeleteAction)" size="small" type="danger" @click="del()">
       删除
     </wd-button>
     <ActionPopup

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

@@ -57,6 +57,8 @@ const config = ref<Config>({
   readOnly: false,
   displayConfig: [],
   showType: 'table',
+  buttonDeleteAction: {},
+  buttonEditAction: {},
 })
 const { getEnums, enumColumn } = useEnums({ config })
 const sourceId = ref('')
@@ -66,7 +68,7 @@ const searchData = ref('')
 const tabSearchData = ref('')
 const pageType = ref('')
 const mainCode = ref('')
-const addEvent = generateHighResolutionID()// 全局事件名称
+const addEvent = generateHighResolutionID() // 全局事件名称
 onLoad((option: any) => {
   console.log(option)
   sourceId.value = option.sourceId
@@ -98,8 +100,7 @@ async function getPageConfig() {
       console.log('config', config.value)
       getEnums()
     }
-  }
-  catch (error) {
+  } catch (error) {
     console.log(error)
   }
 }
@@ -130,14 +131,13 @@ async function queryList(pageNo: number, pageSize: number) {
   }
 
   try {
-    const res = await pageKey(sourceId.value, mainCode.value, qre)// 获取key
-    const data = await listData(res.key, pageNo, pageSize)// 获取数据
+    const res = await pageKey(sourceId.value, mainCode.value, qre) // 获取key
+    const data = await listData(res.key, pageNo, pageSize) // 获取数据
     // const count = await getPageTotal(key.data?.key)// 获取总数
     Zpaging.value.complete(data.entities)
 
     // emits('loadData', data.data.entities)
-  }
-  catch (error) {
+  } catch (error) {
     if (Zpaging.value) {
       Zpaging.value.complete(false)
     }
@@ -160,8 +160,7 @@ function submitSearch(data: any) {
 function tabSearchClick(data: any) {
   if (searchData.value) {
     tabSearchData.value = `${searchData.value}&${data}`
-  }
-  else {
+  } else {
     tabSearchData.value = data
   }
 
@@ -171,20 +170,30 @@ function tabSearchClick(data: any) {
 
 <template>
   <z-paging
-    ref="Zpaging" v-model="datas" :default-page-size="5" :show-loading-more-when-reload="true"
+    ref="Zpaging"
+    v-model="datas"
+    :default-page-size="5"
+    :show-loading-more-when-reload="true"
     @query="queryList"
   >
     <template #top>
       <slot name="top" />
       <Search
-        :main-code="mainCode" :enum-column="enumColumn"         :criteria="config.criteria"
-        :primary-criterion="config.primaryCriterion" :split2-tab-criterias="config.split2TabCriterias"
+        :main-code="mainCode"
+        :enum-column="enumColumn"
+        :criteria="config.criteria"
+        :primary-criterion="config.primaryCriterion"
+        :split2-tab-criterias="config.split2TabCriterias"
         @submit="submitSearch"
       />
       <view>
         <ListTopButtons
-          :add-event="addEvent" :main-code="mainCode" :buttons="config.buttons" :source-id="sourceId"
-          :page-title="pageTitle" :page-type="pageType"
+          :add-event="addEvent"
+          :main-code="mainCode"
+          :buttons="config.buttons"
+          :source-id="sourceId"
+          :page-title="pageTitle"
+          :page-type="pageType"
           :config="config"
         />
       </view>
@@ -195,34 +204,76 @@ function tabSearchClick(data: any) {
     </template>
     <view v-if="config.showType === 'cardList'">
       <productCard
-        v-for="(item, index) in datas" :key="item.code" :index="index" :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" :card-show-cols="config.cardShowCols" :main-picture="config.mainPicture"
+        v-for="(item, index) in datas"
+        :key="item.code"
+        :index="index"
+        :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"
+        :card-show-cols="config.cardShowCols"
+        :main-picture="config.mainPicture"
       >
         <template #buttons>
           <slot name="cardBotomButtons" :data="item" />
           <CardBotomButtons
-            :primary-column="config.primaryColumn" :add-event="addEvent" :detail-button-handle="detailButtonHandle" :zpaging="Zpaging"
-            :enum-column="enumColumn" :actions="config.actions" :row-actions="config.rowActions" :ractions="config.ractions" :source-id="sourceId"
-            :item="config" :code="item.code" :page-type="pageType" :data="item"
+            :primary-column="config.primaryColumn"
+            :add-event="addEvent"
+            :detail-button-handle="detailButtonHandle"
+            :zpaging="Zpaging"
+            :enum-column="enumColumn"
+            :actions="config.actions"
+            :row-actions="config.rowActions"
+            :ractions="config.ractions"
+            :source-id="sourceId"
+            :item="config"
+            :code="item.code"
+            :page-type="pageType"
+            :data="item"
           />
         </template>
       </productCard>
     </view>
     <view v-else>
       <foldCard
-        v-for="(item, index) in datas" :key="item.code" :index="index" :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"
+        v-for="(item, index) in datas"
+        :key="item.code"
+        :index="index"
+        :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
-            :primary-column="config.primaryColumn" :add-event="addEvent" :detail-button-handle="detailButtonHandle" :zpaging="Zpaging"
-            :enum-column="enumColumn" :actions="config.actions" :row-actions="config.rowActions" :ractions="config.ractions" :source-id="sourceId"
-            :item="config" :code="item.code" :page-type="pageType" :data="item"
+            :primary-column="config.primaryColumn"
+            :add-event="addEvent"
+            :detail-button-handle="detailButtonHandle"
+            :zpaging="Zpaging"
+            :enum-column="enumColumn"
+            :actions="config.actions"
+            :row-actions="config.rowActions"
+            :ractions="config.ractions"
+            :source-id="sourceId"
+            :item="config"
+            :code="item.code"
+            :page-type="pageType"
+            :data="item"
+            :button-delete-action="config.buttonDeleteAction"
+            :button-edit-action="config.buttonEditAction"
           />
         </template>
       </foldCard>

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

@@ -71,13 +71,13 @@ onMounted(() => {
     </template>
     <view class="px-3 pb-4">
       <!-- 菜单搜索 -->
-      <searchBar v-if="themeConfig.showHomePage" />
+      <searchBar v-if="themeConfig?.showHomePage" />
       <!-- 轮播图 -->
-      <bannerCarousel v-if="themeConfig.showHomePage" />
+      <bannerCarousel v-if="themeConfig?.showHomePage" />
       <!-- 快捷菜单 -->
-      <sectionMenus v-if="themeConfig.showHomePage" />
+      <sectionMenus v-if="themeConfig?.showHomePage" />
       <!-- 统计 -->
-      <quickPanel v-if="themeConfig.showHomePage" />
+      <quickPanel v-if="themeConfig?.showHomePage" />
       <!-- 消息 -->
       <!-- <wuiNotifyInfo /> -->
 

package/package.json

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