wui-components-v2 1.0.40 → 1.0.42

package/components/edit-page/edit-page.vue

@@ -247,7 +247,24 @@ async function save() {
       return rowAddSave({ ...all, id: pageConfig.value.entity.code })
     }
 
-    editPageDataSave(tree.value.sourceId || sourceId.value, id.value, all, tree.value.value || mainCode.value).then((res: any) => {
+    const newAll: Record<string, any> = {}
+
+    for (const key1 in all) {
+      if (Object.prototype.hasOwnProperty.call(all, key1)) {
+        if (all[key1].response) {
+          newAll[`${key1}`] = JSON.stringify({
+            valid: 'new',
+            fileKey: JSON.parse(all[key1].response).fileKey,
+            fileName: all[key1].name,
+          })
+        }
+        else {
+          newAll[key1] = all[key1]
+        }
+      }
+    }
+
+    editPageDataSave(tree.value.sourceId || sourceId.value, id.value, newAll, tree.value.value || mainCode.value).then((res: any) => {
       // 发送事件
       if (addEvent.value)
         uni.$emit(addEvent.value, res.entityCode)

package/components/fold-card/fold-card.vue

@@ -19,7 +19,7 @@ const props = defineProps<{
   model: FoldCardModel
   sourceId: string
   groups: Groups
-  enumColumn: Enums
+  enumColumn?: Enums
 }>()
 const contentRef = ref<any>()
 // 展示内容
@@ -42,7 +42,7 @@ const collapseData = ref<Columns[]>([])
 
 // 标签字段
 const labelColumns = computed(() => {
-  if (props.labelColumn) {
+  if (props.labelColumn && props.enumColumn) {
     return props.enumColumn[props.labelColumn.mstrucId]
   }
   else {

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

@@ -33,6 +33,11 @@ function initFormData() {
     if (item.extControlType === 'tree-entity-select' || item.extControlType === 'multiselect') {
       return models[item.sourceId] = (props.entity && props.entity[item.sourceId]?.split(',')) || item.transDefaultValue || []
     }
+
+    if (item.extControlType === 'relselect') {
+      return models[item.sourceId] = (props.entity && props.entity[item.sourceId]?.split('@,@')) || (item.transDefaultValue && item.transDefaultValue?.split('@,@')) || []
+    }
+
     // 文件
     if (item.extControlType === 'file' || item.extControlType === 'relfile') {
       if (props.entity && typeof props.entity[item.sourceId] === 'object') {

package/components/search/search.vue

@@ -7,7 +7,7 @@ defineOptions({ name: 'Search' })
 const props = defineProps<{
   criterias: Fields[]
   primaryCriteria: Fields
-  enumColumn: Enums
+  enumColumn?: Enums
 }>()
 const emits = defineEmits(['submit'])
 const show = ref(false)
@@ -82,7 +82,7 @@ function handleSubmit() {
     <wd-popup v-model="show" position="bottom" custom-class="h-80vh" closable @close="handleClose">
       <view class="relative box-border h-full p-1 .dark:bg-gray-900">
         <view class="h-40px" />
-        <formControl ref="formControlRef" :field-group="{ fields: filterCriterias, id: '', buttons: [], title: '', type: '', pointSourceId: '', mstrucId: '', relationNames: [] }" :entity="entity" :enum-column="enumColumn" />
+        <formControl ref="formControlRef" :field-group="{ fields: filterCriterias, readOnly: false, displayConfig: [], id: '', buttons: [], title: '', type: '', pointSourceId: '', mstrucId: '', relationNames: [] }" :entity="entity" :enum-column="enumColumn" />
         <view class="h-12" />
         <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 class="flex-1" @click="handleSubmit">

package/package.json

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

package/utils/index.ts

@@ -39,13 +39,13 @@ export function formatItemData(data: any, type: string) {
 
   if (type === 'file' || type === 'relfile') {
     if (data) {
+      console.log('sdsadasd', data)
       // 判断是否为JSON文件
       if (typeof data === 'string') {
         const a = JSON.parse(data)
         return `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`
       }
       else {
-        console.log('sdsadasd', data)
         return data.url
       }
     }