w-ui-v1 1.0.28 → 1.0.29

package/package.json

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

package/utils/apis/pageConfig.ts

@@ -54,9 +54,9 @@ export function editPageConfig(sourceId: string,code: string) {
 
 
 // 获取页面数据key
-export function getPageKey(sourceId: string, query: string='') {
+export function getPageKey(sourceId: string,mainCode:string='', query: string='') {
   return request({
-    url: `/v3/ltmpl/query/key?sourceId=${sourceId}&menuId=${sourceId}&${query}`,
+    url: `/v3/ltmpl/query/key?sourceId=${sourceId}&mainCode=${mainCode}&menuId=${sourceId}&${query}`,
   })
 }
 
@@ -102,4 +102,11 @@ export function customButtonSave(sourceId: string,codes:string, data: any) {
       ...data
     }
   })
+}
+
+//获取勾选数据
+export function getSelectData(sourceId: string,codes:string) {
+  return request({
+    url: `/v3/field-group/data/selected?sourceId=${sourceId}&${codes}`,
+  })
 }

package/w-add/w-add.vue

@@ -4,73 +4,64 @@
             <wd-loading />
         </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">
-                <view
-                    v-if="item.type === 'fieldGroup'">
-                    <wd-form ref="form" :model="model">
-                        <wd-cell-group v-for="(subItem, subIndex) in item.fields" :key="subIndex">
-                              <wFromControl :subItem="subItem" :model="model" :Enumcolumn="Enumcolumn" v-model:model-value="model[subItem.id]"/>
-                        </wd-cell-group>
-
-                    </wd-form>
-                   
-                </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>
+            <wd-collapse v-model="value">
+                <wd-collapse-item :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">
+                                <wFromControl :subItem="subItem" :model="model" :Enumcolumn="Enumcolumn"
+                                    v-model:model-value="model[subItem.id]" />
+                            </wd-cell-group>
+
+                        </wd-form>
+
                     </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="item.type === 'relation'">
+                        <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 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>
-
-
-            </wd-collapse-item>
-        </wd-collapse>
-        <view class="footer-button">
-            <wd-button block @click="handleSubmit" icon="save">保存</wd-button>
+                </wd-collapse-item>
+            </wd-collapse>
+            <view class="footer-button">
+                <wd-button block @click="handleSubmit" icon="save">保存</wd-button>
+            </view>
         </view>
-    </view>
         <wd-message-box />
         <wd-toast />
     </view>
 </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 { onLoad, onUnload } from '@dcloudio/uni-app'
 import { ref, defineProps, reactive } from 'vue';
 import {
     addPageConfig,
     getEnum,
-    addPageDataSave
+    addPageDataSave,
+    getSelectData
 } from '../utils/apis/pageConfig'
 import { useMessage } from 'wot-design-uni'
 import { useToast } from 'wot-design-uni'
@@ -91,9 +82,12 @@ const pageConf = ref({ groups: [] })
 const form = ref()//基本数据表单
 //表单数据
 const model = ref({})
-const modelsRef={
-      
+const relationID = ref('')
+const modelsRef = {
+
 }
+
+const checkboxvalue = ref([])
 const loading = ref(false)
 const value = ref([])
 const Enumcolumn = ref({})
@@ -101,6 +95,21 @@ const pointSourceId = ref('')
 onLoad((option: any) => {
     sourceId.value = props.sourceId || option.sourceId
     getPageConfig()
+
+    //监听勾选列表页面事件
+    uni.$on('getCheckData', function (data: any) {
+        checkboxvalue.value = data.checkData
+        //获取勾选数据
+        let codes = ''
+        checkboxvalue.value.forEach((item: any) => {
+            codes += `codes=${item}&`
+        })
+        getSelectDataPxoy(codes)
+    })
+})
+onUnload(() => {
+    // 取消监听勾选列表页面事件
+    uni.$off('getCheckData')
 })
 
 function getPageConfig() {
@@ -118,6 +127,7 @@ function getPageConfig() {
                 //     t[0][subItem.id] = subItem.defaultValue || ''
                 // })
                 relation[item.id] = t
+                relation[`${item.id}.$$flag$$`] = true
             }
             if (item.type === 'fieldGroup') {
 
@@ -167,21 +177,21 @@ async function handleSubmit() {
                     message: '保存中...',
                     duration: 0
                 })
-               
+
                 try {
                     const res = await addPageDataSave(sourceId.value, model.value)
-                    if (res.data.status==='success'){
+                    if (res.data.status === 'success') {
                         toast.success("保存成功")
-                          uni.navigateBack()
-                    }else{
-                        toast.error(res.data.message||'保存失败"')
+                        uni.navigateBack()
+                    } else {
+                        toast.error(res.data.message || '保存失败"')
                     }
-                        
+
                 } catch (error) {
                     toast.error(error)
                 }
 
-              
+
             }
         })
         .catch((error) => {
@@ -190,13 +200,21 @@ async function handleSubmit() {
 
 }
 
-//选择数据
+//跳转勾选页面数据
 function selectrow(item: any) {
+    relationID.value = item.id
     pointSourceId.value = item.pointSourceId
     uni.navigateTo({
         url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`
     })
 }
+const selectData = ref({})
+//获取勾选数据
+async function getSelectDataPxoy(codes: string) {
+    const res = await getSelectData(relationID.value, codes)
+    selectData.value[relationID.value] = res.data.entities
+}
+
 
 //新加一行
 function addrow(key: any) {

package/w-card/utils/utils.ts

@@ -47,7 +47,7 @@ export function getValue(content: any, title: any): any {
     }
 
     //文件链接
-    if (obj.base?.path && (obj.base?.type.includes('docx')|| obj.base?.type.includes('txt'))) {
+    if (obj.base?.path && (obj.base?.type.includes('docx')|| obj.base?.type.includes('txt')|| obj.base?.type.includes('dat'))) {
 
       return {
         url: `${baseUrl}/v3/files${obj.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`,

package/w-card/w-card.vue

@@ -77,6 +77,7 @@ const items = computed(() => {
   }).map((item: any) => {
     return {
       title: item.title,
+      controlType: item.controlType,
       content: getValue(props.itemData?.fieldMap[item.id], item.title),
       data: props.itemData?.fieldMap[item.id],
       id: item.id,
@@ -134,7 +135,7 @@ function goto(type: string, item: any = {}, subItem: string = '') {
       break
     case 'openPage':
       uni.navigateTo({
-        url: `/pages/table/table?sourceId=${item.id}&pageTitle=${item.title}`,
+        url: `/pages/table/table?sourceId=${item.id}&pageTitle=${item.title}&mainCode=${props.itemData.code}`,
       })
       break
   }
@@ -207,9 +208,13 @@ const actionBtn = (item: any) => {
           <wd-text type="primary" @click="downloadFile(item.content.url)" :text="item.content?.name" />
         </view>
 
-        <audio v-else-if="item.content?.type === '音频'" :src="item.content?.url" :author="item.content?.author"
+        <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" 
+          controls></audio> -->
+
+
         <view v-else class="value">
           {{ item.content }}
         </view>

package/w-detail/w-detail.vue

@@ -1,14 +1,14 @@
 <script lang="ts">
 //在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
 export default {
-  options: {
-    styleIsolation: 'shared'//使css :deep()生效
-  }
+	options: {
+		styleIsolation: 'shared'//使css :deep()生效
+	}
 }
 </script>
 <script setup lang="ts">
 import { onLoad } from '@dcloudio/uni-app'
-import { getValue ,downloadFile} from '../w-card/utils/utils'
+import { getValue, downloadFile } from '../w-card/utils/utils'
 import {
 	computed,
 	ref,
@@ -73,40 +73,39 @@ function goto(PItem: any, item: any) {
 			<wd-loading />
 		</view>
 		<wd-collapse v-model="value" v-else>
-			<wd-collapse-item custom-body-class="collapse-custom-class" :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">
+
 				<wd-card title=" " v-if="item.type === 'fieldGroup'" custom-class="card-custom-class">
 					<view v-for="(subItem, subIndex) in item.fields" :key='subIndex' style='margin-bottom: 8px;'>
-						<wd-row v-if="!subItem.hidden">
-							<wd-col :span="6">
-								<view class="label">
-									{{ subItem.title }}:
-								</view>
-							</wd-col>
-							<wd-col :span="18">
-								<wd-img
-									v-if="getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.type === '图片'"
-									width="100rpx" height="100rpx"
-									:src="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).url"
-									:enable-preview="true" />
-									<view
-										v-else-if="getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.type === '文件'"
-										class="value">
-										<wd-text type="primary"
-											@click="downloadFile(getValue(pageData.fieldMap[subItem.sourceId], subItem.title).url)"
-											:text="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).name" />
-									</view>
-									<audio
-										v-else-if="getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.type === '音频'"
-										:src="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).url"
-										:author="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).author"
-										:name="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).name"
-										controls></audio>
-								<view v-else class="value">
-									{{ getValue(pageData.fieldMap[subItem.sourceId], subItem.title) }}
-								</view>
-							</wd-col>
-						</wd-row>
+						<view v-if="!subItem.hidden" class="row">
+
+							<view class="label">
+								{{ subItem.title }}:
+							</view>
+
+							<wd-img v-if="getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.type === '图片'"
+								width="100rpx" height="100rpx"
+								:src="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).url"
+								:enable-preview="true" />
+							<view
+								v-else-if="getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.type === '文件'"
+								class="value">
+								<wd-text type="primary"
+									@click="downloadFile(getValue(pageData.fieldMap[subItem.sourceId], subItem.title).url)"
+									:text="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).name" />
+							</view>
+							<audio
+								v-else-if="getValue(pageData.fieldMap[subItem.sourceId], subItem.title)?.type === '音频'"
+								:src="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).url"
+								:author="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).author"
+								:name="getValue(pageData.fieldMap[subItem.sourceId], subItem.title).name"
+								controls></audio>
+							<view v-else class="value">
+								{{ getValue(pageData.fieldMap[subItem.sourceId], subItem.title) }}
+							</view>
+
+						</view>
 					</view>
 
 					<template #footer>
@@ -114,17 +113,17 @@ function goto(PItem: any, item: any) {
 							v-if="item.buttons.includes('detail')">详情</wd-button>
 					</template>
 				</wd-card>
-			
+
 				<view v-if="item.type === 'relation'">
-					<wd-card custom-class="card-custom-class" title=" " v-for="(PItem, PIndex) in pageData.arrayMap[item.id]" :key="PIndex">
+					<wd-card custom-class="card-custom-class-relation" title=" "
+						v-for="(PItem, PIndex) in pageData.arrayMap[item.id]" :key="PIndex">
 						<view v-for="(subItem, subIndex) in item.fields" :key='subIndex' style='margin-bottom: 8px;'>
-							<wd-row v-if="!subItem.hidden">
-								<wd-col :span="6">
+							<view v-if="!subItem.hidden" class="row">
+								
 									<view class="label">
 										{{ subItem.title }}:
 									</view>
-								</wd-col>
-								<wd-col :span="18">
+								
 									<wd-img
 										v-if="getValue(PItem.fieldMap[subItem.sourceId], subItem.title)?.type === '图片'"
 										width="100rpx" height="100rpx"
@@ -146,8 +145,8 @@ function goto(PItem: any, item: any) {
 									<view v-else class="value">
 										{{ getValue(PItem.fieldMap[subItem.sourceId], subItem.title) }}
 									</view>
-								</wd-col>
-							</wd-row>
+								
+							</view>
 						</view>
 
 						<template #footer>
@@ -164,24 +163,33 @@ function goto(PItem: any, item: any) {
 </template>
 
 <style scoped lang="scss">
-.label {
-	//文字换行
-	white-space: normal;
-	word-break: break-all;
-}
+.row {
+	display: flex;
+
+	.label {
+		//文字换行
+		white-space: normal;
+		word-break: break-all;
+		margin-right: 20rpx;
+	}
 
-.value {
-	//文字换行
-	white-space: normal;
-	word-break: break-all;
-	color: #333;
+	.value {
+		//文字换行
+		white-space: normal;
+		word-break: break-all;
+		color: #333;
+	}
 }
 
-:deep(.card-custom-class){
+
+:deep(.card-custom-class) {
 	margin: 0 !important;
 }
+:deep(.card-custom-class-relation){
+	margin: 0 0 8px 0 !important;
+}
 
-:deep(.collapse-custom-class){
-	background-color:#F6F7FB ;
+:deep(.collapse-custom-class) {
+	background-color: #F6F7FB;
 }
 </style>

package/w-search/w-search.vue

@@ -9,7 +9,7 @@
           <wd-drop-menu-item ref="dropMenu" title="搜索" @opened="handleOpened">
             <view v-for="(item, index) in props.criterias" :key="index">
               <wSelectPicker :model-value="searchData[item.sourceId] ? searchData[item.sourceId].value : ''"
-                v-if="item.extControlType === 'relselectvalue'" type="radio"
+                v-if="item.extControlType === 'relselectvalue' || item.extControlType === 'entity-select'" type="radio"
                 @confirm="(e) => { searchData[item.sourceId] = e.selectedItems }" :label="item.title"
                 :placeholder="`请选择${item.title}`" :source-id="item.sourceId" filterable />
               <wd-input v-else-if="item.extControlType === 'text'" type="text" :label="item.title"
@@ -28,8 +28,8 @@
                   :label="item.title" v-model="searchData[item.sourceId]" clearable />
               </view>
 
-              <wd-input v-else type="text" :label="item.title"
-                v-model="searchData[item.sourceId]" :placeholder="`请输入${item.title}`" clearable />
+              <wd-input v-else type="text" :label="item.title" v-model="searchData[item.sourceId]"
+                :placeholder="`请输入${item.title}`" clearable />
             </view>
             <view class="search-btn">
               <wd-button size="small" icon="refresh" @click="clear" type="info">重置</wd-button>
@@ -76,9 +76,6 @@ onBeforeMount(() => {
       case 'daterange':
         data[`${item.sourceId}`] = []
         break;
-      case 'relselectvalue':
-        data[`${item.sourceId}`] = ''
-        break;
       default:
         data[`${item.sourceId}`] = ''
     }
@@ -116,6 +113,7 @@ const search = () => {
               d = `c_${key}=${dayjs(element).format('YYYY-MM-DD HH')}`
               data.push(d)
               break;
+            case 'entity-select':
             case 'relselectvalue':
               console.log(element)
               d = `c_${key}=${element.label}`
@@ -149,7 +147,7 @@ const clear = () => {
 async function getEnumer() {
   let params = []
   props.criterias.forEach((item: any) => {
-    if (item.controlType === 'select') {
+    if (item.extControlType === 'select') {
       params.push(`mstrucIds=${item.mstrucId}`)
     }
 

package/w-table/w-selectTable.vue

@@ -26,6 +26,7 @@ const props = defineProps({
 const query = ref('')
 const sourceId = ref('')
 const radiovalue = ref()
+const checkboxvalue = ref([])
 const pageData = ref<{
   criterias: []
   buttons: string[]
@@ -44,6 +45,33 @@ watch(() => props.sourceId, (value) => {
   immediate: false
 })
 
+//选择的数据
+const checkData = computed(() => {
+  let data=[]
+   checkboxvalue.value.forEach((item:any)=>{
+    let it=dataList.value.find((subitem:any)=>{
+      
+          return subitem.code === item
+      }) 
+        if(it){
+          data.push({
+            label:it.fieldMap[pageData.value.primaryColumn.id],
+            value:it.code
+          })
+        }
+  })
+
+  return data
+ 
+})
+
+//关闭tag
+function handletagClose(item: any) {
+  checkboxvalue.value = checkboxvalue.value.filter((subitem: any) => {
+    return subitem !== item.value
+  })
+}
+
 // 获取页面配置
 function getPageConfig() {
   selectPageConfig(sourceId.value).then((res: any) => {
@@ -81,10 +109,10 @@ async function queryList(pageNo: number, pageSize: number) {
     const key = await getPageKey(sourceId.value, query.value)// 获取key
     const data = await getPageData(key.data?.key, pageNo, pageSize)// 获取数据
     // const count = await getPageTotal(key.data?.key)// 获取总数
-    paging.value.complete(data.data.entities)
+    paging.value.complete && paging.value.complete(data.data.entities)
   }
   catch (error) {
-    paging.value.complete(false)
+    paging.value.complete && paging.value.complete(false)
     console.error(error)
   }
 }
@@ -95,18 +123,18 @@ function add() {
     url: `/pages/add/add?sourceId=${sourceId.value}`,
   })
 }
+
 // 点击确定按钮
 function SubmitHanld() {
-  const index = radiovalue.value
-  if (index === undefined) {
-    uni.showToast({
-      title: '请选择一条数据',
-      icon: 'none'
-    })
-    return
-  }
-  const item = dataList.value[index]
-  uni.setStorageSync('selectItem', item)
+  uni.navigateBack({
+    success:()=>{
+      uni.$emit('getCheckData',{checkData: checkboxvalue.value})
+    }
+  })
+}
+
+//点击取消按钮
+function handleCansle() {
   uni.navigateBack()
 }
 
@@ -124,25 +152,32 @@ function SubmitHanld() {
           <wd-button v-if="pageData.buttons.includes('dtmplAdd')" type="icon" icon="add" @click="add" />
         </view>
         <view class="button-container">
-          <wd-button type="info" size="small">关闭</wd-button>
-          <wd-button size="small" @click="SubmitHanld">确定</wd-button>
+          <wd-button type="info" size="small" @click="handleCansle">取消</wd-button>
+          <wd-button size="small" @click="SubmitHanld" >确定</wd-button>
         </view>
       </view>
-       
+      <!-- 选择的数据 -->
+       <view class="select-container">
+        <wd-tag @close="handletagClose(item)" closable round type="primary" v-for="(item, index) in checkData" :key="index">{{ item.label }}</wd-tag>
+       </view>
     </template>
     <!-- 卡片 -->
-    <view v-for="(item, index) in dataList" :key="index" class="card-container">
-      <view style="background-color: #fff;">
-        <view style="padding:10px 0 0 30px;" @click="radiovalue = index">
-          <wd-radio-group v-model="radiovalue" shape="dot" inline>
-            <wd-radio :value="index"></wd-radio>
-          </wd-radio-group>
+    <view class="card-container">
+      <!-- 复选框 -->
+      <wd-checkbox-group v-model="checkboxvalue">
+        <view v-for="(item, index) in dataList" :key="index">
+          <view >
+            <view style="padding:10px 0 0 30px;">
+              <wd-checkbox :modelValue="item.code"></wd-checkbox>
+            </view>
+            <w-card style="background: none;" :car-index="index" :page="pageData" :item-data="item"
+              :source-id="sourceId" />
+          </view>
         </view>
-        <w-card style="background: none;" :car-index="index" :page="pageData" :item-data="item" :source-id="sourceId" />
-      </view>
-
+      </wd-checkbox-group>
     </view>
 
+
   </z-paging>
 </template>
 
@@ -153,9 +188,21 @@ function SubmitHanld() {
   justify-content: space-between;
   background-color: #fff;
   padding: 10px;
-  .button-container{
+
+  .button-container {
     display: flex;
     gap: 10px;
   }
 }
+.select-container{
+  display: flex;
+  flex-wrap: wrap;
+  gap: 5px;
+  padding:0 10px;
+}
+
+.card-container {
+  padding:10px;
+  background-color: #F6F7FB;
+}
 </style>

package/w-table/w-table.vue

@@ -21,16 +21,22 @@ const props = defineProps({
   sourceId: {
     type: String,
     default: ''
+  },
+  mainCode:{
+    type: String,
+    default: ''
   }
 })
 const query = ref('')
 const sourceId = ref('')
+const mainCode = ref('')
 const pageData = ref<{
   criterias: []
   buttons: string[]
 }>({ criterias: [], buttons: [] })
 onLoad((option: any) => {
   sourceId.value = props.sourceId || option.sourceId
+  mainCode.value =  props.mainCode ||option.mainCode
   uni.setNavigationBarTitle({ title: option.pageTitle })
 
 })
@@ -81,13 +87,13 @@ async function queryList(pageNo: number, pageSize: number) {
   // })
   try {
 
-    const key = await getPageKey(sourceId.value, query.value)// 获取key
+    const key = await getPageKey(sourceId.value, mainCode.value,query.value)// 获取key
     const data = await getPageData(key.data?.key, pageNo, pageSize)// 获取数据
     // const count = await getPageTotal(key.data?.key)// 获取总数
-    paging.value.complete(data.data.entities)
+    paging.value.complete&&paging.value.complete(data.data.entities)
   }
   catch (error) {
-    paging.value&&paging.value.complete(false)
+    paging.value.complete&&paging.value&&paging.value.complete(false)
     console.error(error)
   }
 }