From cbf5709f866ca43afb9c25d7b12710a172c581df Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Tue, 11 Jun 2024 11:33:17 +0800
Subject: [PATCH 1/4] merge

---
 .../VFormDesign/components/FormItemProps.vue  | 27 +++++++
 src/views/demo/onlineform/formCall/index.vue  |  5 +-
 src/views/demo/workflow/create/preview.vue    | 38 +++++++--
 src/views/demo/workflow/h5/audit.vue          |  4 +
 .../demo/workflow/task/process/audit.vue      | 80 +++++++++++++++----
 .../demo/workflow/task/uncompletedTask.vue    |  6 ++
 6 files changed, 138 insertions(+), 22 deletions(-)

diff --git a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
index 37485b83..f901aaa7 100644
--- a/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
+++ b/src/views/demo/form-design/components/VFormDesign/components/FormItemProps.vue
@@ -19,6 +19,33 @@
             placeholder="请选择空间数据表"
           />
         </FormItem>
+
+        <FormItem label="图层数据表">
+          <a-input
+            v-model:value="formConfig.currentItem.mapSetData.layerFields.dataTable"
+            placeholder="请输入图层数据表"
+            disabled="false"
+          />
+        </FormItem>
+
+        <FormItem label="请选择主键字段">
+          <a-select
+            v-model:value="formConfig.currentItem.mapSetData.layerFields.gidField"		              
+            :options="formConfig.currentItem.mapSetData.layerFields.labelFieldOptions"
+            size="middle"
+            placeholder="请选择主键字段"
+          />
+        </FormItem>
+
+        <FormItem label="请选择Geom字段">	            
+          <a-select
+            v-model:value="formConfig.currentItem.mapSetData.layerFields.geomField"		                          
+            :options="formConfig.currentItem.mapSetData.layerFields.labelFieldOptions"
+            size="middle"
+            placeholder="请选择Geom字段"
+          />
+        </FormItem>
+
         <FormItem label="是否允许编辑图斑">
           <Switch v-model:checked="formConfig.currentItem.mapSetData.isAllowEditPolygon" />
         </FormItem>
diff --git a/src/views/demo/onlineform/formCall/index.vue b/src/views/demo/onlineform/formCall/index.vue
index 02c4905e..2e18bf5f 100644
--- a/src/views/demo/onlineform/formCall/index.vue
+++ b/src/views/demo/onlineform/formCall/index.vue
@@ -64,7 +64,7 @@
       width="100%"
       wrap-class-name="full-modal"
       v-model:open="previewOpen"
-      title="流程发起"
+      title="11"
       :destroyOnClose="true"
     >
       <template #footer> </template>
@@ -513,6 +513,7 @@
         if (rows.length == 0) {
           return createMessage.warn('请选择一条数据查看详情');
         }
+        console.log("DetailsRow",rows);
         let toProps = {
           isDetail: true,
           isUpdate: false,
@@ -805,9 +806,11 @@
     // Add
     if(status == "Add"){
       let geoms:string[] = [];
+
       mapgemoList.value?.forEach((item,index)=>{
         console.log("mapgeoms",item);
       })
+
       let addForm = {
         "tableName": "drone_shp_data",
         "guidFieldName": "id",
diff --git a/src/views/demo/workflow/create/preview.vue b/src/views/demo/workflow/create/preview.vue
index c28f323b..b3f8d361 100644
--- a/src/views/demo/workflow/create/preview.vue
+++ b/src/views/demo/workflow/create/preview.vue
@@ -18,12 +18,24 @@
     </div>
     <a-tabs v-model:activeKey="activeName" @change="changeActive">
       <a-tab-pane key="form" tab="表单信息" v-if="formVisble">
-        <FormViewer
-          ref="formBoxRef"
-          :formConfig="formConfig"
-          :formVerison="designerData.formCurrentNode.formVerison"
-          v-if="formVisble"
-        />
+        <div class="form-container">
+          <FormViewer
+            ref="formBoxRef"
+            :formConfig="formConfig"
+            :formVerison="designerData.formCurrentNode.formVerison"
+            v-if="formVisble"
+          />
+        </div>
+        <div class="maper-container">
+          <MapboxMap
+            :mapConfig="mapSetData"
+            :layers="layers"
+            :location="location"
+            @handlerDrawComplete="handlerDrawComplete"
+            @mapOnLoad="mapOnLoad"
+            ref="MapboxComponent"
+          />
+        </div>
       </a-tab-pane>
       <a-tab-pane key="form" tab="系统表单信息" v-if="formUrlVisble">
         <AsyncComponent ref="pcForm" />
@@ -87,6 +99,7 @@
   import { IFormConfig } from '@/views/demo/form-design/typings/v-form-component';
   import { useMessage } from '@/hooks/web/useMessage';
 
+  const MapboxMap = defineAsyncComponent(() => import('@/components/MapboxMaps/MapComponent.vue'));
   const { createMessage } = useMessage();
   const formBoxRef = ref<any>();
   const userStore = useUserStore();
@@ -193,6 +206,8 @@
     }
 
     formConfig.value = currentNode.authFields;
+
+    console.log("formConfigConfig",formConfig.value);
     designerData.formCurrentNode = currentNode;
     getFormHistory();
   }
@@ -395,4 +410,15 @@
   .form-box {
     width: 480px;
   }
+
+  .form-container{
+    float:left;
+    width:60%
+  }
+  .maper-container{
+    float:left;
+    width:40%;
+    padding:20px;
+    height:100%;
+  }
 </style>
diff --git a/src/views/demo/workflow/h5/audit.vue b/src/views/demo/workflow/h5/audit.vue
index 064de339..24b75c91 100644
--- a/src/views/demo/workflow/h5/audit.vue
+++ b/src/views/demo/workflow/h5/audit.vue
@@ -714,4 +714,8 @@
       margin-right: 8px;
     }
   }
+
+  ::v-deep .full-modal .ant-modal-body{
+    height:95%!important;
+  }
 </style>
diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue
index 0e85939f..b578903d 100644
--- a/src/views/demo/workflow/task/process/audit.vue
+++ b/src/views/demo/workflow/task/process/audit.vue
@@ -8,18 +8,31 @@
     </div>
     <a-layout>
       <a-layout>
-        <a-layout-content>
-          <a-tabs v-model:activeKey="activeName" @change="changeActive">
+        <a-layout-content> 
+          <a-tabs v-model:activeKey="activeName" @change="changeActive" type="card">
             <a-tab-pane key="form" tab="表单信息" v-if="formVisble">
-              <FormViewer
-                ref="formBoxRef"
-                :formConfig="formConfig"
-                :processId="designerData.process.id"
-                :formVerison="designerData.formCurrentNode.formVerison"
-                :formRelationId="designerData.formCurrentNode.formRelationId"
-                :instanceInfo="designerData.process.instanceInfo"
-                v-if="formVisble"
-              />
+              <div class="form-container">
+                <FormViewer
+                  ref="formBoxRef"
+                  :formConfig="formConfig"
+                  :processId="designerData.process.id"
+                  :formVerison="designerData.formCurrentNode.formVerison"
+                  :formRelationId="designerData.formCurrentNode.formRelationId"
+                  :instanceInfo="designerData.process.instanceInfo"
+                  v-if="formVisble"
+                />
+              </div>
+              <div class="maper-container">
+                <MapboxMap
+                  :mapConfig="mapSetData"
+                  :layers="layers"
+                  :location="location"
+                  @handlerDrawComplete="handlerDrawComplete"
+                  @mapOnLoad="mapOnLoad"
+                  ref="MapboxComponent"
+                />
+              </div>
+
             </a-tab-pane>
             <a-tab-pane key="form" tab="系统表单信息" v-if="formUrlVisble">
               <AsyncComponent ref="pcForm" />
@@ -60,16 +73,21 @@
               </a-timeline>
             </a-tab-pane>
           </a-tabs>
+          
         </a-layout-content>
         <!-- <a-divider type="vertical" /> -->
-        <a-layout-sider v-if="props.isRead == 0">
-          <a-tabs v-model:activeKey="auditName">
+        <!-- <a-layout-sider >
+          
+        </a-layout-sider> -->
+        <a-layout-footer :style="footerStyle"> 
+          <a-tabs v-if="props.isRead == 0" v-model:activeKey="auditName">
             <a-tab-pane key="audit" :tab="auditTitleVal">
               <div class="approval-column">
                 <a-form
                   ref="formRef"
                   :rules="rules"
                   :model="formData"
+                  size="small"
                   labelAlign="left"
                   :label-col="labelCol"
                   :wrapper-col="wrapperCol"
@@ -97,7 +115,7 @@
               </div>
             </a-tab-pane>
           </a-tabs>
-        </a-layout-sider>
+        </a-layout-footer>
       </a-layout>
     </a-layout>
 
@@ -148,6 +166,7 @@
   import { IFormConfig } from '@/views/demo/form-design/typings/v-form-component';
   import { useMessage } from '@/hooks/web/useMessage';
   import { buildGUID } from '@/utils/uuid';
+  const MapboxMap = defineAsyncComponent(() => import('@/components/MapboxMaps/MapComponent.vue'));
 
   const { createMessage } = useMessage();
   const formBoxRef = ref<any>();
@@ -179,6 +198,14 @@
   const rules: any = ref({
     des: [{ required: true, message: '请填写审批意见', trigger: 'blur' }],
   });
+
+  const footerStyle = ref({
+    height:"440px",
+    overFlow:"auto",
+    color: '#fff',
+    backgroundColor: '#ffffff',
+    zIndex:"9999999999",
+  })
   if (props.type == 4) {
     rules.value = {};
   }
@@ -669,6 +696,7 @@
   onBeforeMount(() => {
     getTaskInfo();
   });
+
 </script>
 <style lang="less" scoped>
   ::v-deep .ant-tabs-nav-wrap {
@@ -686,7 +714,7 @@
   }
   .info-box {
     display: inline-block;
-    width: 300px;
+    width: 0px;
     position: absolute;
     right: 0;
     margin-top: 40px;
@@ -718,6 +746,7 @@
       padding: 10px;
       justify-content: flex-end;
       display: flex;
+      display:none;
     }
   }
   ::v-deep .vben-page-wrapper-content {
@@ -749,4 +778,25 @@
       margin-right: 8px;
     }
   }
+  ::v-deep .ant-modal-footer{
+    display:none!important;
+    height:0px!important;
+  }
+  ::v-deep .ant-layout-footer{
+    padding:0px !important;
+    overflow: auto!important;
+  }
+
+  .form-container{
+    float:left;
+    width:60%
+  }
+  .maper-container{
+    float:left;
+    width:40%;
+    padding:20px;
+    height:100%;
+  }
+
+
 </style>
diff --git a/src/views/demo/workflow/task/uncompletedTask.vue b/src/views/demo/workflow/task/uncompletedTask.vue
index 8b8b7445..42ee9b16 100644
--- a/src/views/demo/workflow/task/uncompletedTask.vue
+++ b/src/views/demo/workflow/task/uncompletedTask.vue
@@ -19,6 +19,7 @@
       wrap-class-name="full-modal"
       v-model:open="auditOpen"
       title="审核"
+      footer=""
       :destroyOnClose="true"
     >
       <template #footer> </template>
@@ -189,4 +190,9 @@
       height: 85%;
     }
   }
+
+  ::v-deep .full-modal .ant-modal-body{
+    height:95%!important;
+  }
+
 </style>

From 4b81a88d6b4d3647a05586bed0f3288a4e8bf116 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Tue, 11 Jun 2024 17:35:07 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=A1=E7=89=87=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VFormCreate/components/FormRender.vue     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/views/demo/form-design/components/VFormCreate/components/FormRender.vue b/src/views/demo/form-design/components/VFormCreate/components/FormRender.vue
index 15e0a40c..14a45db1 100644
--- a/src/views/demo/form-design/components/VFormCreate/components/FormRender.vue
+++ b/src/views/demo/form-design/components/VFormCreate/components/FormRender.vue
@@ -95,6 +95,31 @@
       </a-tab-pane>
     </a-tabs>
   </template>
+  <template v-else-if="['CardGroup'].includes(schema.component)">
+    <div style="width: 100%">
+      <div style="display: flex">
+        {{ schema.label }}
+        <div style="margin-left: 10px">
+          <a-radio-group
+            v-model:value="noTitleKey"
+            :options="schema.componentProps.options"
+          />
+        </div>
+      </div>
+      <template v-for="(item, index) in schema.componentProps.options" :key="index">
+        <a-card style="width: 100%" v-show="noTitleKey === item.value">
+          <FormRender
+            v-for="(childItem, k) in item.children"
+            :key="k"
+            :schema="childItem"
+            :formData="formData"
+            :formConfig="formConfig"
+            :setFormModel="setFormModel"
+          />
+        </a-card>
+      </template>
+    </div>
+  </template>
   <template v-else>
     <VFormItem
       v-if="(isCreateOrModifyComponent && schema.display) || !isCreateOrModifyComponent"
@@ -162,6 +187,10 @@
   let subTableId = ref(null);
   let subTableData = ref([]);
   let subTableList = ref([]);
+  const noTitleKey = ref('0')
+  if(props.schema.component === 'CardGroup'){
+    noTitleKey.value = props.schema.componentProps.options[0].value
+  }
 
   // if (props.formConfig.schemas) {
   //   props.formConfig.schemas.forEach((item) => {

From b5d33d6ae466d7690478c04c143c4237db2c42fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com>
Date: Tue, 11 Jun 2024 17:43:58 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=AE=BE=E8=AE=A1-UI?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/huichuang_logo.png                     | Bin 0 -> 6715 bytes
 public/iocn/text-indent-left.svg              |   3 +
 public/iocn/text-indent-right.svg             |   3 +
 .../components/VFormDesign/index.vue          |  27 ++-
 .../VFormDesign/modules/Toolbar.vue           |  10 +-
 .../demo/form-design/core/formItemConfig.ts   | 199 +++++++++---------
 .../demo/onlineform/formdesign/FormModal.vue  |   4 +-
 7 files changed, 136 insertions(+), 110 deletions(-)
 create mode 100644 public/huichuang_logo.png
 create mode 100644 public/iocn/text-indent-left.svg
 create mode 100644 public/iocn/text-indent-right.svg

diff --git a/public/huichuang_logo.png b/public/huichuang_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8fb5011a66472a10a484b2ace997dad37af81b9
GIT binary patch
literal 6715
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
I3b%Ooe`IYl!~g&Q

literal 0
HcmV?d00001

diff --git a/public/iocn/text-indent-left.svg b/public/iocn/text-indent-left.svg
new file mode 100644
index 00000000..5a607af0
--- /dev/null
+++ b/public/iocn/text-indent-left.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-text-indent-left" viewBox="0 0 16 16">
+  <path d="M2 3.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5m.646 2.146a.5.5 0 0 1 .708 0l2 2a.5.5 0 0 1 0 .708l-2 2a.5.5 0 0 1-.708-.708L4.293 8 2.646 6.354a.5.5 0 0 1 0-.708M7 6.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5m0 3a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5m-5 3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5"/>
+</svg>
\ No newline at end of file
diff --git a/public/iocn/text-indent-right.svg b/public/iocn/text-indent-right.svg
new file mode 100644
index 00000000..de91d9e4
--- /dev/null
+++ b/public/iocn/text-indent-right.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-text-indent-right" viewBox="0 0 16 16">
+  <path d="M2 3.5a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5m10.646 2.146a.5.5 0 0 1 .708.708L11.707 8l1.647 1.646a.5.5 0 0 1-.708.708l-2-2a.5.5 0 0 1 0-.708zM2 6.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5m0 3a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5m0 3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5"/>
+</svg>
\ No newline at end of file
diff --git a/src/views/demo/form-design/components/VFormDesign/index.vue b/src/views/demo/form-design/components/VFormDesign/index.vue
index a421cf66..de47f4a2 100644
--- a/src/views/demo/form-design/components/VFormDesign/index.vue
+++ b/src/views/demo/form-design/components/VFormDesign/index.vue
@@ -4,15 +4,21 @@
       :class="`left ${prefixCls}-sider`"
       collapsible
       collapsedWidth="0"
-      width="300"
+      width="345"
       :zeroWidthTriggerStyle="{
         'margin-top': '-70px',
-        'background-color': 'gray',
+        'background-color': 'white',
+        width: '35px',
+        height: '35px',
+        'background-image': `url(/iocn/text-indent-right.svg)`,
+        'background-position': 'center',
+        'background-repeat': 'no-repeat',
+        'border-radius:': '15px',
       }"
       breakpoint="md"
     >
       <div class="collapseItem-box">
-        <CollapseContainer title="基础控件" ghost>
+        <CollapseContainer title="基础控件">
           <CollapseItem
             :list="baseComponents"
             :handleListPush="handleListPushDrag"
@@ -57,8 +63,17 @@
       collapsible
       :reverseArrow="true"
       collapsedWidth="0"
-      width="270"
-      :zeroWidthTriggerStyle="{ 'margin-top': '-70px', 'background-color': 'gray' }"
+      width="320"
+      :zeroWidthTriggerStyle="{
+        'margin-top': '-70px',
+        'background-color': 'white',
+        width: '35px',
+        height: '35px',
+        'background-image': `url(/iocn/text-indent-left.svg)`,
+        'background-position': 'center',
+        'background-repeat': 'no-repeat',
+        'border-radius:': '15px',
+      }"
       breakpoint="lg"
     >
       <PropsPanel ref="propsPanel" :activeKey="formConfig.activeKey">
@@ -433,7 +448,7 @@
   }
 
   .collapseItem-box {
-    height: calc(100vh - 60px);
+    height: calc(100vh - 55px);
     overflow: auto;
   }
 </style>
diff --git a/src/views/demo/form-design/components/VFormDesign/modules/Toolbar.vue b/src/views/demo/form-design/components/VFormDesign/modules/Toolbar.vue
index 3bf74bdc..0bca6dd6 100644
--- a/src/views/demo/form-design/components/VFormDesign/modules/Toolbar.vue
+++ b/src/views/demo/form-design/components/VFormDesign/modules/Toolbar.vue
@@ -5,21 +5,21 @@
   <div class="operating-area">
     <!-- 头部操作按钮区域 start -->
     <!-- 操作左侧区域 start -->
-    <div class="left-btn-box">
+    <div class="left-btn-box" style="text-indent: 20px">
       <Tooltip v-for="item in toolbarsConfigs" :title="item.title" :key="item.icon">
         <a @click="$emit(item.event)" class="toolbar-text">
-          <Icon :icon="item.icon" />
+          <Icon :icon="item.icon" :style="{ fontSize: '21px' }" />
         </a>
       </Tooltip>
       <Divider type="vertical" />
       <Tooltip title="撤销">
         <a :class="{ disabled: !canUndo }" :disabled="!canUndo" @click="undo">
-          <Icon icon="ant-design:undo-outlined" />
+          <Icon icon="ant-design:undo-outlined" :style="{ fontSize: '21px' }" />
         </a>
       </Tooltip>
       <Tooltip title="重做">
         <a :class="{ disabled: !canRedo }" :disabled="!canRedo" @click="redo">
-          <Icon icon="ant-design:redo-outlined" />
+          <Icon icon="ant-design:redo-outlined" :style="{ fontSize: '21px' }" />
         </a>
       </Tooltip>
     </div>
@@ -80,7 +80,7 @@
             title: '生成代码',
             type: 'exportCode',
             event: 'handleOpenCodeModal',
-            icon: 'ant-design:code-filled',
+            icon: 'bi:code-slash',
           },
           {
             title: '清空',
diff --git a/src/views/demo/form-design/core/formItemConfig.ts b/src/views/demo/form-design/core/formItemConfig.ts
index 9e4f34d5..01d78423 100644
--- a/src/views/demo/form-design/core/formItemConfig.ts
+++ b/src/views/demo/form-design/core/formItemConfig.ts
@@ -5,7 +5,7 @@ import { IVFormComponent } from '../typings/v-form-component';
 import { isArray } from 'lodash-es';
 import { componentMap as VbenCmp, add } from '@/components/Form/src/componentMap';
 import { ComponentType } from '@/components/Form/src/types';
-import { uploadApi,fileUploadApi } from '@/api/sys/upload';
+import { uploadApi, fileUploadApi } from '@/api/sys/upload';
 import { componentMap as Cmp } from '../components';
 import { Component } from 'vue';
 import { getDeptList, getAccountList, getPosGroupList } from '@/api/demo/system';
@@ -106,7 +106,7 @@ export const customComponents: IVFormComponent[] = [
   {
     component: 'InputGuid',
     label: 'GUID主键',
-    icon: 'bi:input-cursor-text',
+    icon: 'bi:braces-asterisk',
     field: '',
     colProps: { span: 24 },
     componentProps: {},
@@ -114,7 +114,7 @@ export const customComponents: IVFormComponent[] = [
   {
     component: 'TreeSelect',
     label: '职级选择',
-    icon: 'gg:select',
+    icon: 'bi:list-stars',
     field: '',
     colProps: { span: 24 },
     componentProps: {
@@ -129,7 +129,7 @@ export const customComponents: IVFormComponent[] = [
   {
     component: 'TreeSelect',
     label: '部门选择',
-    icon: 'clarity:tree-view-line',
+    icon: 'bi:people',
     field: '',
     colProps: { span: 24 },
     componentProps: {
@@ -144,7 +144,7 @@ export const customComponents: IVFormComponent[] = [
   {
     component: 'Select',
     label: '人员选择',
-    icon: 'gg:select',
+    icon: 'bi:person',
     field: '',
     colProps: { span: 24 },
     componentProps: {
@@ -158,7 +158,7 @@ export const customComponents: IVFormComponent[] = [
   {
     component: 'MapGeom',
     label: '图斑',
-    icon: 'ant-design:heat-map-outlined',
+    icon: 'bi:box-arrow-in-up-left',
     field: 'MapGeom',
     colProps: { span: 24 },
     componentProps: {},
@@ -167,7 +167,7 @@ export const customComponents: IVFormComponent[] = [
     field: '',
     component: 'Grid',
     label: '设计子表',
-    icon: 'ant-design:snippets-outlined',
+    icon: 'bi:list-ul',
     type: 'subTable',
     componentProps: {},
     columns: [
@@ -190,7 +190,7 @@ export const baseComponents: IVFormComponent[] = [
   {
     component: 'InputCountDown',
     label: '倒计时输入',
-    icon: 'line-md:iconify2',
+    icon: 'ant-design:hourglass-outlined',
     colProps: { span: 24 },
     field: '',
     componentProps: {},
@@ -198,7 +198,7 @@ export const baseComponents: IVFormComponent[] = [
   {
     component: 'IconPicker',
     label: '图标选择器',
-    icon: 'line-md:iconify2',
+    icon: 'bi:grid',
     colProps: { span: 24 },
     field: '',
     componentProps: {},
@@ -214,7 +214,7 @@ export const baseComponents: IVFormComponent[] = [
   {
     component: 'AutoComplete',
     label: '自动完成',
-    icon: 'wpf:password1',
+    icon: 'bi:check2-circle',
     colProps: { span: 24 },
     field: '',
     componentProps: {
@@ -242,36 +242,10 @@ export const baseComponents: IVFormComponent[] = [
       dashed: true,
     },
   },
-  {
-    component: 'Checkbox',
-    label: '复选框',
-    icon: 'ant-design:check-circle-outlined',
-    colProps: { span: 24 },
-    field: '',
-  },
-  {
-    component: 'CheckboxGroup',
-    label: '复选框-组',
-    icon: 'ant-design:check-circle-filled',
-    field: '',
-    colProps: { span: 24 },
-    componentProps: {
-      options: [
-        {
-          label: '选项1',
-          value: '1',
-        },
-        {
-          label: '选项2',
-          value: '2',
-        },
-      ],
-    },
-  },
   {
     component: 'Input',
     label: '输入框',
-    icon: 'bi:input-cursor-text',
+    icon: 'bi:braces',
     field: '',
     colProps: { span: 24 },
     componentProps: {
@@ -289,15 +263,23 @@ export const baseComponents: IVFormComponent[] = [
   {
     component: 'InputTextArea',
     label: '文本域',
-    icon: 'ant-design:file-text-filled',
+    icon: 'ant-design:file-text-outlined',
     field: '',
     colProps: { span: 24 },
     componentProps: {},
   },
   {
-    component: 'Select',
-    label: '下拉选择',
-    icon: 'gg:select',
+    component: 'Radio',
+    label: '单选框',
+    icon: 'carbon:radio-button-checked',
+    field: '',
+    colProps: { span: 24 },
+    componentProps: {},
+  },
+  {
+    component: 'RadioGroup',
+    label: '单选框-组',
+    icon: 'bi:ui-radios-grid',
     field: '',
     colProps: { span: 24 },
     componentProps: {
@@ -313,19 +295,17 @@ export const baseComponents: IVFormComponent[] = [
       ],
     },
   },
-
   {
-    component: 'Radio',
-    label: '单选框',
-    icon: 'ant-design:check-circle-outlined',
-    field: '',
+    component: 'Checkbox',
+    label: '复选框',
+    icon: 'bi:check-square',
     colProps: { span: 24 },
-    componentProps: {},
+    field: '',
   },
   {
-    component: 'RadioGroup',
-    label: '单选框-组',
-    icon: 'carbon:radio-button-checked',
+    component: 'CheckboxGroup',
+    label: '复选框-组',
+    icon: 'bi:ui-checks-grid',
     field: '',
     colProps: { span: 24 },
     componentProps: {
@@ -396,11 +376,45 @@ export const baseComponents: IVFormComponent[] = [
   {
     component: 'Switch',
     label: '开关',
-    icon: 'entypo:switch',
+    icon: 'bi:toggle-off',
     field: '',
     colProps: { span: 24 },
     componentProps: {},
   },
+  {
+    component: 'Button',
+    label: '按钮组件',
+    icon: 'ant-design:build-outlined',
+    field: '',
+    colProps: { span: 24 },
+    hiddenLabel: true,
+    componentProps: {
+      type: 'default',
+      shape: 'default',
+      size: 'middle',
+      icon: '',
+      clickCode: '',
+    },
+  },
+  {
+    component: 'Select',
+    label: '下拉选择',
+    icon: 'gg:select',
+    field: '',
+    colProps: { span: 24 },
+    componentProps: {
+      options: [
+        {
+          label: '选项1',
+          value: '1',
+        },
+        {
+          label: '选项2',
+          value: '2',
+        },
+      ],
+    },
+  },
   {
     component: 'TreeSelect',
     label: '树形选择',
@@ -461,21 +475,6 @@ export const baseComponents: IVFormComponent[] = [
       ],
     },
   },
-  {
-    component: 'Button',
-    label: '按钮组件',
-    icon: 'ant-design:build-outlined',
-    field: '',
-    colProps: { span: 24 },
-    hiddenLabel: true,
-    componentProps: {
-      type: 'default',
-      shape: 'default',
-      size: 'middle',
-      icon: '',
-      clickCode: '',
-    },
-  },
   // {
   //   component: 'ColorPicker',
   //   label: '颜色选择器',
@@ -490,7 +489,7 @@ export const baseComponents: IVFormComponent[] = [
   {
     component: 'slot',
     label: '插槽',
-    icon: 'vs:timeslot-question',
+    icon: 'bi:inboxes',
     field: '',
     colProps: { span: 24 },
     componentProps: {
@@ -498,7 +497,7 @@ export const baseComponents: IVFormComponent[] = [
     },
   },
   {
-    component:'CreateUser',
+    component: 'CreateUser',
     type: 'createuser',
     label: '创建人员',
     icon: 'mdi:account-check',
@@ -507,7 +506,7 @@ export const baseComponents: IVFormComponent[] = [
     componentProps: {},
   },
   {
-    component:'ModifyUser',
+    component: 'ModifyUser',
     type: 'modifyuser',
     label: '修改人员',
     icon: 'mdi:account-edit',
@@ -516,7 +515,7 @@ export const baseComponents: IVFormComponent[] = [
     componentProps: {},
   },
   {
-    component:'CreateTime',
+    component: 'CreateTime',
     type: 'createtime',
     label: '创建时间',
     icon: 'ic:outline-event-available',
@@ -525,70 +524,74 @@ export const baseComponents: IVFormComponent[] = [
     componentProps: {},
   },
   {
-    component:'ModifyTime',
+    component: 'ModifyTime',
     type: 'modifytime',
     label: '修改时间',
     icon: 'ic:outline-event',
     colProps: { span: 24 },
     field: '',
     componentProps: {},
-  },{
+  },
+  {
     component: 'FileUpload',
     label: '文件上传',
     icon: 'ant-design:file-add-outlined',
     field: '',
     colProps: { span: 24 },
     componentProps: {
-      api:fileUploadApi,
-      maxNumber:10,
+      api: fileUploadApi,
+      maxNumber: 10,
       maxSize: 2,
-      name:"files",
-      action:"/api/Files/Upload",
-      server:"http://192.168.10.102:9023"
+      name: 'files',
+      action: '/api/Files/Upload',
+      server: 'http://192.168.10.102:9023',
     },
-  },{
+  },
+  {
     component: 'ImageUpload',
     label: '图片上传',
     icon: 'ant-design:file-image-outlined',
     field: '',
     colProps: { span: 24 },
     componentProps: {
-      api:fileUploadApi,
-      maxNumber:10,
+      api: fileUploadApi,
+      maxNumber: 10,
       accept: ['png', 'jpeg', 'jpg'],
       maxSize: 2,
-      name:"files",
-      action:"/api/Files/Upload",
-      server:"http://192.168.10.102:9023"
+      name: 'files',
+      action: '/api/Files/Upload',
+      server: 'http://192.168.10.102:9023',
     },
-  },{
+  },
+  {
     component: 'VideoUpload',
     label: '视频上传',
     icon: 'ant-design:video-camera-outlined',
     field: '',
     colProps: { span: 24 },
     componentProps: {
-      api:fileUploadApi,
-      maxNumber:10,
+      api: fileUploadApi,
+      maxNumber: 10,
       accept: ['mp4', 'mov', 'avi'],
       maxSize: 100,
-      name:"files",
-      action:"/api/Files/Upload",
-      server:"http://192.168.10.102:9023"
+      name: 'files',
+      action: '/api/Files/Upload',
+      server: 'http://192.168.10.102:9023',
     },
-  },{
+  },
+  {
     component: 'Location',
     label: '获取位置',
     icon: 'ant-design:environment-outlined',
     field: '',
     colProps: { span: 24 },
     componentProps: {
-      api:()=>1,
-      maxNumber:10,
+      api: () => 1,
+      maxNumber: 10,
       accept: ['mp4', 'mov', 'avi'],
       maxSize: 100,
     },
-  }
+  },
 ];
 
 // https://next.antdv.com/components/transfer-cn
@@ -632,7 +635,7 @@ export const layoutComponents: IVFormComponent[] = [
     field: '',
     component: 'Grid',
     label: '栅格布局',
-    icon: 'icon-grid',
+    icon: 'bi:border-all',
     componentProps: {},
     columns: [
       {
@@ -649,7 +652,7 @@ export const layoutComponents: IVFormComponent[] = [
     field: '',
     component: 'Card',
     label: '卡片布局',
-    icon: 'ant-design:tags-outlined',
+    icon: 'bi:card-text',
     componentProps: {},
     columns: [
       {
@@ -665,7 +668,7 @@ export const layoutComponents: IVFormComponent[] = [
   {
     component: 'CardGroup',
     label: '卡片组',
-    icon: 'ic:round-auto-awesome-motion',
+    icon: 'bi:card-list',
     colProps: { span: 24 },
     field: '',
     componentProps: {
@@ -673,12 +676,12 @@ export const layoutComponents: IVFormComponent[] = [
         {
           label: '卡片1',
           value: '1',
-          field:`use_card_1`,
+          field: 'use_card_1',
           children: [],
         },
         {
           label: '卡片2',
-          field:`use_card_2`,
+          field: 'use_card_2',
           value: '2',
           children: [],
         },
diff --git a/src/views/demo/onlineform/formdesign/FormModal.vue b/src/views/demo/onlineform/formdesign/FormModal.vue
index 9ed1d1b9..340b3b4a 100644
--- a/src/views/demo/onlineform/formdesign/FormModal.vue
+++ b/src/views/demo/onlineform/formdesign/FormModal.vue
@@ -11,7 +11,9 @@
   >
     <div :class="`${prefixCls}`">
       <div :class="`${prefixCls}-header`">
-        <div :class="`${prefixCls}-header-logo`"> 慧创 表单设计 </div>
+        <div :class="`${prefixCls}-header-logo`">
+          <img src="/huichuang_logo.png" alt="慧创科技" /> <span>表单设计</span>
+        </div>
         <div :class="`${prefixCls}-header-stepsBox`">
           <a-steps
             :current="stepsCurrent"

From 81d22661e0dd6424affb6081ee4dea0e0c212ed2 Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Tue, 11 Jun 2024 17:45:47 +0800
Subject: [PATCH 4/4] merge

---
 src/views/demo/workflow/create/preview.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/demo/workflow/create/preview.vue b/src/views/demo/workflow/create/preview.vue
index 96c77c5e..63e438b8 100644
--- a/src/views/demo/workflow/create/preview.vue
+++ b/src/views/demo/workflow/create/preview.vue
@@ -18,7 +18,7 @@
     </div>
     <a-tabs v-model:activeKey="activeName" @change="changeActive">
       <a-tab-pane key="form" tab="表单信息" v-if="formVisble">
-        <div class="form-container">
+        <div :class="mapConfig?.isShowMap?'form-container':''">
           <FormViewer
             ref="formBoxRef"
             :formConfig="formConfig"
@@ -26,7 +26,7 @@
             v-if="formVisble"
           />
         </div>
-        <div class="maper-container">
+        <div class="maper-container" v-if="mapConfig?.isShowMap">
           <MapboxMap
             :mapConfig="mapConfig"
             @handlerDrawComplete="handlerDrawComplete"