w-ui-v1 1.0.29 → 1.0.30

package/package.json

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

package/w-add/w-add.vue

@@ -1,3 +1,11 @@
+<script lang="ts">
+//在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
+export default {
+    options: {
+        styleIsolation: 'shared'//使css :deep()生效
+    }
+}
+</script>
 <template>
     <view>
         <view v-if="loading" style="height: 100px;display: flex;justify-content: center;align-items: center;">
@@ -5,8 +13,8 @@
         </view>
         <view v-else>
             <wd-collapse v-model="value">
-                <wd-collapse-item :title="item.title" :name="item.id" v-for="(item, index) in pageConf.groups"
-                    :key="index">
+                <wd-collapse-item custom-body-class="collapse-custom-class" :title="item.title" :name="item.id"
+                    v-for="(item, index) in pageConf.groups" :key="index">
                     <view v-if="item.type === 'fieldGroup'">
                         <wd-form ref="form" :model="model">
                             <wd-cell-group v-for="(subItem, subIndex) in item.fields" :key="subIndex">
@@ -22,18 +30,24 @@
                             <wd-button v-if="item.buttons.includes('selectAdd')" hairline type="info" size="small"
                                 icon="add" @click="selectrow(item)">选择</wd-button>
                             <wd-button v-if="item.buttons.includes('dtmplAdd')" hairline type="info" size="small"
-                                icon="add" @click="addrow(item.id)">新增</wd-button>
+                                icon="add" @click="add(item)">新增</wd-button>
+                        </view>
+
+                        <view v-if="relationLoading[item.id]"
+                            style="height: 100px;display: flex;justify-content: center;align-items: center;">
+                            <wd-loading />
                         </view>
 
                         <!-- 卡片 -->
-                        <view class="card-list" >
-                            <w-card v-for="(subitem, index) in selectData[item.id]" :key="index" :car-index="index" :page="{
-                                rowActions:item.rowActions||[],
-                                buttons:item.buttons||[],
-                                ractions:item.ractions||[],
-                                columns:item.fields||[]
-                            }"
-                            :item-data="subitem" :source-id="item.pointSourceId" />
+                        <view v-else class="card-list">
+                            <w-card @delet="() => { deletItem(item, subitem, subindex) }" :actionType="item.type"
+                                v-for="(subitem, subindex) in selectData[item.id]" :key="subindex" :car-index="subindex"
+                                :page="{
+                                    rowActions: item.rowActions || [],
+                                    buttons: item.buttons || [],
+                                    ractions: item.ractions || [],
+                                    columns: item.fields || []
+                                }" :item-data="subitem" :source-id="item.pointSourceId" />
                         </view>
 
                         <view class="row-add" v-if="item.buttons.includes('rowAdd')">
@@ -56,7 +70,7 @@
 import wCard from '../w-card/w-card.vue'
 import wFromControl from '../w-form-control/w-form-control.vue'
 import { onLoad, onUnload } from '@dcloudio/uni-app'
-import { ref, defineProps, reactive } from 'vue';
+import { ref, defineProps, reactive, watch } from 'vue';
 import {
     addPageConfig,
     getEnum,
@@ -86,7 +100,7 @@ const relationID = ref('')
 const modelsRef = {
 
 }
-
+const relationLoading = reactive({})
 const checkboxvalue = ref([])
 const loading = ref(false)
 const value = ref([])
@@ -99,19 +113,35 @@ onLoad((option: any) => {
     //监听勾选列表页面事件
     uni.$on('getCheckData', function (data: any) {
         checkboxvalue.value = data.checkData
-        //获取勾选数据
-        let codes = ''
-        checkboxvalue.value.forEach((item: any) => {
-            codes += `codes=${item}&`
-        })
-        getSelectDataPxoy(codes)
+    })
+
+    //监听添加数据完成事件
+    uni.$on('addDataSAC', function (data: any) {
+        console.log(data,'addDataSAC')
+        checkboxvalue.value.push(data.entityCode)
     })
 })
+
+watch(checkboxvalue, (value) => {
+    if (value.length === 0) return
+    //获取勾选数据
+    let codes = ''
+    value.forEach((item: any) => {
+        codes += `codes=${item}&`
+    })
+    getSelectDataPxoy(codes)
+}, {
+    immediate: false
+})
+
 onUnload(() => {
     // 取消监听勾选列表页面事件
     uni.$off('getCheckData')
+    // 取消监听添加数据完成事件
+    uni.$off('addDataSAC')
 })
 
+// 获取页面配置
 function getPageConfig() {
     loading.value = true
     addPageConfig(sourceId.value).then((res: any) => {
@@ -123,12 +153,11 @@ function getPageConfig() {
             value.value.push(item.id)
             if (item.type === 'relation') {
                 let t = []
-                // item.fields.forEach((subItem: any) => {
-                //     t[0][subItem.id] = subItem.defaultValue || ''
-                // })
                 relation[item.id] = t
-                relation[`${item.id}.$$flag$$`] = true
+                relationLoading[item.id] = false
             }
+
+
             if (item.type === 'fieldGroup') {
 
                 item.fields.forEach((subItem: any) => {
@@ -169,6 +198,7 @@ async function getEnumer() {
 
 //保存
 async function handleSubmit() {
+
     form.value[0]
         .validate()
         .then(async ({ valid, errors }) => {
@@ -177,12 +207,32 @@ async function handleSubmit() {
                     message: '保存中...',
                     duration: 0
                 })
+                let data = {}
+                pageConf.value.groups?.forEach((item: any) => {
+                    if (item.type === 'fieldGroup') {
+                        item.fields?.forEach((subItem: any) => {
+                            data[subItem.id] = model.value[subItem.id]
+                        })
+                    }
+
+                    if (item.type === 'relation') {
+                        data[`${item.id}.$$flag$$`] = true
+                        model.value[item.id]?.forEach((subItem: any, index: number) => {
+                            data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
+                            data[`${item.id}[${index}].唯一编码`] = subItem
+                        })
+                    }
+                })
 
                 try {
-                    const res = await addPageDataSave(sourceId.value, model.value)
+                    const res = await addPageDataSave(sourceId.value, data)
                     if (res.data.status === 'success') {
                         toast.success("保存成功")
-                        uni.navigateBack()
+                        uni.navigateBack({
+                            success: () => {
+                                uni.$emit('addDataSAC', { entityCode:res.data.entityCode,sourceId:res.data.sourceId })
+                            }
+                        })
                     } else {
                         toast.error(res.data.message || '保存失败"')
                     }
@@ -204,15 +254,42 @@ async function handleSubmit() {
 function selectrow(item: any) {
     relationID.value = item.id
     pointSourceId.value = item.pointSourceId
+    let data = selectData.value[relationID.value]?.map((item) => {
+        return item.code
+    })
     uni.navigateTo({
-        url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`
+        url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`,
+        success: () => {
+            uni.$emit('checkeDData', { checkData: data || [] })
+        }
     })
 }
 const selectData = ref({})
 //获取勾选数据
 async function getSelectDataPxoy(codes: string) {
+    relationLoading[relationID.value] = true
     const res = await getSelectData(relationID.value, codes)
     selectData.value[relationID.value] = res.data.entities
+    model.value[relationID.value] = selectData.value[relationID.value].map((item: any) => {
+        return item.code
+    })
+    relationLoading[relationID.value] = false
+}
+
+//删除勾选数据
+const deletItem = (item: any, subitem: any, index: any) => {
+    selectData.value[item.id].splice(index, 1)
+    let data = selectData.value[item.id].map((item: any) => {
+        return item.code
+    })
+    checkboxvalue.value = data || []
+}
+
+//新增
+const add=(item:any)=>{
+    uni.navigateTo({
+        url: `/pages/add/add?sourceId=${item.pointSourceId}`,
+    })
 }
 
 
@@ -258,8 +335,14 @@ function remove(key: any, index: any, title: string) {
 
 .row-add {
     // background-color: #fff;
-    // margin: 0 0 8px 0;
+    padding: 8px 0;
     display: flex;
     justify-content: center;
+    gap: 5px;
+}
+
+:deep(.collapse-custom-class) {
+    background-color: #F6F7FB;
+    padding: 0.5px 0 !important;
 }
 </style>

package/w-card/w-card.vue

@@ -9,7 +9,7 @@ import {
 import { hasY, getValue, downloadFile } from './utils/utils'
 import { deletePageData } from '../utils/apis/pageConfig'
 import { useMessage, useToast } from 'wot-design-uni'
-const emits = defineEmits(['refresh'])
+const emits = defineEmits(['refresh', 'delet'])
 const toast = useToast()
 const message = useMessage()
 const props = defineProps({
@@ -29,6 +29,10 @@ const props = defineProps({
     type: String,
     required: true,
   },
+  applicationType: {
+    type: String,
+    default: ''
+  }
 })
 
 //更多按钮
@@ -56,7 +60,7 @@ const moreBtns = computed(() => {
 
   props.page.ractions?.forEach((item: any) => {
     data.push({
-      actionType:"openPage",
+      actionType: "openPage",
       name: item.title,
       color: '#4D81F1',
       ...item
@@ -142,6 +146,13 @@ function goto(type: string, item: any = {}, subItem: string = '') {
 
 }
 
+//删除勾选项
+const delerelation = () => {
+  if (props.actionType === 'relation') {
+    emits('delet')
+  }
+}
+
 //删除
 const dele = () => {
   message
@@ -208,10 +219,10 @@ const actionBtn = (item: any) => {
           <wd-text type="primary" @click="downloadFile(item.content.url)" :text="item.content?.name" />
         </view>
 
-        <audio style="width: 50px;" v-else-if="item.content?.type === '音频'" :src="item.content?.url" :author="item.content?.author"
-          :name="item.content?.name" controls></audio>
+        <audio style="width: 50px;" v-else-if="item.content?.type === '音频'" :src="item.content?.url"
+          :author="item.content?.author" :name="item.content?.name" controls></audio>
 
-          <!-- <audio style="width: 50px;" v-else-if="item.controlType==='file'" :src="item.content" 
+        <!-- <audio style="width: 50px;" v-else-if="item.controlType==='file'" :src="item.content" 
           controls></audio> -->
 
 
@@ -235,8 +246,12 @@ const actionBtn = (item: any) => {
           @click="goto('edit')">
           编辑
         </wd-button>
+        <wd-button size="small" class="btn" plain type="error" @click="delerelation"
+          v-if="props.actionType === 'relation'">
+          删除
+        </wd-button>
         <wd-button size="small" class="btn" plain type="error" @click="dele"
-          v-if="props.page.buttons.includes('singleDelete')">
+          v-else-if="props.page.buttons.includes('singleDelete')">
           删除
         </wd-button>
         <view v-if="moreBtns.length > 0">

package/w-edit/w-edit.vue

@@ -1,3 +1,11 @@
+<script lang="ts">
+//在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
+export default {
+    options: {
+        styleIsolation: 'shared'//使css :deep()生效
+    }
+}
+</script>
 <template>
     <view>
         <view v-if="loading" style="height: 100px;display: flex;justify-content: center;align-items: center;">
@@ -5,7 +13,7 @@
         </view>
         <view v-else>
         <wd-collapse v-model="value" >
-            <wd-collapse-item :title="item.title" :name="item.id" v-for="(item, index) in pageConf.groups" :key="index">
+            <wd-collapse-item custom-body-class="collapse-custom-class" :title="item.title" :name="item.id" v-for="(item, index) in pageConf.groups" :key="index">
                 <view
                     v-if="item.type === 'fieldGroup'">
                     <wd-form ref="form" :model="model">
@@ -17,36 +25,33 @@
                    
                 </view>
                 <view v-if="item.type === 'relation'">
-                    <view v-if="item.pointSourceId">
-                        <view class="row-add" v-if="item.buttons.includes('selectAdd')">
-                            <wd-button hairline type="info" size="small" icon="add"
-                                @click="selectrow(item)">选择</wd-button>
+                    <view class="row-add">
+                            <wd-button v-if="item.buttons.includes('selectAdd')" hairline type="info" size="small"
+                                icon="add" @click="selectrow(item)">选择</wd-button>
+                            <wd-button v-if="item.buttons.includes('dtmplAdd')" hairline type="info" size="small"
+                                icon="add" @click="addrow(item.id)">新增</wd-button>
                         </view>
-                    </view>
-                    <view v-else>
-                        <wd-card style="box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 17px 0px;margin: 0 0 10px 0;"
-                            v-for="(PItem, PIndex) in model[item.id]">
-                            <template #title>
-                                <view style="display: flex;justify-content: flex-end;">
-                                    <wd-button size="small" type="icon" icon="delete"
-                                        @click="remove(item.id, PIndex, item.title)"></wd-button>
-                                </view>
-                            </template>
-                            <wd-form :ref="item.id" :model="PItem">
-                                <wd-cell-group v-for="(subItem, subIndex) in item.fields" :key="subIndex">
-                                    <wFromControl :subItem="subItem" :model="PItem" :Enumcolumn="Enumcolumn" v-model:model-value="PItem[subItem.id]"/>
-                                </wd-cell-group>
-
-                            </wd-form>
-                            <template #footer>
-
-                            </template>
-                        </wd-card>
+
+                        <view v-if="relationLoading[item.id]"
+                            style="height: 100px;display: flex;justify-content: center;align-items: center;">
+                            <wd-loading />
+                        </view>
+
+                        <!-- 卡片 -->
+                        <view v-else class="card-list">
+                            <w-card v-for="(subitem, index) in selectData[item.id]" :key="index" :car-index="index"
+                                :page="{
+                                    rowActions: item.rowActions || [],
+                                    buttons: item.buttons || [],
+                                    ractions: item.ractions || [],
+                                    columns: item.fields || []
+                                }" :item-data="subitem" :source-id="item.pointSourceId" />
+                        </view>
+
                         <view class="row-add" v-if="item.buttons.includes('rowAdd')">
                             <wd-button hairline type="info" size="small" icon="add"
                                 @click="addrow(item.id)">加一条</wd-button>
                         </view>
-                    </view>
 
                 </view>
 
@@ -73,14 +78,16 @@
 </template>
 
 <script setup lang="ts">
+import wCard from '../w-card/w-card.vue'
 import wFromControl from '../w-form-control/w-form-control.vue'
 import WSelectTable from '../w-table/w-selectTable.vue';
-import { onLoad } from '@dcloudio/uni-app'
-import { ref, defineProps, reactive } from 'vue';
+import { onLoad ,onUnload} from '@dcloudio/uni-app'
+import { ref, defineProps, reactive ,watch} from 'vue';
 import {
     editPageConfig,
     getEnum,
-    addPageDataSave
+    addPageDataSave,
+    getSelectData
 } from '../utils/apis/pageConfig'
 import { useMessage } from 'wot-design-uni'
 import dayjs from 'dayjs/esm/index'
@@ -112,13 +119,35 @@ const value = ref([])
 const Enumcolumn = ref({})
 const showSelectRow = ref(false)
 const pointSourceId = ref('')
+const relationLoading = reactive({})
+const checkboxvalue = ref([])
+const relationID = ref('')
+const selectData = ref({})
 onLoad((option: any) => {
     sourceId.value = props.sourceId || option.sourceId
     code.value = props.code|| option.code
     getPageConfig()
+     //监听勾选列表页面事件
+     uni.$on('getCheckData', function (data: any) {
+        checkboxvalue.value = data.checkData
+    })
 })
-
-
+watch(checkboxvalue, (value) => {
+    if (value.length === 0) return
+    //获取勾选数据
+    let codes = ''
+    value.forEach((item: any) => {
+        codes += `codes=${item}&`
+    })
+    getSelectDataPxoy(codes)
+}, {
+    immediate: false
+})
+onUnload(() => {
+    // 取消监听勾选列表页面事件
+    uni.$off('getCheckData')
+})
+//获取页面配置
 function getPageConfig() {
     loading.value = true
     editPageConfig(sourceId.value,code.value).then((res: any) => {
@@ -129,8 +158,10 @@ function getPageConfig() {
             value.value.push(item.id)
             if (item.type === 'relation') {
                 let t = []
-             
+                t=res.data.dtmplConfig.entity?.arrayMap[item.id]?.map((item:any)=>item.code)
                 relation[item.id] = t
+                relationLoading[item.id] = false
+                selectData.value[item.id] = res.data.dtmplConfig.entity?.arrayMap[item.id] || []
             }
             if (item.type === 'fieldGroup') {
                 item.fields.forEach((subItem: any) => {
@@ -142,7 +173,8 @@ function getPageConfig() {
         })
         model.value = {
             ...relation,
-            ...fieldGroup//一般为基本信息
+            ...fieldGroup,//一般为基本信息
+            唯一编码:res.data.dtmplConfig.entity?.code
         }
         getEnumer()
         loading.value = false
@@ -164,7 +196,16 @@ async function getEnumer() {
     Enumcolumn.value = res.data?.enumMap || {}
 }
 
-
+//获取勾选数据
+async function getSelectDataPxoy(codes: string) {
+    relationLoading[relationID.value] = true
+    const res = await getSelectData(relationID.value, codes)
+    selectData.value[relationID.value] = res.data.entities
+    model.value[relationID.value] = selectData.value[relationID.value].map((item: any) => {
+        return item.code
+    })
+    relationLoading[relationID.value] = false
+}
 //保存
 async function handleSubmit() {
     form.value[0]
@@ -175,9 +216,25 @@ async function handleSubmit() {
                     message: '保存中...',
                     duration: 0
                 })
-               
+                let data = {}
+                pageConf.value.groups?.forEach((item: any) => {
+                    if (item.type === 'fieldGroup') {
+                        item.fields?.forEach((subItem: any) => {
+                            data[subItem.id] = model.value[subItem.id]
+                        })
+                    }
+
+                    if (item.type === 'relation') {
+                        data[`${item.id}.$$flag$$`] = true
+                        model.value[item.id]?.forEach((subItem: any, index: number) => {
+                            data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
+                            data[`${item.id}[${index}].唯一编码`] = subItem
+                        })
+                    }
+                })
+                data['唯一编码']=model.value['唯一编码']
                 try {
-                    const res = await addPageDataSave(sourceId.value, model.value)
+                    const res = await addPageDataSave(sourceId.value, data)
                     if (res.data.status==='success'){
                         toast.success("保存成功")
                           uni.navigateBack()
@@ -200,8 +257,17 @@ async function handleSubmit() {
 
 //选择数据
 function selectrow(item: any) {
+    relationID.value = item.id
     pointSourceId.value = item.pointSourceId
-    showSelectRow.value = true
+    let data=selectData.value[relationID.value]?.map((item)=>{
+        return item.code
+    })
+    uni.navigateTo({
+        url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`,
+        success: () => {
+            uni.$emit('checkeDData', { checkData: data||[] })
+        }
+    })
 }
 
 //新加一行
@@ -246,8 +312,14 @@ function remove(key: any, index: any, title: string) {
 
 .row-add {
     // background-color: #fff;
-    // margin: 0 0 8px 0;
+    padding: 8px 0;
     display: flex;
     justify-content: center;
+    gap: 5px;
+}
+
+:deep(.collapse-custom-class) {
+    background-color: #F6F7FB;
+    padding: 0.5px 0 !important;
 }
 </style>

package/w-table/w-selectTable.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad,onUnload } from '@dcloudio/uni-app'
 import {
   computed,
   ref,
@@ -13,6 +13,7 @@ import {
 
 } from '../utils/apis/pageConfig'
 import wCard from '../w-card/w-card.vue'
+import {getValue} from '../w-card/utils/utils'
 import wSearch from '../w-search/w-search.vue'
 defineOptions({
   name: 'WSelectTable',
@@ -34,6 +35,15 @@ const pageData = ref<{
 onLoad((option: any) => {
   sourceId.value = props.sourceId || option.sourceId
   getPageConfig()
+  //监听页
+  uni.$on('checkeDData', function (data: any) {
+    console.log('checkeDData', data)
+    checkboxvalue.value = data.checkData
+  })
+})
+
+onUnload(()=>{
+  uni.$off('checkeDData')
 })
 
 watch(() => props.sourceId, (value) => {
@@ -55,7 +65,7 @@ const checkData = computed(() => {
       }) 
         if(it){
           data.push({
-            label:it.fieldMap[pageData.value.primaryColumn.id],
+            label:getValue(it.fieldMap[pageData.value.primaryColumn.id]),
             value:it.code
           })
         }