按要求修改表单

src/App.vue

@@ -33,7 +33,7 @@ onLaunch(async () => {
 
 //修改默认主题颜色
 configTheme((theme) => {
-  theme.colorConfigs.default.primary = '#00ca76';
+  theme.colorConfigs.default.primary = '#00b66a';
   theme.colorConfigs.pressed.primary = '#00814b';
   theme.colorConfigs.background.primary = '#dcfff0';
   return theme;
@@ -46,6 +46,7 @@ configTheme((theme) => {
   @import "@/components/index.scss";
 
   page {
+    //color: #00b66a;
     background: #f7f8f9;
   }
 </style>

src/api/RequestModules.ts

@@ -49,10 +49,13 @@ function requestInceptor(url: string, req: RequestOptions) {
   if (req.method == 'GET') {
     //追加GET参数
     url = appendGetUrlParams(url, 'main_body_id', ApiCofig.mainBodyId);
+    url = appendGetUrlParams(url, 'platform', ApiCofig.platformId);
     if (append_main_body_user_id)
       url = appendGetUrlParams(url, 'main_body_user_id', main_body_user_id);
   } else {
     req.data = appendPostParams(req.data,'main_body_id', ApiCofig.mainBodyId);
+    req.data = appendPostParams(req.data,'platform', ApiCofig.platformId);
+    
     if (append_main_body_user_id)
       req.data = appendPostParams(req.data,'main_body_user_id', main_body_user_id);
   } 

src/api/inhert/VillageApi.ts

@@ -50,6 +50,7 @@ export class VillageListItem extends DataModel<VillageListItem> {
   updatedAt = null as Date|null;
   deleteAt = null as Date|null;
   image = '';
+  thumbnail = '';
   images = [] as string[];
   villageName = '';
   title = '';

src/common/config/ApiCofig.ts

@@ -7,4 +7,5 @@ export default {
   serverProd: 'https://mn.wenlvti.net/api',
   amapServerKey: '8fd09264c33678141f609588c432df0e',
   mainBodyId: 2,
+  platformId: 330,
 }

src/components/dynamic/wrappers/PickerIdField.vue

@@ -2,6 +2,7 @@
   <PickerField 
     :columns="[ loader.data.value || [] ]"
     v-bind="$attrs"
+    :singleValue="true"
     :modelValue="!(modelValue instanceof Array) ? [modelValue || ''] : modelValue"
     @update:modelValue="handleUpdateModelValue"
   />

src/components/form/CascadePicker.vue

@@ -110,7 +110,7 @@ function loadCols() {
       }
     } 
   }
-  emit('selectTextChange', selectText.join(' '));
+  emit('selectTextChange', selectText.join(' '), true);
 }
 
 watch(() => props.value, (v) => {

src/components/form/Picker.vue

@@ -98,13 +98,13 @@ function loadValues() {
   value.forEach((v,i) => {
     const index = props.columns[i]?.findIndex((item) => item.value === v);
     pickerSelectIndex.value[i] = index < 0 ? 0 : index;
-  })
+  });  
   emit('selectTextChange', pickerSelectIndex.value.map((p, i) => {
     const cols = props.columns[i];
     if (!cols || cols.length === 0) 
       return null;
     return cols[p]?.text ?? cols[0]?.text ?? null;
-  }).join(' '));
+  }).join(' '), true);
 }
 
 watch(() => props.value, (v) => {

src/pages/dig/forms/common.vue

@@ -8,6 +8,7 @@
           type="info"
           message="您的修改已经暂存，可以放心离开，下次接着编辑"
         />
+        <Height :height="20" />
         <DynamicForm
           ref="formRef"
           :options="formDefine"
@@ -115,8 +116,12 @@ const { querys } = useLoadQuerys({
     formModel.value = formData as any;
 
   await nextTick();
+  await waitTimeOut(100);
   formRef.value.initDefaultValuesToModel();
 
+  console.log(formModel.value);
+  
+
   await waitTimeOut(1000);
   canSaveNow = true;
 });

src/pages/dig/forms/data/common.ts

@@ -1,5 +1,7 @@
 import { useAliOssUploadCo } from "@/common/components/upload/AliOssUploadCo";
 import type { IDynamicFormOptions, IDynamicFormRef } from "@/components/dynamic";
+import type { PickerIdFieldProps } from "@/components/dynamic/wrappers/PickerIdField";
+import type { FieldProps } from "@/components/form/Field.vue";
 import type { UploaderFieldProps } from "@/components/form/UploaderField.vue";
 import type { Ref } from "vue";
 
@@ -7,11 +9,13 @@ export function villageCommonContent (ref: Ref<IDynamicFormRef>, options: {
   title: string,
   showTitle?: boolean,
   showContent?: boolean,
+  showType?: boolean,
   contentKey?: string,
 } = {
   title: '文章',
   showTitle: true,
 }) : IDynamicFormOptions {
+  options.title = '';
   return {
     formItems: [
       {
@@ -33,7 +37,7 @@ export function villageCommonContent (ref: Ref<IDynamicFormRef>, options: {
             }]
           }]: []),
           ...(options.showContent !== false ? [{
-            label: `${options.title}介绍`,
+            label: `${options.title}内容`,
             name: options.contentKey || 'content',
             type: 'richtext',
             defaultValue: '',
@@ -47,6 +51,26 @@ export function villageCommonContent (ref: Ref<IDynamicFormRef>, options: {
             }]
           },
           {
+            label: `${options.title}类型`,
+            name: 'type',
+            type: 'select-id',
+            defaultValue: 1,
+            additionalProps: {
+              loadData: async () => [
+                { text: '文字', value: 1 },
+                { text: '图片', value: 2 },
+                { text: '视频', value: 3 },
+                { text: '相册', value: 4 },
+                { text: '数字档案', value: 5 },
+              ],
+            } as PickerIdFieldProps,
+            formProps: { showRightArrow: true },
+            rules: [{
+              required: true,
+              message: '请选择类型',
+            }]
+          },
+          {
             label: '来源(可选)',
             name: 'source',
             type: 'text',
@@ -100,7 +124,7 @@ export function villageCommonContent (ref: Ref<IDynamicFormRef>, options: {
       {
         name: 'c',
         type: 'flat-group',
-        label: '额外信息(可选)',
+        label: '其他附件(可选)',
         formProps: {
           showLabel: false,
         },
@@ -166,6 +190,5 @@ export function villageCommonContent (ref: Ref<IDynamicFormRef>, options: {
         ],
       }
     ],
-
   }
 }

src/pages/dig/forms/data/cultural.ts

@@ -28,7 +28,7 @@ export function villageInfoFolkCultureForm(title: string) : SingleForm {
         }]
       }, 
       {
-        label: '村落非遗项目', 
+        label: '非遗项目', 
         name: 'ichId',
         type: 'select-id', 
         defaultValue: null,
@@ -57,18 +57,18 @@ export function villageInfoFolkCultureForm(title: string) : SingleForm {
         contentKey: 'details'
       }).formItems
     ]
-  }), { title: title, typeName: 'folk_culture_type', }];
+  }), { title: title, typeName: 'folkCultureType', }];
 }
 
 export const villageInfoCulture : GroupForm = {
   [1]: [CommonInfoModel, (m) => villageCommonContent(m, {
-    title: '建村历史',
+    title: '建村(社)历史',
     showTitle: true
-  }), { title: '建村历史', typeName: 'cultural_type', }],
+  }), { title: '建村(社)历史', typeName: 'culturalType', }],
   [2]: [CommonInfoModel, (m) => villageCommonContent(m, {
     title: '历史事件',
     showTitle: true
-  }), { title: '历史事件', typeName: 'cultural_type', }],  
+  }), { title: '历史事件', typeName: 'culturalType', }],  
   [3]: [CommonInfoModel, (m) => ({
     formItems: [
       ...(villageCommonContent(m, {
@@ -91,7 +91,7 @@ export const villageInfoCulture : GroupForm = {
         }]
       },
     ],
-  }), { title: '历史文献', typeName: 'cultural_type', }],
+  }), { title: '历史文献', typeName: 'culturalType', }],
   [4]: [CommonInfoModel, (m) => ({
     formItems: [
       ...villageCommonContent(m, {
@@ -189,5 +189,5 @@ export const villageInfoCulture : GroupForm = {
         },
       },
     ],
-  }), { title: '口述历史', typeName: 'cultural_type', }],
+  }), { title: '口述历史', typeName: 'culturalType', }],
 }

src/pages/dig/forms/data/food.ts

@@ -39,5 +39,5 @@ export function villageInfoFoodProductsForm(title: string) : SingleForm {
         showTitle: false,
       })).formItems
     ]
-  }), { title: title, typeName: 'product_type', }];
+  }), { title: title, typeName: 'productType', }];
 }

src/pages/dig/forms/data/ich.ts

@@ -166,7 +166,7 @@ export const ichFormItems : SingleForm = [CommonInfoModel, (m) => ({
           }],
         },
         {
-          label: '与村落依存程度', 
+          label: '与村社依存程度', 
           name: 'ichDependenceDegree',
           type: 'select-id', 
           additionalProps: {
@@ -181,7 +181,7 @@ export const ichFormItems : SingleForm = [CommonInfoModel, (m) => ({
           formProps: { showRightArrow: true } as FieldProps,
           rules: [{
             required: true,
-            message: '请选择与村落依存程度',
+            message: '请选择与村社依存程度',
           }],
         },
         {

src/pages/dig/forms/data/overview.ts

@@ -13,63 +13,55 @@ export const villageInfoOverviewForm : GroupForm = {
   [1]: [CommonInfoModel, (form) => ({
     formItems: [
       { 
-        label: '村落名称', 
+        label: '名称', 
         name: 'name', 
         type: 'text', 
         defaultValue: '',
         additionalProps: {
-          placeholder: '请输入您的村落名称，例如：后埔',
+          placeholder: '请输入名称，例如：后埔',
         },
         rules:  [{
           required: true,
-          message: '请输入村落名称',
+          message: '请输入名称',
         }] 
       }, 
-      { 
-        label: '村落编码', 
+      /* { 
+        label: '编码', 
         name: 'code', 
         type: 'text', 
         defaultValue: '',
         additionalProps: {
-          placeholder: '请输入村落编码，例如330106',
+          placeholder: '请输入编码，例如330106',
         },
         rules:  [{
           required: true,
-          message: '请输入村落编码',
+          message: '请输入编码',
         }] 
-      }, 
+      },  */
       { 
-        label: '村落地址', 
+        label: '地址', 
         name: 'cityAddress', 
         type: 'select-city', 
         defaultValue: () => [],
         additionalProps: {
-          placeholder: '请点击这里选择村落地址或右侧者从地图选择',
+          placeholder: '请点击这里选择地址或右侧者从地图选择',
           onSelectedTownship: (v: string, code: string) => {
             form.value.setValueByPath('township', v);
             form.value.setValueByPath('code', code);
           }
         },
-        rules:  [{
-          required: true,
-          message: '请选择村落地址',
-        }],
       },
       { 
-        label: '村落乡镇', 
+        label: '所在乡镇(街道)', 
         name: 'township', 
         type: 'text', 
         defaultValue: '',
         additionalProps: {
-          placeholder: '请输入村落所在乡镇',
+          placeholder: '请输入所在乡镇(街道)',
         },
-        rules: [{
-          required: true,
-          message: '请输入村落所在乡镇',
-        }] 
       }, 
       { 
-        label: '村落类型', 
+        label: '类型', 
         name: 'villageType',
         type: 'radio-id', 
         additionalProps: {
@@ -80,13 +72,61 @@ export const villageInfoOverviewForm : GroupForm = {
               text: p.title,
           })),
         } as RadioIdFieldProps,
-        rules: [{
-          required: true,
-          message: '请选择类型',
-        }],
       },
     ]
-  }), { title: '行政区划', typeName: '', }],
+  }), { title: '行政区划', typeName: '', order: 1 }],
+  [5]: [CommonInfoModel, () => ({
+    formItems: [
+      {
+        name: '',
+        type: 'flat-group',
+        childrenColProps: { span: 24 },
+        children: [
+          {
+            label: '概括',
+            name: 'overview',
+            type: 'richtext',
+            defaultValue: '',
+            additionalProps: {
+              placeholder: '请输入整体概括信息',
+              maxLength: 300,
+              showWordLimit: true, 
+            } as FieldProps,
+          },
+          {
+            label: '突出价值',
+            name: 'prominent',
+            type: 'richtext',
+            defaultValue: '',
+            additionalProps: {
+              placeholder: '请输入突出价值信息',
+              maxLength: 300,
+              showWordLimit: true, 
+            } as FieldProps,
+          }
+        ]
+      },
+      {
+        name: '',
+        type: 'flat-group',
+        childrenColProps: { span: 24 },
+        children: [
+          {
+            label: '相关视频（可选）',
+            name: 'video',
+            type: 'uploader',
+            defaultValue: '',
+            additionalProps: {
+              upload: useAliOssUploadCo('xiangyuan/cultural/video'),
+              chooseType: 'video',
+              maxFileSize: 1024 * 1024 * 20,
+              single: true,
+            } as UploaderFieldProps,
+          },
+        ]
+      },
+    ] 
+  }), { title: '综述', typeName: '', order: 2 }],
   [2]: [VillageEnvInfo, () => ({
     formItems: [
       { 
@@ -96,10 +136,6 @@ export const villageInfoOverviewForm : GroupForm = {
         defaultValue: '',
         additionalProps: {},
         formProps: { showRightArrow: true } as FieldProps,
-        rules:  [{
-          required: true,
-          message: '请输入村落经纬度',
-        }]
       }, 
       { 
         label: '海拔', 
@@ -107,16 +143,12 @@ export const villageInfoOverviewForm : GroupForm = {
         type: 'number', 
         defaultValue: 0,
         additionalProps: {
-          placeholder: '请输入村落海拔',
+          placeholder: '请输入海拔',
           min: -1000,
           max: 10000,
           step: 10,
           addonAfter: 'M',
         },
-        rules:  [{
-          required: true,
-          message: '请输入村落海拔',
-        }] 
       }, 
       { 
         label: '地形地貌特征（多选）', 
@@ -133,47 +165,35 @@ export const villageInfoOverviewForm : GroupForm = {
           ,
         } as CheckBoxListProps,
         defaultValue: [],
-        rules: [{
-          required: true,
-          message: '请选择类型',
-        }],
       },
       { 
-        label: '村域面积', 
+        label: '地域面积', 
         name: 'area', 
         type: 'number', 
         defaultValue: 0,
         additionalProps: {
-          placeholder: '请输入村域面积',
+          placeholder: '请输入地域面积',
           min: 0,
           max: 10000,
           step: 1,
           addonAfter: '平方公里',
         },
-        rules:  [{
-          required: true,
-          message: '请输入村域面积',
-        }] 
       }, 
       { 
-        label: '村庄占地面积', 
+        label: '建筑占地面积', 
         name: 'villageArea', 
         type: 'number', 
         defaultValue: 0,
         additionalProps: {
-          placeholder: '请输入村庄占地面积',
+          placeholder: '请输入占地面积',
           min: 0,
           max: 10000,
           step: 1,
           addonAfter: '亩',
         },
-        rules:  [{
-          required: true,
-          message: '请输入村庄占地面积',
-        }] 
       }, 
       { 
-        label: '村落形成年代', 
+        label: '形成年代', 
         name: 'age',
         type: 'select-id', 
         additionalProps: {
@@ -186,13 +206,9 @@ export const villageInfoOverviewForm : GroupForm = {
           ,
         } as PickerIdFieldProps,
         formProps: { showRightArrow: true } as FieldProps,
-        rules: [{
-          required: true,
-          message: '请选择类型',
-        }],
       },
     ]
-  }), { title: '地理信息', typeName: '', }],
+  }), { title: '地理信息', typeName: '', order: 3 }],
   [3]: [CommonInfoModel, () => ({
     formItems: [
       { 
@@ -210,10 +226,6 @@ export const villageInfoOverviewForm : GroupForm = {
           ,
         } as PickerIdFieldProps,
         formProps: { showRightArrow: true } as FieldProps,
-        rules: [{
-          required: true,
-          message: '请选择非遗最高级别',
-        }],
       }, 
       { 
         label: '传统建筑数量', 
@@ -225,13 +237,9 @@ export const villageInfoOverviewForm : GroupForm = {
           max: 10000,
           step: 1,
         },
-        rules:  [{
-          required: true,
-          message: '请输入传统建筑数量',
-        }] 
       }, 
       { 
-        label: '列入历史文化名村级别', 
+        label: '列入历史文化名村(社)级别', 
         name: 'historyLevel',
         type: 'select-id', 
         additionalProps: {
@@ -244,13 +252,9 @@ export const villageInfoOverviewForm : GroupForm = {
           ,
         } as PickerIdFieldProps,
         formProps: { showRightArrow: true } as FieldProps,
-        rules: [{
-          required: true,
-          message: '请选择类型',
-        }],
       },
       { 
-        label: '列入特色景观旅游名村级别', 
+        label: '列入特色景观旅游名村(社)级别', 
         name: 'touristLevel',
         type: 'select-id', 
         additionalProps: {
@@ -263,21 +267,13 @@ export const villageInfoOverviewForm : GroupForm = {
           ,
         } as PickerIdFieldProps,
         formProps: { showRightArrow: true } as FieldProps,
-        rules: [{
-          required: true,
-          message: '请选择类型',
-        }],
       },
       { 
-        label: '列入少数民族特色村寨试点示范', 
+        label: '列入少数民族特色村寨(社)试点示范', 
         name: 'isFeaturedVillage', 
         type: 'check-box-int', 
         defaultValue: '',
         additionalProps: {},
-        rules: [{
-          required: true,
-          message: '请选择类型',
-        }],
       }, 
       { 
         label: '其他认定级别', 
@@ -285,12 +281,12 @@ export const villageInfoOverviewForm : GroupForm = {
         type: 'text', 
         defaultValue: '',
         additionalProps: {
-          placeholder: '（可选）输入村落其他认定级别',
+          placeholder: '（可选）输入其他认定级别',
         },
         rules:  [] 
       }, 
     ]
-  }), { title: '建设与保护', typeName: '', }],
+  }), { title: '建设与保护', typeName: '', order: 4 }],
   [4]: [CommonInfoModel, () => ({ 
     formItems: [
       {
@@ -307,10 +303,6 @@ export const villageInfoOverviewForm : GroupForm = {
             additionalProps: {
               placeholder: '请输入主要民族',
             },
-            rules: [{
-              required: true,
-              message: '请输入主要民族',
-            }]
           }, 
           ...[
             {
@@ -466,7 +458,8 @@ export const villageInfoOverviewForm : GroupForm = {
             additionalProps: {
               placeholder: '（可选）输入其他服务业',
             },
-            rules:  [] 
+            rules:  [],
+            show: { callback: (_, m) => m.otherIndustries === 238 }
           }, 
           { 
             label: '其他农业', 
@@ -476,70 +469,11 @@ export const villageInfoOverviewForm : GroupForm = {
             additionalProps: {
               placeholder: '（可选）输入其他农业',
             },
-            rules:  [] 
+            rules:  [] ,
+            show: { callback: (_, m) => m.otherIndustries === 128 }
           }, 
         ]
       },
     ] 
-  }), { title: '人口与经济', typeName: '', }],
-  [5]: [CommonInfoModel, () => ({
-    formItems: [
-      {
-        name: '',
-        type: 'flat-group',
-        childrenColProps: { span: 24 },
-        children: [
-          {
-            label: '概括',
-            name: 'overview',
-            type: 'richtext',
-            defaultValue: '',
-            additionalProps: {
-              placeholder: '请输入村落整体概括信息',
-              maxLength: 300,
-              showWordLimit: true, 
-            } as FieldProps,
-            rules: [{
-              required: true,
-              message: '请输入概括',
-            }]
-          },
-          {
-            label: '突出价值',
-            name: 'prominent',
-            type: 'richtext',
-            defaultValue: '',
-            additionalProps: {
-              placeholder: '请输入村落突出价值信息',
-              maxLength: 300,
-              showWordLimit: true, 
-            } as FieldProps,
-            rules: [{
-              required: true,
-              message: '请输入突出价值',
-            }]
-          }
-        ]
-      },
-      {
-        name: '',
-        type: 'flat-group',
-        childrenColProps: { span: 24 },
-        children: [
-          {
-            label: '相关视频（可选）',
-            name: 'video',
-            type: 'uploader',
-            defaultValue: '',
-            additionalProps: {
-              upload: useAliOssUploadCo('xiangyuan/cultural/video'),
-              chooseType: 'video',
-              maxFileSize: 1024 * 1024 * 20,
-              single: true,
-            } as UploaderFieldProps,
-          },
-        ]
-      },
-    ] 
-  }), { title: '村落综述', typeName: '', }],
+  }), { title: '人口与经济', typeName: '', order: 5 }],
 }

src/pages/dig/forms/data/specker.ts

@@ -18,16 +18,16 @@ export const villageInfoSpeakerForm : SingleForm = [CommonInfoModel, (r) => ({
       },
       children: [
         {
-          label: '标题',
+          label: '姓名',
           name: 'name',
           type: 'text',
           defaultValue: '',
           additionalProps: {
-            placeholder: '请输入标题',
+            placeholder: '请输入姓名',
           },
           rules: [{
             required: true,
-            message: '请输入标题',
+            message: '请输入姓名',
           }]
         },
         {
@@ -66,10 +66,6 @@ export const villageInfoSpeakerForm : SingleForm = [CommonInfoModel, (r) => ({
             type: 'date',
           },
           formProps: { showRightArrow: true } as FieldProps,
-          rules: [{
-            required: true,
-            message: '请选择生日',
-          }]
         },
       ]
     },

src/pages/dig/forms/data/travel.ts

@@ -18,16 +18,16 @@ export const villageInfoTravelGuideForm : SingleForm = [CommonInfoModel, () => (
       },
       children: [
         {
-          label: '入村路线', 
+          label: '路线', 
           name: 'villageRoute', 
           type: 'text', 
           defaultValue: '',
           additionalProps: {
-            placeholder: '请输入入村路线',
+            placeholder: '请输路线',
           },
           rules:  [{
             required: true,
-            message: '请输入入村路线',
+            message: '请输路线',
           }] 
         },
         {

src/pages/dig/forms/forms.ts

@@ -15,10 +15,13 @@ import { villageInfoFigureFormItems, villageInfoStoryFormItems } from "./data/hi
 import { villageInfoRouteForm, villageInfoTravelGuideForm } from "./data/travel";
 import { villageInfoSpeakerForm } from "./data/specker";
 import { ichFormItems } from "./data/ich";
+import type { PickerIdFieldProps } from "@/components/dynamic/wrappers/PickerIdField";
 
 export type SingleForm = [NewDataModel, (formRef: Ref<IDynamicFormRef>) => IDynamicFormOptions, {
   title: string,
   typeName: string,
+  order?: number,
+  id?: number,
 }]
 export type GroupForm = Record<number, SingleForm>
 
@@ -84,7 +87,7 @@ const villageInfoForm : Record<string, GroupForm> = {
         {
           label: '描述',
           name: 'desc',
-          type: 'richtext',
+          type: 'textarea',
           defaultValue: '',
           additionalProps: {
             placeholder: '请输入描述',
@@ -96,6 +99,7 @@ const villageInfoForm : Record<string, GroupForm> = {
         ...villageCommonContent(r, {
           title: '记录',
           showTitle: false,
+          showType: true,
         }).formItems
       ]
     }), { title: '随手记', typeName: '', }]
@@ -114,26 +118,65 @@ export function getVillageInfoFormIds(subType: string) {
   return Object.keys(villageInfoForm[subType]).map((k) => Number(k));
 }
 
-export function mergeFormItems(set: Record<number, SingleForm>) {
-  const keys = Object.keys(set);
-  const result : SingleForm = [set[keys[0] as any][0], (formRef: Ref<IDynamicFormRef>) => {
+export function mergeFormItems(group: GroupForm) {
+  const groupArray = Object.keys(group)
+    .map((k) => {
+      const id = Number(k);
+      const it = group[id];
+      it[2].id = id;
+      return it;
+    })
+    .sort((a, b) => 
+      (a[2].order || 0) - (b[2].order || 0)
+    );
+  const [model, firstForm, info] = groupArray[0];
+  const isOverview = group === villageInfoOverviewForm;
+  const needType = !isOverview && info.typeName;
+  const result : SingleForm = [model, (formRef: Ref<IDynamicFormRef>) => {
     const options : IDynamicFormOptions = {
       formItems: [],
     };
-    for (const key in set) {
-      const it = set[key];
-      const op = it[1](formRef);
-      const ex = it[2];
+    if (needType) {
       options.formItems.push({
-        label: ex.title, 
-        name: 'group' + key, 
-        type: 'flat-group', 
-        childrenColProps: { span: 24 },
-        children: op.formItems, 
+        label: '类型',
+        name: info.typeName, 
+        type: 'select-id', 
+        additionalProps: {
+          disabled: groupArray.length <= 1,
+          loadData: async () => groupArray.map((it) => ({
+            value: it[2].id,
+            text: it[2].title,
+          })),
+        } as PickerIdFieldProps,
+        defaultValue: groupArray[0][2].id,
+        formProps: { showRightArrow: true } as FieldProps,
+        rules: [{
+          required: true,
+          type: 'number',
+          message: '请选择类型',
+        }],
       });
     }
+    if (needType) {
+      let i = 0;
+      for (const it of groupArray) {
+        const op = it[1](formRef);
+        const ex = it[2];
+        options.formItems.push({
+          label: ex.title, 
+          name: 'group' + i, 
+          type: 'flat-group', 
+          childrenColProps: { span: 24 },
+          children: op.formItems, 
+          show: { callback: (_, m) => m[info.typeName] === ex.id }
+        });
+        i++;
+      }
+    } else {
+      options.formItems.push(...firstForm(formRef).formItems)
+    }
     return options;
-  }, set[keys[0] as any]?.[2] ?? { title: '合并', typeName: '' }]
+  }, info ?? { title: '合并', typeName: '' }]
 
   return result;
 }

src/pages/dig/forms/tasks.ts

@@ -163,35 +163,35 @@ export const TaskMenuDef : Record<string, TaskMenuDefItem> = {
         desc: '欢庆与传承并重的文化盛宴',
         icon: 'icon-task-custom-2',
         enable: 'folk_culture',
-        goForm: [ 'folk_culture', 1, 'folk_culture_type', undefined, '节庆活动' ],
+        goForm: [ 'folk_culture', 1, 'folkCultureType', undefined, '节庆活动' ],
       },
       {
         title: '祭祀崇礼',
         desc: '对先贤与自然的崇高致敬',
         icon: 'icon-task-custom-3',
         enable: 'folk_culture',
-        goForm: [ 'folk_culture', 2, 'folk_culture_type', undefined, '祭祀崇礼' ],
+        goForm: [ 'folk_culture', 2, 'folkCultureType', undefined, '祭祀崇礼' ],
       },
       {
         title: '婚丧嫁娶',
         desc: '生命礼赞与文化传承的双重奏鸣',
         icon: 'icon-task-custom-4',
         enable: 'folk_culture',
-        goForm: [ 'folk_culture', 3, 'folk_culture_type', undefined, '婚丧嫁娶' ],
+        goForm: [ 'folk_culture', 3, 'folkCultureType', undefined, '婚丧嫁娶' ],
       },
       {
         title: '地方方言',
         desc: '历史沉淀的语言瑰宝',
         icon: 'icon-task-custom-5',
         enable: 'folk_culture',
-        goForm: [ 'folk_culture', 4, 'folk_culture_type', undefined, '地方方言' ],
+        goForm: [ 'folk_culture', 4, 'folkCultureType', undefined, '地方方言' ],
       },
       {
         title: '特色文化',
         desc: '民族精神的鲜明烙印',
         icon: 'icon-task-custom-6',
         enable: 'folk_culture',
-        goForm: [ 'folk_culture', 5, 'folk_culture_type', undefined, '特色文化' ],
+        goForm: [ 'folk_culture', 5, 'folkCultureType', undefined, '特色文化' ],
       },
     ],
   },
@@ -229,14 +229,14 @@ export const TaskMenuDef : Record<string, TaskMenuDefItem> = {
         desc: '乡村繁荣的多元支柱',
         icon: 'icon-task-food-1',
         enable: 'food_product',
-        goForm: [ 'food_product', 1, 'product_type', undefined, '农副产品' ],
+        goForm: [ 'food_product', 1, 'productType', undefined, '农副产品' ],
       },
       {
         title: '特色美食',
         desc: '给味蕾探索带来无限惊喜',
         icon: 'icon-task-food-2',
         enable: 'food_product',
-        goForm: [ 'food_product', 3, 'product_type', undefined, '特色美食' ],
+        goForm: [ 'food_product', 3, 'productType', undefined, '特色美食' ],
       },
     ],
   },
@@ -248,7 +248,7 @@ export const TaskMenuDef : Record<string, TaskMenuDefItem> = {
         desc: '村落建立与发展历程',
         icon: 'icon-task-history-1',
         enable: 'cultural',
-        goForm: [ 'cultural', 1, 'cultural_type', undefined, '建村历史' ],
+        goForm: [ 'cultural', 1, 'culturalType', undefined, '建村历史' ],
       },
       {
         title: '历史人物',
@@ -262,7 +262,7 @@ export const TaskMenuDef : Record<string, TaskMenuDefItem> = {
         desc: '重大历史事件记录',
         icon: 'icon-task-history-3',
         enable: 'cultural',
-        goForm: [ 'cultural', 2, 'cultural_type', undefined, '历史事件' ],
+        goForm: [ 'cultural', 2, 'culturalType', undefined, '历史事件' ],
       },
       {
         title: '掌故轶事',
@@ -276,14 +276,21 @@ export const TaskMenuDef : Record<string, TaskMenuDefItem> = {
         desc: '重要历史文献资料',
         icon: 'icon-task-history-5',
         enable: 'cultural',
-        goForm: [ 'cultural', 3, 'cultural_type', undefined, '历史文献' ],
+        goForm: [ 'cultural', 3, 'culturalType', undefined, '历史文献' ],
       },
       {
         title: '口述历史',
         desc: '村民口述历史记录',
         icon: 'icon-task-history-6',
         enable: 'cultural',
-        goForm: [ 'cultural', 4, 'cultural_type', undefined, '口述历史' ],
+        goForm: [ 'cultural', 4, 'culturalType', undefined, '口述历史' ],
+      },
+      {
+        title: '口述人管理',
+        desc: '口述人管理登记',
+        icon: 'icon-task-history-1',
+        enable: 'cultural',
+        goForm: [ 'speaker', 1, undefined, undefined, '口述人管理' ],
       },
     ],
   },
@@ -295,21 +302,21 @@ export const TaskMenuDef : Record<string, TaskMenuDefItem> = {
         desc: '文化交流的开放窗口',
         icon: 'icon-task-mine-1',
         enable: 'food_product',
-        goForm: [ 'food_product', 4, 'product_type', undefined, '商业集市' ],
+        goForm: [ 'food_product', 4, 'productType', undefined, '商业集市' ],
       },
       {
         title: '服装服饰',
         desc: '艺术与功能交织的时尚篇章',
         icon: 'icon-task-mine-2',
         enable: 'food_product',
-        goForm: [ 'food_product', 5, 'product_type', undefined, '服装服饰' ],
+        goForm: [ 'food_product', 5, 'productType', undefined, '服装服饰' ],
       },
       {
         title: '运输工具',
         desc: '历史的运输工具',
         icon: 'icon-task-mine-2',
         enable: 'food_product',
-        goForm: [ 'food_product', 6, 'product_type', undefined, '运输工具' ],
+        goForm: [ 'food_product', 6, 'productType', undefined, '运输工具' ],
       },
     ],
   },

src/pages/home/index.vue

@@ -2,7 +2,7 @@
   <FlexCol :gap="20" :padding="20">
     <FlexCol :radius="15" overflow="hidden">
       <ImageSwiper 
-        :height="200"
+        :height="300"
         :images="[
           'https://mn.wenlvti.net/app_static/minnan/images/home/BackgroundBanner5.jpg',
           'https://mn.wenlvti.net/app_static/minnan/images/home/BackgroundBanner4.jpg',
@@ -12,7 +12,8 @@
     </FlexCol>
     <Box title="传统村落分布" icon="/static/images/home/icon-pin-distance.png">
       <map 
-        id="map"
+        id="prevMap"
+        map-id="prevMap"
         class="w-100 height-400 radius-base overflow-hidden"
         :markers="mapLoader.content.value || []"
         :scale="10"
@@ -20,7 +21,7 @@
         :latitude="AppCofig.defaultLonLat[1]"
       />
     </Box>
-    <Box title="优秀线上村史馆" icon="/static/images/home/icon-ancient-gate.png">
+    <Box title="线上史馆展示" icon="/static/images/home/icon-ancient-gate.png">
       <SimplePageContentLoader :loader="recommendLoader">
         <FlexRow justify="space-between" align="center" wrap :gap="25">
           <Touchable 
@@ -77,6 +78,8 @@
 </template>
 
 <script setup lang="ts">
+import CommonContent from '@/api/CommonContent';
+import VillageApi from '@/api/inhert/VillageApi';
 import Box from '@/common/components/parts/Box.vue';
 import ImageSwiper from '@/common/components/parts/ImageSwiper.vue';
 import SimplePageContentLoader from '@/common/components/SimplePageContentLoader.vue';
@@ -91,90 +94,45 @@ import FlexRow from '@/components/layout/FlexRow.vue';
 import Height from '@/components/layout/space/Height.vue';
 import Width from '@/components/layout/space/Width.vue';
 import { RandomUtils } from '@imengyu/imengyu-utils';
+import { getCurrentInstance } from 'vue';
 
 function testImage() {
   return 'https://mncdn.wenlvti.net/app_static/minnan/images/home/ImageTest' + RandomUtils.genRandom(1, 5) +'.jpg';
 }
 
-const mapCtx = uni.createMapContext('map');
+const instance = getCurrentInstance();
+const mapCtx = uni.createMapContext('prevMap', instance);
 const mapLoader = useSimpleDataLoader(async () => {
-  const res = [
-    {
-      title: '传统村落',
-      longitude: Number(118.11441371826822),
-      latitude: Number(24.51019917828817),
-      width: 30,
-      height: 30,
-      iconPath: testImage(),
-    },
-    {
-      title: '传统村落',
-      longitude: Number(118.18573604529888),
-      latitude: Number(24.485581319259357),
-      width: 30,
-      height: 30,
-      iconPath: testImage(),
-    },
-    {
-      title: '传统村落',
-      longitude: Number(118.1242512731751),
-      latitude: Number(24.417297514622685),
-      width: 30,
-      height: 30,
-      iconPath: testImage(),
-    },
-    {
-      title: '传统村落',
-      longitude: Number(118.23861292755578),
-      latitude: Number(24.559407658427826),
-      width: 30,
-      height: 30,
-      iconPath: testImage(),
-    },
-  ]
-  mapCtx.includePoints({
-    points: res.map(p => {
-      if (!p.longitude || !p.latitude) {
-        p.longitude = AppCofig.defaultLonLat[0];
-        p.latitude = AppCofig.defaultLonLat[1];
-      }
-      return {
-        latitude: p.latitude,
-        longitude: p.longitude,
-      }
-    }),
-    padding: [20, 20, 20, 20],
-  });
+  const res = (await VillageApi.getVallageList()).map(p => ({
+    id: p.id,
+    title: p.villageName,
+    longitude: Number(p.longitude),
+    latitude: Number(p.latitude),
+    width: 30,
+    height: 30,
+    iconPath: p.thumbnail || p.image,
+  }));
+  setTimeout(() => {
+    mapCtx.includePoints({
+      points: res.map(p => {
+        if (!p.longitude || !p.latitude) {
+          p.longitude = AppCofig.defaultLonLat[0];
+          p.latitude = AppCofig.defaultLonLat[1];
+        }
+        return {
+          latitude: p.latitude,
+          longitude: p.longitude,
+        }
+      }),
+      padding: [20, 20, 20, 20],
+    });
+  }, 200);
   return res;
 });
 
 const recommendLoader = useSimpleDataLoader(async () => {
-  return [
-    { 
-      title: '茶艺传承作坊', 
-      desc: '',
-      image: testImage(),
-      thumbnail: testImage(),
-    },
-    { 
-      title: '茶艺传承作坊', 
-      desc: '', 
-      image: testImage(),
-      thumbnail: testImage(),
-    },
-    { 
-      title: '茶艺传承作坊',  
-      desc: '',
-      image: testImage(),
-      thumbnail: testImage(),
-    },
-    { 
-      title: '茶艺传承作坊',  
-      desc: '',
-      image: testImage(),
-      thumbnail: testImage(),
-    },
-  ]
+  const category = (await CommonContent.getCategoryList(151)).find(p => p.title == '省级');
+  return (await VillageApi.getVallageList(category?.id)).slice(0, 8);
 });
 
 const discoverLoader = useSimpleDataLoader(async () => {

src/pages/home/store/index.vue

@@ -3,7 +3,7 @@
     <SearchBar placeholder="输入关键词搜索" />
     <FlexCol :radius="15" overflow="hidden">
       <ImageSwiper 
-        :height="200"
+        :height="300"
         :images="[
           'https://mn.wenlvti.net/app_static/minnan/images/home/BackgroundBanner5.jpg',
           'https://mn.wenlvti.net/app_static/minnan/images/home/BackgroundBanner4.jpg',

src/pages/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="index">
-    <StatusBarSpace backgroundColor="primary" />
+    <StatusBarSpace backgroundColor="transparent" />
     <NavBar 
       :title="title"
       :titleScroll="false"
@@ -42,15 +42,15 @@ import StoreIndex from './home/store/index.vue';
 const title = computed(() => {
   switch (tabIndex.value) {
     case 0:
-      return '乡源·乡村文化资源挖掘平台';
+      return '首页·村社文化资源挖掘平台';
     case 1:
-      return '发现·乡村文化资源挖掘平台';
+      return '发现·村社文化资源挖掘平台';
     case 2:
-      return '挖掘·乡村文化资源';
+      return '挖掘·村社文化资源挖掘平台';
     case 3:
-      return '知识库·乡村文化资源挖掘平台';
+      return '知识库·村社文化资源挖掘平台';
     case 4:
-      return '我的·乡村文化资源挖掘平台';
+      return '我的·村社文化资源挖掘平台';
   }
   return '';
 });