wui-components-v2 1.0.38 → 1.0.40

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 || ''
@@ -405,6 +410,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 +422,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,14 +554,14 @@ 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">
               <wd-loading />
             </view>
             <view v-else>
-              <view class="flex justify-center">
+              <view v-if="!group.readOnly" class="flex justify-center">
                 <wd-button v-if="group.buttons.includes('selectAdd')" :disabled="canClick(group)" type="info" size="small" @click="gotoSlect(group)">
                   选择
                 </wd-button>
@@ -549,7 +574,7 @@ function remove(group: Groups, field: Entities) {
               </view>
               <view v-for="field in pageConfig?.entity?.arrayMap[group.id]" :key="field.code">
                 <foldCard :enum-column="{}" :groups="group" :source-id="sourceId" :columns="group.fields" model="complex" :data="field">
-                  <template #buttons>
+                  <template v-if="!group.readOnly" #buttons>
                     <wd-button v-if="group.buttons.includes('dtmplEdit')" size="small" @click="edit(group, field)">
                       编辑
                     </wd-button>

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

@@ -29,6 +29,14 @@ const exhibitData = computed(() => {
   const columns = props.columns.length >= num ? props.columns.slice(0, num) : props.columns
   return columns.filter(item => item.title !== '操作')
 })
+
+// 是否展示折叠按钮
+const showCollapse = computed(() => {
+  const { collapseNum } = props
+  const num = collapseNum || 2
+  return props.columns.length > num
+})
+
 // 折叠内容
 const collapseData = ref<Columns[]>([])
 
@@ -115,7 +123,7 @@ function toggleCollapse(contentId: string) {
         <view class="flex items-center justify-between border-t border-gray-100">
           <view>
             <wd-button
-
+              v-if="showCollapse"
               id="toggle-btn-2"
               type="icon"
               :icon="collapseIcon"

package/package.json

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

package/type.ts

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