wui-components-v2 1.0.52 → 1.0.54

package/api/page.ts

@@ -83,3 +83,16 @@ export function detailPageData(sourceId: string, code: string) {
     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,
+    },
+  })
+}

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

@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import { computed, defineEmits, defineOptions, defineProps, ref } from 'vue'
+import type { Groups } from '../../type'
+import formControl from '../form-control/form-control.vue'
+import { actionDataSave } from '../../api/page'
+import { useGlobalToast } from '../../composables/useGlobalToast'
+
+defineOptions({
+  name: 'ActionPopup',
+})
+const props = defineProps<
+  {
+    fieldGroup?: Groups
+    show: boolean
+    code: string
+    zpaging: any
+  }
+>()
+const emits = defineEmits(['update:show'])
+const btnLoading = ref(false)
+const toast = useGlobalToast()
+const formControlRef = ref()
+// 显示开关
+const show = computed({
+  get() {
+    return props.show
+  },
+  set(value: boolean) {
+    emits('update:show', value)
+  },
+})
+
+// 提交数据
+async function action() {
+  console.log('提交action')
+  btnLoading.value = true
+  if (!props.fieldGroup?.id) {
+    return toast.warning({ msg: '无sourceId' })
+  }
+  try {
+    const data = await formControlRef.value.submit()
+    await actionDataSave(props.fieldGroup?.id || '', props.code, data)
+    btnLoading.value = false
+    show.value = false
+    props.zpaging.reload()
+    toast.success({ msg: '操作成功！' })
+  }
+  catch (error: any) {
+    console.log(error, 'error')
+    btnLoading.value = false
+    toast.error(error)
+  }
+}
+</script>
+
+<template>
+  <wd-popup v-model="show" position="bottom" closable :z-index="999999" @close="() => { show = false }">
+    <view class="h-90vh w-100vw">
+      <view class="h-44px" />
+      <formControl v-if="props.fieldGroup" ref="formControlRef" :field-group="props.fieldGroup" />
+      <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 .dark:bg-gray-900 .light:bg-white">
+        <wd-button :loading="btnLoading" class="flex-1" @click="() => { action() }">
+          提交
+        </wd-button>
+      </view>
+    </view>
+  </wd-popup>
+</template>

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

@@ -2,7 +2,8 @@
 import { defineOptions, defineProps, ref } from 'vue'
 import { useRouter } from 'uni-mini-router'
 import { onLoad } from '@dcloudio/uni-app'
-import type { ClassEditConfigs, Entities, Groups } from '../../type'
+import type { ClassEditConfigs, Entities, Fields, Groups, rowActions } from '../../type'
+import ActionPopup from '../action-popup/action-popup.vue'
 
 defineOptions({
   name: 'CardBotomButtons',
@@ -13,12 +14,20 @@ const props = defineProps<{
   code: string
   pageType?: string
   data: Entities
+  rowActions?: rowActions[]
+  zpaging: any
 }>()
 const pageType = ref('')
 onLoad((option: any) => {
   pageType.value = option.type || ''
 })
 const router = useRouter()
+
+// anction按钮
+const anctions = computed(() => {
+  return props.rowActions?.filter(isShowAction) || []
+})
+
 // 跳转编辑页面
 function edit() {
   if (props.item.classEditConfigs && props.item.classEditConfigs.length > 0) {
@@ -31,19 +40,52 @@ function edit() {
     router.push(`/pages/edit-page/index?sourceId=${props.sourceId}&id=${props.code}&title=${props.item.title}&pageType=${props.pageType}`)
   }
 }
+
+const actionItem = ref<Groups>()
+const actionItemShow = ref(false)
+// 跳转action页面
+function action(subitem: rowActions) {
+  console.log(subitem)
+  actionItem.value = {
+    ...props.item,
+    fields: subitem.writes,
+    id: subitem.id,
+  }
+  actionItemShow.value = true
+  // router.push(`/pages/edit-page/index?sourceId=${subitem.id}&id=${props.code}&title=${subitem.title}&pageType=`)
+}
+
 // 跳转详情页面
 function detail() {
   router.push(`/pages/details-page/index?sourceId=${props.sourceId}&id=${props.code}&title=${props.item.title}`)
 }
+
+// 判断action 按钮是否显示
+function isShowAction(item: rowActions) {
+  if (item.preposes.length > 0) {
+    return item.preposes.every((prepose: Fields) => {
+      // 判断字段值是否相等
+      return prepose.transDefaultValue.includes(props.data.fieldMap[prepose.sourceId])
+    })
+  }
+  return false
+}
 </script>
 
 <template>
   <view class="flex items-center gap-1">
+    <view v-if="props.rowActions" class="flex gap-1">
+      <wd-button v-for="subitem in anctions" :key="subitem.id" plain size="small" @click="action(subitem)">
+        {{ subitem.title }}
+      </wd-button>
+    </view>
+
     <wd-button v-if="props.item.buttons.includes('dtmplEdit')" size="small" @click="edit()">
       编辑
     </wd-button>
     <wd-button v-if="props.item.buttons.includes('detail')" size="small" type="info" @click="detail()">
       详情
     </wd-button>
+    <ActionPopup v-model:show="actionItemShow" :zpaging="props.zpaging" :field-group="actionItem" :code="props.code" />
   </view>
 </template>

package/components/form-control/form-control.vue

@@ -1,10 +1,9 @@
 <script lang="ts" setup>
-import { computed, defineEmits, defineExpose, defineOptions, defineProps, onBeforeMount, onMounted, reactive, ref, toRaw } from 'vue'
+import { computed, defineExpose, defineOptions, defineProps, onBeforeMount, ref, toRaw } from 'vue'
 import type { FormRules } from 'wot-design-uni/components/wd-form/types'
 import dayjs from 'dayjs/esm/index'
 import type { Enums, Fields, Groups } from '../../type'
 import mulselectPicker from '../mulselect-picker/mulselect-picker.vue'
-import TreeSelectControl from '../tree-select/index.vue'
 // import SelectColPicker from '../select-col-picker/select-col-picker.vue'
 // import { enums } from '../../api/page'
 defineOptions({

package/components/list/list.vue

@@ -1,8 +1,6 @@
 <script lang="ts" setup>
-import { computed, defineOptions, defineProps, onMounted, reactive, ref } from 'vue'
+import { defineOptions, ref } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
-import { useRouter } from 'uni-mini-router'
-import { useManualTheme } from '../../composables/useManualTheme'
 import { enums, listData, pageConfig, pageKey } from '../../api/page'
 import foldCard from '../fold-card/fold-card.vue'
 import type { Config, Entities, Enums } from '../../type'
@@ -47,6 +45,8 @@ const config = ref<Config>({
   pointSourceId: '',
   mstrucId: '',
   relationNames: [],
+  readOnly: false,
+  displayConfig: [],
 })
 const sourceId = ref('')
 const datas = ref<Entities[]>([])
@@ -156,7 +156,7 @@ function submitSearch(data: any) {
     <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 :source-id="sourceId" :item="config" :code="item.code" :page-type="pageType" :data="item" />
+        <CardBotomButtons :zpaging="Zpaging" :row-actions="config.rowActions" :source-id="sourceId" :item="config" :code="item.code" :page-type="pageType" :data="item" />
       </template>
     </foldCard>
     <template #bottom>

package/components/login/login.vue

@@ -11,7 +11,7 @@ defineProps<{
 </script>
 
 <template>
-  <view class="h-[calc(100vh-44px)] flex flex-col bg-white">
+  <view class="h-[calc(100vh-44px)] flex flex-col bg-#4E7FFF .dark:bg-[--wot-dark-background9]">
     <!-- <view class="flex flex-col items-center justify-center pa-3 pb-5">
       <wd-img :width="100" :height="100" round :src="loginlog" />
       <view class="text-center">
@@ -20,10 +20,10 @@ defineProps<{
         </text>
       </view>
     </view> -->
-    <view class="flex items-center justify-center bg-#4E7FFF">
-      <image class="h-200px w-200px" src="./footerImg.png" />
+    <view class="flex items-center justify-center">
+      <image class="h-250px w-250px" src="./footerImg.png" />
     </view>
-    <view class="flex-1 border-rd-2 p-y-2">
+    <view class="flex-1 border-rd-t-2 p-y-2 .dark:bg-[--wot-dark-background2] .light:bg-white">
       <LoginForm />
     </view>
   </view>

package/package.json

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

package/type.ts

@@ -5,6 +5,16 @@ export interface Columns {
   sourceId: string
   mstrucId: string
   title?: string
+
+}
+
+// 动作按钮配置
+export interface rowActions {
+  id: string
+  beforeExeConfirm: string
+  title: string
+  writes: Fields[]
+  preposes: Fields[]
 }
 
 // 列表页面配置
@@ -15,6 +25,7 @@ export interface Config extends Groups {
   secondColumn: Columns
   criterias: Fields[]
   labelColumn?: Columns
+  rowActions?: rowActions[]
 }
 
 // 列表数据