From 3f219370c057a683a32220d2773cfc31da6f031c Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Sat, 14 Feb 2026 14:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/index.vue       |  34 ++---
 .../DesignForm/tableListPage/index.vue        |   2 +-
 .../appPage/appPageForm/pageForm.vue          |   2 +-
 .../appPage/appPageForm/pageFormNew.vue       | 123 ++++++++++++++++++
 .../lowcodepage/appPage/createAppFormPage.vue |  14 ++
 5 files changed, 153 insertions(+), 22 deletions(-)
 create mode 100644 src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue

diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 96dd50f..2ded39f 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -2435,6 +2435,7 @@ const getNonValue = () => {
           @selection-change="selectionChange"
         >
           <template v-for="item in columnsFilter" :key="item.id || item.label">
+            
             <el-table-column
               v-if="['-'].includes(item.fieldClass)"
               :type="item.type"
@@ -2473,9 +2474,19 @@ const getNonValue = () => {
               sortable="custom"
               align="center"
             >
-              <template v-if="item.help" #header="scope">
-                <tooltip :content="item.help" />
+              <template #default="scope">
+                <template v-for="sunItem in item.children" v-if="item.pattern == 'table'"> 
+                  <el-table-column  v-if="sunItem.fieldClass == ''" :prop="sunItem.field" :label="sunItem.label"  header-align="center"  align="center" :min-width="readerColumnSun(sunItem)">
+                    <template #default="scopeChilder">
+                      <div v-html="tableChildren(sunItem.field,scopeChilder.row[item.field])"></div>
+                    </template>
+                  </el-table-column>
+                </template>
+                <template v-if="item.help" >
+                  <tooltip :content="item.help" />
+                </template>
               </template>
+              
             </el-table-column>
 
            
@@ -2643,24 +2654,7 @@ const getNonValue = () => {
                 {{ writeListTitle(scope.row, viewPage.list) }}
               </template>
             </el-table-column>
-            <el-table-column
-              v-else-if="item.fieldClass == ''"
-              :prop="item.field"
-              :label="item.label"
-              :width="readerColumnSun(item)"
-              header-align="center"
-              align="center"
-            >
-              <template #default="scope">
-                <template v-for="sunItem in item.children" v-if="item.pattern == 'table'"> 
-                  <el-table-column  v-if="sunItem.fieldClass == ''" :prop="sunItem.field" :label="sunItem.label"  header-align="center"  align="center" :min-width="readerColumnSun(sunItem)">
-                    <template #default="scopeChilder">
-                      <div v-html="tableChildren(sunItem.field,scopeChilder.row[item.field])"></div>
-                    </template>
-                  </el-table-column>
-                </template>
-              </template>
-            </el-table-column>
+            
             <el-table-column
               v-else
               :prop="item.field"
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index ab0741f..843a482 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -1,7 +1,7 @@
 <!--
 @ 作者: 秦东
 @ 时间: 2024-03-29 14:21:27
-@ 备注: 自定义表单通用列表
+@ 备注: 自定义表单通用列表 
 -->
 <script lang="ts" setup>
 import {
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
index 186bebe..4e0dd84 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue
@@ -782,7 +782,7 @@ const dialogConfirmTree = (val: treeStruct[], types: string) => {
       @version-update-form="versionUpdateForm"
       @version-preview-page="versionPreviewPage"
     />
-  </el-aside>
+  </el-aside> 
   <el-main class="mainBox rightBox">
     <HeadToolsApp
       v-loading="state.loading"
diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue
new file mode 100644
index 0000000..92b8dab
--- /dev/null
+++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue
@@ -0,0 +1,123 @@
+<!--
+@ 作者: 秦东
+@ 时间: 2026-02-14 13:56:35
+@ 备注: 表单编辑页面
+-->
+<script lang='ts' setup>
+import { FormData, formStruct, DrawerStruct, VideoMsg } from "@/api/DesignForm/types";
+
+const props = defineProps({
+    appCont: {
+        type: Object,
+        default() {
+        return {};
+        },
+    },
+    formKey: {
+        type: String,
+        default: "",
+    },
+    appPageKey: {
+        type: String,
+        default: "",
+    },
+    groupKey: {
+        type: String,
+        default: "",
+    },
+    formVersion: {
+        type: String,
+        default: "",
+    },
+    menuId: {
+        type: String,
+        default: "",
+    },
+    formconfigcont: {
+        type: Object,
+        default() {
+        return {};
+        },
+    },
+    state: {
+        type: Object,
+        default() {
+        return {};
+        },
+    },
+});
+
+const emits = defineEmits<{
+    (e: "update:state", val: formStruct): void;
+    (e: "update:formKey", val: string): void;
+    (e: "update:appPageKey", val: string): void;
+    (e: "update:formVersion", val: string): void;
+    (e: "judgeFormIsEdit", val: boolean): void;
+    (e: "runNextWindows", val: number): void;
+    (e: "closeFormPage"): void;
+}>();
+
+const attrActiveTab = ref("first");
+</script>
+<template>
+  <div class="form-content">
+    <el-card  shadow="always">
+        <template #header>
+            <div class="card-header">控件库</div>
+        </template>
+        <el-scrollbar ref="scrollbarRef" class="scroBox ">
+
+        </el-scrollbar>
+    </el-card>
+    <el-card  shadow="always">
+         <template #header>
+            <div class="card-header">控件库</div>
+        </template>
+    </el-card>
+    <el-card  shadow="always">
+         <template #header>
+            <div class="card-header">控件库</div>
+        </template>
+        <el-tabs v-model="attrActiveTab">
+            <el-tab-pane label="字段设置" name="first">字段设置</el-tab-pane>
+            <el-tab-pane label="表单设置" name="second">表单设置</el-tab-pane>
+            <el-tab-pane label="AI设置" name="third">AI设置</el-tab-pane>
+        </el-tabs>
+    </el-card>
+  </div>
+</template>
+<style  lang='scss' scoped>
+.form-content {
+    width: 100%;
+    display: grid;
+    grid-template-columns: 300px 1fr 300px;
+    grid-template-rows: auto;
+    gap: 10px;
+    padding: 10px 10px 0 10px;
+
+}
+.card-header{
+    font-size: 1.4rem;
+    font-weight: 700;
+    color: #0020C2;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+}
+:deep .el-card__header{
+    padding: 10px 15px;
+}
+:deep .el-card__body{
+    padding: 0;
+    
+}
+:deep .el-tabs__header{
+    justify-content: space-between;
+    width: 100%;
+}
+
+.scroBox{
+    height: calc(100vh - 110px);
+    overflow: auto;
+}
+</style>
diff --git a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
index 50af6fc..80301cc 100644
--- a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
@@ -13,6 +13,8 @@ import { formHasPower } from "@/directive/permission/button";
 
 
 import PageForm from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue";
+import NewPageForm from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue";
+
 import PageFlow from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFlow.vue";
 import PageList from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue";
 import PrintSetupPage2 from "@/views/sysworkflow/lowcodepage/appPage/appPageForm/printSetupPage2.vue";
@@ -251,6 +253,18 @@ onBeforeMount(() => {
           </div>
         </el-header>
         <el-container>
+          <!-- <NewPageForm
+            v-if="tabsActive == 1"
+            ref="appPageInfo"
+            v-model:state="state"
+            v-model:form-version="formVersion"
+            v-model:app-page-key="appPageKey"
+            :form-key="props.formKey"
+            :app-cont="props.appCont"
+            :menu-id="menuId"
+            :group-key="props.groupKey"
+            :formconfigcont="formConfigCont"
+          /> -->
           <PageForm
             v-if="tabsActive == 1"
             ref="appPageInfo"