w-ui-v1 1.0.27 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-ui-v1",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",

package/w-card/w-card.vue

@@ -31,6 +31,41 @@ const props = defineProps({
   },
 })
 
+//更多按钮
+const moreBtns = computed(() => {
+  let data = []
+  props.page.rowActions?.forEach((element: any) => {
+    if (element.preposes[0]) {
+      if (element.preposes[0].transDefaultValue.includes(props.itemData.fieldMap[element.preposes[0].id])) {
+        data.push({
+          actionType: "submit",
+          name: element.title,
+          color: '#4D81F1',
+          ...element
+        })
+      }
+    } else {
+      data.push({
+        actionType: "submit",
+        name: element.title,
+        color: '#4D81F1',
+        ...element
+      })
+    }
+  });
+
+  props.page.ractions?.forEach((item: any) => {
+    data.push({
+      actionType:"openPage",
+      name: item.title,
+      color: '#4D81F1',
+      ...item
+    })
+  })
+
+  return data
+})
+
 // 处理单项数据、配置
 const items = computed(() => {
   return props.page.columns?.filter((item: any) => {
@@ -52,8 +87,8 @@ const items = computed(() => {
   }) || []
 })
 
-const wFormMessageBoxRef= ref()
-
+const wFormMessageBoxRef = ref()
+const showMoreButns = ref(false)
 const isExpanded = ref(false)
 const defaultVisible = 4 // 默认显示行数量
 
@@ -97,13 +132,17 @@ function goto(type: string, item: any = {}, subItem: string = '') {
         url: `/pages/edit/edit?sourceId=${props.sourceId}&code=${props.itemData.code}`,
       })
       break
+    case 'openPage':
+      uni.navigateTo({
+        url: `/pages/table/table?sourceId=${item.id}&pageTitle=${item.title}`,
+      })
+      break
   }
 
 }
 
 //删除
 const dele = () => {
-  console.log('delete');
   message
     .confirm({
       msg: '确定删除吗?',
@@ -123,7 +162,19 @@ const dele = () => {
 
 }
 
-// 自定义按钮操作
+//更多按钮点击事件
+const moreBtnsSelect = (item: any) => {
+  switch (item.item.actionType) {
+    case 'submit':
+      actionBtn(item.item)
+      break
+    case 'openPage':
+      goto(item.item.actionType, item.item)
+      break
+  }
+}
+
+// 更多按钮操作
 const actionBtn = (item: any) => {
   wFormMessageBoxRef.value.openFormMessageBox(item)
 }
@@ -172,12 +223,6 @@ const actionBtn = (item: any) => {
     </view>
     <template #footer>
       <view class="btns-box">
-        <view v-if="props.page.rowActions" v-for="(bitem, index) in props.page.rowActions" :key="index">
-          <wd-button :type="bitem.buttonType === 'dashed' ? 'info' : 'warning'" size="small" plain @click="actionBtn(bitem)"
-            v-if="bitem.preposes[0].transDefaultValue.includes(props.itemData?.fieldMap[bitem.preposes[0].id])">
-            {{ bitem.title }}
-          </wd-button>
-        </view>
         <wd-button size="small" class="btn" plain v-if="props.page.buttons.includes('detail')" @click="goto('detail')">
           详情
         </wd-button>
@@ -189,12 +234,19 @@ const actionBtn = (item: any) => {
           v-if="props.page.buttons.includes('singleDelete')">
           删除
         </wd-button>
+        <view v-if="moreBtns.length > 0">
+          <wd-button type='info' size="small" plain @click="showMoreButns = true">
+            更多
+          </wd-button>
+        </view>
       </view>
     </template>
   </wd-card>
   <wd-toast />
   <wd-message-box />
-  <WFormMessageBox ref="wFormMessageBoxRef" :itemData="props.itemData" @refresh="emits('refresh')"/>
+  <WFormMessageBox ref="wFormMessageBoxRef" :itemData="props.itemData" @refresh="emits('refresh')" />
+  <!-- 更多按钮 -->
+  <wd-action-sheet v-model="showMoreButns" :actions="moreBtns" @select="moreBtnsSelect" />
 </template>
 
 <style lang="scss" scoped>

package/w-form-message-box/w-form-message-box.vue

@@ -1,6 +1,6 @@
 <template>
     <view>
-        <wd-message-box selector="wd-message-box-slot">
+        <wd-message-box selector="wd-message-box-slot" custom-class="wd-message-box-slot">
             <wd-form ref="form" :model="model">
                 <wFromControl :subItem="subItem" v-for="(subItem,subIndex) in page.formItem" :key="subIndex" :model="model" :Enumcolumn="Enumcolumn"
                     v-model:model-value="model[subItem.id]" />
@@ -10,6 +10,14 @@
     </view>
 </template>
 
+<script lang="ts">
+//在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
+export default {
+  options: {
+    styleIsolation: 'shared'//使css :deep()生效
+  }
+}
+</script>
 <script setup lang="ts">
 import wFromControl from '../w-form-control/w-form-control.vue'
 import {reactive,ref,defineProps,defineExpose,computed,watch,defineEmits} from 'vue'
@@ -45,7 +53,6 @@ const props=defineProps({
 })
 
 const page=computed(()=>{
-   
     return  {
        formItem: pageConf.value.writes,
        sourceId: pageConf.value.id
@@ -55,7 +62,7 @@ const page=computed(()=>{
 watch(page,(value)=>{
     if (!value) return
     value.formItem.forEach((item: any) => {
-        model[item.id] = item.defaultValue || ''
+        model[item.id] =props.itemData.fieldMap[item.id] || ''
     })
     getEnumer()
 })
@@ -103,4 +110,11 @@ defineExpose({
 })
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+:deep(.wd-message-box-slot){
+    width: 95vw !important;
+}
+:deep( .wd-message-box-slot .wd-message-box__flex){
+   justify-content: space-between !important;
+}
+</style>