wui-components-v2 1.0.39 → 1.0.41

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

@@ -47,6 +47,11 @@ const rowAddEvent = ref('')
 const sendRowAddEvent = ref('')
 // 折叠面板
 const collapses = ref()
+const groupsformat = computed(() => {
+  return pageConfig.value.groups.filter((item: Groups) => {
+    return item.displayConfig.includes('displayed')
+  })
+})
 onLoad((option: any) => {
   sourceId.value = option.sourceId
   mainCode.value = option.mainCode || ''
@@ -176,7 +181,24 @@ async function save() {
     })
     const res = await Promise.all(formArray)
     const beasData = res.reduce((acc, cur) => {
-      return { ...acc, ...cur }
+      const data: any = {}
+      for (const key in cur) {
+        if (Object.prototype.hasOwnProperty.call(cur, key)) {
+          const element = cur[key]
+          if (element.response) {
+            data[key] = JSON.stringify({
+              valid: 'new',
+              fileKey: JSON.parse(element.response).fileKey,
+              fileName: element.name,
+            })
+          }
+          else {
+            data[key] = element
+          }
+        }
+      }
+
+      return { ...acc, ...data }
     }, {})
     subLoading.value = true
 
@@ -405,6 +427,7 @@ function gotoRowAdd(group: Groups) {
       }]
     }
 
+    console.log(pageConfig.value.entity)
     // 显示数据
     if (pageConfig.value.entity && pageConfig.value.entity.arrayMap[group.id]) {
       pageConfig.value.entity.arrayMap[group.id].push({
@@ -416,20 +439,39 @@ function gotoRowAdd(group: Groups) {
       })
     }
     else {
-      pageConfig.value.entity = {
-        arrayMap: {
-          [group.id]: [{
-            arrayMap: {},
-            code: '',
-            fieldMap: {
-              ...data,
-            },
-          }],
-        },
-        code: '',
-        fieldMap: {},
+      if (pageConfig.value.entity.arrayMap) {
+        pageConfig.value.entity = {
+          arrayMap: {
+            ...pageConfig.value.entity.arrayMap,
+            [group.id]: [{
+              arrayMap: {},
+              code: '',
+              fieldMap: {
+                ...data,
+              },
+            }],
+          },
+          code: '',
+          fieldMap: {},
+        }
+      }
+      else {
+        pageConfig.value.entity = {
+          arrayMap: {
+            [group.id]: [{
+              arrayMap: {},
+              code: '',
+              fieldMap: {
+                ...data,
+              },
+            }],
+          },
+          code: '',
+          fieldMap: {},
+        }
       }
     }
+
     console.log(rowData.value, 'rowData.value')
     uni.$off(rowAddEvent)
   })
@@ -529,7 +571,7 @@ function remove(group: Groups, field: Entities) {
         <TreeSelectControl v-model="tree" select-mode="single" :source-id="sourceId" title="分组" ext-control-type="relselect " :readonly="false" :clearable="false" />
       </wd-cell>
       <wd-collapse v-model="collapses">
-        <wd-collapse-item v-for="group in pageConfig.groups" :key="group.id" :title="group.title" :name="group.id">
+        <wd-collapse-item v-for="group in groupsformat" :key="group.id" :title="group.title" :name="group.id">
           <FormControl v-if="group.type === 'fieldGroup'" ref="formControlRef" :field-group="group" :entity="pageConfig?.entity?.fieldMap" :enum-column="Enumcolumn" />
           <view v-if="group.type === 'relation'">
             <view v-if="selectData[group.id]?.loading " class="flex justify-center p-3">

package/package.json

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

package/type.ts

@@ -59,6 +59,7 @@ export interface Groups {
   max?: number
   classEditConfigs?: ClassEditConfigs[]
   readOnly: boolean
+  displayConfig: string[]
 }
 
 export interface Entity extends Entities {