From 14bdf471e70011cb139f81e12bd1a15cbb914ef1 Mon Sep 17 00:00:00 2001
From: fanjiao <yaodiemail@163.com>
Date: Wed, 8 Jan 2025 09:34:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/torna/dao/entity/Attachment.java           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/server-dao/src/main/java/cn/torna/dao/entity/Attachment.java b/server/server-dao/src/main/java/cn/torna/dao/entity/Attachment.java
index cb953b45..8bf4eed8 100644
--- a/server/server-dao/src/main/java/cn/torna/dao/entity/Attachment.java
+++ b/server/server-dao/src/main/java/cn/torna/dao/entity/Attachment.java
@@ -47,5 +47,7 @@ public class Attachment {
     /**  */
     private LocalDateTime gmtModified;
 
+    /**豆腐煲上到桌上  */
+
 
 }
\ No newline at end of file
-- 
Gitee


From da6c2db468232c5612c6e6b7e303f538cadfae4c Mon Sep 17 00:00:00 2001
From: fanjiao <yaodiemail@163.com>
Date: Fri, 10 Jan 2025 08:56:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E8=A7=A3=E5=86=B3=E3=80=91?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3Body=20Parameter=E7=9A=84=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E5=88=B0=E9=A1=B6=E7=AB=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/doc/EditTable/index.vue      | 135 ++++---------------
 front/src/views/doc/RootArrayTable/index.vue | 123 ++++-------------
 2 files changed, 55 insertions(+), 203 deletions(-)

diff --git a/front/src/views/doc/EditTable/index.vue b/front/src/views/doc/EditTable/index.vue
index d7439866..076dc0e6 100644
--- a/front/src/views/doc/EditTable/index.vue
+++ b/front/src/views/doc/EditTable/index.vue
@@ -1,22 +1,13 @@
 <template>
-    <u-table
+    <el-table
       :data="getter(rows)"
       row-id="id"
       row-key="id"
-      use-virtual
-      :treeConfig="{
-        children: 'children',
-        iconClose: 'el-icon-arrow-right',
-        iconOpen: 'el-icon-arrow-down',
-        expandAll: true
-      }"
-      :height="600"
-      :row-height="20"
+      default-expand-all
       border
-      class="param-table1"
-      ref="virtualTable"
+      class="param-table"
     >
-    <u-table-column
+    <el-table-column
       :tree-node="true"
       v-if="isColumnShow('name')"
       prop="name"
@@ -45,8 +36,8 @@
           </el-form-item>
         </el-form>
       </template>
-    </u-table-column>
-    <u-table-column
+    </el-table-column>
+    <el-table-column
       v-if="isColumnShow('type')"
       prop="type"
       :label="$t('type')"
@@ -55,8 +46,8 @@
       <template slot-scope="scope">
         <WeSelect :type="'arr'" :value="scope.row.type" @change="(val) =>onWeChange(val,scope.row,'type')" :filterable="true" :allowCreate="true" :list="configTypes" :clearable="false" :size="'mini'"/>
       </template>
-    </u-table-column>
-    <u-table-column
+    </el-table-column>
+    <el-table-column
       v-if="isColumnShow('enum')"
       prop="enum"
       :label="$t('linkDict')"
@@ -65,8 +56,8 @@
       <template slot-scope="scope">
         <WeSelect :type="'obj'" :value="scope.row.enumId" @change="(val) =>onWeChange(val,scope.row,'enumId')" :filterable="true" :allowCreate="false" :list="enumData" :clearable="true" :size="'mini'"/>
       </template>
-    </u-table-column>
-    <u-table-column
+    </el-table-column>
+    <el-table-column
       v-if="isColumnShow('required')"
       prop="required"
       :label="$t('require')"
@@ -75,18 +66,18 @@
       <template slot-scope="scope">
         <WeSwitch :value="scope.row.required" @change="(val) =>onWeChange(val,scope.row,'required')" :activeColor="'#13ce66'" :activeValue="1" :inactivealVue="0"/>
       </template>
-    </u-table-column>
-    <u-table-column
+    </el-table-column>
+    <el-table-column
       v-if="isColumnShow('maxLength')"
       prop="maxLength"
       :label="$t('maxLength')"
       width="130"
     >
       <template slot-scope="scope">
-        <WeInput :value="scope.row.maxLength" @change="(val) =>onWeChange(val,scope.row,'maxLength')" :placeholder="$t('maxLength')" :size="'mini'" :maxlength="10" :showWordLimit="true"/>
+        <WeInput :value="String(scope.row.maxLength)" @change="(val) =>onWeChange(val,scope.row,'maxLength')" :placeholder="$t('maxLength')" :size="'mini'" :maxlength="10" :showWordLimit="true"/>
       </template>
-    </u-table-column>
-    <u-table-column
+    </el-table-column>
+    <el-table-column
       v-if="isColumnShow('description')"
       prop="description"
       :label="descriptionLabel"
@@ -101,8 +92,8 @@
           </el-form-item>
         </el-form>
       </template>
-    </u-table-column>
-    <u-table-column
+    </el-table-column>
+    <el-table-column
       v-if="isColumnShow('example')"
       prop="example"
       :label="exampleLabel"
@@ -110,8 +101,8 @@
       <template slot-scope="scope">
         <WeInput :value="scope.row.example" :size="'mini'" @change="(val) =>onWeChange(val,scope.row,'example')" :placeholder="exampleLabel" :showWordLimit="false"/>
       </template>
-    </u-table-column>
-    <u-table-column
+    </el-table-column>
+    <el-table-column
       prop="orderIndex"
       :label="$t('orderIndex')"
       width="125"
@@ -125,8 +116,8 @@
           @change="(val) =>onWeChange(val,scope.row,'orderIndex')"
         />
       </template>
-    </u-table-column>
-    <u-table-column
+    </el-table-column>
+    <el-table-column
       v-if="isColumnShow('opt')"
       :label="$t('operation')"
       width="90"
@@ -146,8 +137,8 @@
           </div>
         </div>
       </template>
-    </u-table-column>
-  </u-table>
+    </el-table-column>
+  </el-table>
 </template>
 <script>
 import WeInput from "./input.vue"
@@ -245,86 +236,19 @@ export default {
     isTextColumn(name) {
       return this.textColumns.filter(val => val === name).length > 0
     },
-    onParamNodeAdd(row) {
+     onParamNodeAdd(row) {
       const children = row.children || []
-      const child = this.getParamNewRow()
+      let child = this.getParamNewRow()
       child.parentId = row.id
-      child.maxLength = String(child.maxLength)//转为字符类型，解决警告
-      this.pmsNextOrderIndex(children).then(order => {
-        child.orderIndex = order
-      })
       children.push(child)
       row.children = children
-      this.rows.forEach(e => {
-        let flag = false
-        if(e.id === row.id){
-          e.children = row.children
-          flag = true
-        }
-        if(!flag && e.children.length > 0){
-          this.getaddChildren(e.children,row.id,row.children)
-        }
-      })
-
-      // 重新设置scrollTop
-      const tableBodyWrapperTop = this.$refs.virtualTable.$el.querySelector('.el-table__body-wrapper').scrollTop
-      this.$forceUpdate(); // 强制刷新组件
-      this.$nextTick(() => {
-        setTimeout(() => {
-          const tableBodyWrapper = this.$refs.virtualTable.$el.querySelector('.el-table__body-wrapper');
-          if(tableBodyWrapper){
-            tableBodyWrapper.scrollTop = Number(tableBodyWrapperTop)
-          }
-        },10)
-      });
-    },
-    getaddChildren(row,id,children){
-      let flag = false
-      row.forEach(e => {
-        if(e.id === id){
-          e.children = children
-          flag = true
-        }
-        if(!flag && e.children.length > 0){
-          this.getaddChildren(e.children,id,children)
-        }
-      })
     },
     onParamRemove(row) {
-      // if (row.isNew) {
-      //   this.removeRow(this.rows, row.id)
-      // } else {
+      if (row.isNew) {
+        this.removeRow(this.data, row.id)
+      } else {
         row.isDeleted = 1
-        this.rows.forEach(e => {
-          if(e.id === row.id){
-            e.isDeleted = 1
-          }
-          if(e.children.length > 0){
-            this.getChildren(e.children,row.id)
-          }
-        })
-        // 重新设置scrollTop
-        const tableBodyWrapperTop = this.$refs.virtualTable.$el.querySelector('.el-table__body-wrapper').scrollTop
-        this.$forceUpdate(); // 强制刷新组件
-        this.$nextTick(() => {
-          setTimeout(() => {
-            const tableBodyWrapper = this.$refs.virtualTable.$el.querySelector('.el-table__body-wrapper');
-            if(tableBodyWrapper){
-              tableBodyWrapper.scrollTop = Number(tableBodyWrapperTop)
-            }
-          },10)
-        });
-      // }
-    },
-    getChildren(row,id){
-      row.forEach(e => {
-        if(e.id === id){
-            e.isDeleted = 1
-          }
-        if(e.children.length > 0){
-          this.getChildren(e.children,id)
-        }
-      })
+      }
     },
     getData() {
       return this.rows
@@ -339,7 +263,6 @@ export default {
           this.setChildren(val,row,code,e.children)
         }
       })
-      this.$forceUpdate();
     },
     setChildren(val,row,code,rows){
       rows.forEach(e => {
diff --git a/front/src/views/doc/RootArrayTable/index.vue b/front/src/views/doc/RootArrayTable/index.vue
index 6a6e9818..d3cf6bb9 100644
--- a/front/src/views/doc/RootArrayTable/index.vue
+++ b/front/src/views/doc/RootArrayTable/index.vue
@@ -11,24 +11,15 @@
       <el-button type="text" icon="el-icon-plus" @click="onParamAdd">{{ $t('newParam') }}</el-button>
       <el-button type="text" icon="el-icon-bottom-right" @click="onImportRequestParamAdd">{{ $t('importParam') }}</el-button>
     </div>
-    <u-table
+    <el-table
       :data="getter(tableData)"
       row-id="id"
       row-key="id"
-      use-virtual
-      :treeConfig="{
-        children: 'children',
-        iconClose: 'el-icon-arrow-right',
-        iconOpen: 'el-icon-arrow-down',
-        expandAll: true
-      }"
-      :height="500"
-      :row-height="20"
+      default-expand-all
       border
-      class="param-table1"
-      ref="virtualTable"
+      class="param-table"
     >
-      <u-table-column
+      <el-table-column
         :tree-node="true"
         v-if="isTypeObject && isColumnShow('name')"
         prop="name"
@@ -56,8 +47,8 @@
             </el-form-item>
           </el-form>
         </template>
-      </u-table-column>
-      <u-table-column
+      </el-table-column>
+      <el-table-column
         v-if="isTypeObject && isColumnShow('type')"
         prop="type"
         :label="$t('type')"
@@ -66,8 +57,8 @@
         <template slot-scope="scope">
           <WeSelect :type="'arr'" :value="scope.row.type" @change="(val) =>onWeChange(val,scope.row,'enumId')" :filterable="false" :allowCreate="false" :list="getTypeConfig()" :clearable="false" :size="'mini'"/>
         </template>
-      </u-table-column>
-      <u-table-column
+      </el-table-column>
+      <el-table-column
         v-if="isTypeObject && isColumnShow('enum')"
         prop="enum"
         :label="$t('linkDict')"
@@ -76,8 +67,8 @@
         <template slot-scope="scope">
           <WeSelect :type="'obj'" :value="scope.row.enumId" @change="(val) =>onWeChange(val,scope.row,'enumId')" :filterable="true" :allowCreate="false" :list="enumData" :clearable="true" :size="'mini'"/>
         </template>
-      </u-table-column>
-      <u-table-column
+      </el-table-column>
+      <el-table-column
         v-if="isTypeObject && isColumnShow('required')"
         prop="required"
         :label="$t('require')"
@@ -86,18 +77,18 @@
         <template slot-scope="scope">
           <WeSwitch :value="scope.row.required" @change="(val) =>onWeChange(val,scope.row,'required')" :activeColor="'#13ce66'" :activeValue="1" :inactivealVue="0"/>
         </template>
-      </u-table-column>
-      <u-table-column
+      </el-table-column>
+      <el-table-column
         v-if="isTypeObject && isColumnShow('maxLength')"
         prop="maxLength"
         :label="$t('maxLength')"
         width="130"
       >
         <template slot-scope="scope">
-          <WeInput :value="`${scope.row.maxLength}`" :size="'mini'" @change="(val) =>onWeChange(val,scope.row,'example')" :placeholder="$t('maxLength')" :maxlength="10" :showWordLimit="true"/>
+          <WeInput :value="`${String(scope.row.maxLength)}`" :size="'mini'" @change="(val) =>onWeChange(val,scope.row,'example')" :placeholder="$t('maxLength')" :maxlength="10" :showWordLimit="true"/>
         </template>
-      </u-table-column>
-      <u-table-column
+      </el-table-column>
+      <el-table-column
         v-if="isColumnShow('description')"
         prop="description"
         :label="descriptionLabel"
@@ -112,8 +103,8 @@
             </el-form-item>
           </el-form>
         </template>
-      </u-table-column>
-      <u-table-column
+      </el-table-column>
+      <el-table-column
         v-if="isColumnShow('example')"
         prop="example"
         :label="exampleLabel"
@@ -121,8 +112,8 @@
         <template slot-scope="scope">
           <WeInput :value="scope.row.example" :size="'mini'" @change="(val) =>onWeChange(val,scope.row,'example')" :placeholder="exampleLabel" :maxlength="128" :showWordLimit="true"/>
         </template>
-      </u-table-column>
-      <u-table-column
+      </el-table-column>
+      <el-table-column
         v-if="isColumnShow('opt')"
         :label="$t('operation')"
         width="90"
@@ -142,8 +133,8 @@
             </div>
           </div>
         </template>
-      </u-table-column>
-    </u-table>
+      </el-table-column>
+    </el-table>
     <el-dialog
       :title="importParamTemplateTitle"
       :visible.sync="importParamTemplateDlgShow"
@@ -273,82 +264,20 @@ export default {
       }
       this.data.push(row)
     },
+
     onParamNodeAdd(row) {
       const children = row.children || []
       const child = this.getParamNewRow()
       child.parentId = row.id
-      child.maxLength = String(child.maxLength)//转为字符类型，解决警告
       children.push(child)
       row.children = children
-      this.rows.forEach(e => {
-        let flag = false
-        if(e.id === row.id){
-          e.children = row.children
-          flag = true
-        }
-        if(!flag && e.children.length > 0){
-          this.getaddChildren(e.children,row.id,row.children)
-        }
-      })
-      const tableBodyWrapperTop = this.$refs.virtualTable.$el.querySelector('.el-table__body-wrapper').scrollTop
-      this.$forceUpdate(); // 强制刷新组件
-
-      this.$nextTick(() => {
-        setTimeout(() => {
-          const tableBodyWrapper = this.$refs.virtualTable.$el.querySelector('.el-table__body-wrapper');
-          if(tableBodyWrapper){
-            tableBodyWrapper.scrollTop = Number(tableBodyWrapperTop)
-          }
-        },100)
-      });
-    },
-    getaddChildren(row,id,children){
-      let flag = false
-      row.forEach(e => {
-        if(e.id === id){
-          e.children = children
-          flag = true
-        }
-        if(!flag && e.children.length > 0){
-          this.getaddChildren(e.children,id,children)
-        }
-      })
     },
     onParamRemove(row) {
-      // if (row.isNew) {
-      //   this.removeRow(this.data, row.id)
-      // } else {
+      if (row.isNew) {
+        this.removeRow(this.data, row.id)
+      } else {
         row.isDeleted = 1
-        this.data.forEach(e => {
-          if(e.id === row.id){
-            e.isDeleted = 1
-          }
-          if(e.children.length > 0){
-            this.getChildren(e.children,row.id)
-          }
-        })
-        // 重新设置scrollTop
-        const tableBodyWrapperTop = this.$refs.virtualTable.$el.querySelector('.el-table__body-wrapper').scrollTop
-        this.$forceUpdate(); // 强制刷新组件
-        this.$nextTick(() => {
-          setTimeout(() => {
-            const tableBodyWrapper = this.$refs.virtualTable.$el.querySelector('.el-table__body-wrapper');
-            if(tableBodyWrapper){
-              tableBodyWrapper.scrollTop = Number(tableBodyWrapperTop)
-            }
-          },10)
-        });
-      // }
-    },
-    getChildren(row,id){
-      row.forEach(e => {
-        if(e.id === id){
-            e.isDeleted = 1
-          }
-        if(e.children.length > 0){
-          this.getChildren(e.children,id)
-        }
-      })
+      }
     },
     onImportParamSave() {
       const val = this.importParamTemplateValue
-- 
Gitee


From a4789736d5f3df033e7eb67a8120378c64a89a62 Mon Sep 17 00:00:00 2001
From: fanjiao <yaodiemail@163.com>
Date: Fri, 10 Jan 2025 08:58:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E8=A7=A3=E5=86=B3=E3=80=91Query?=
 =?UTF-8?q?=20Parameter=E7=9A=84=E7=95=8C=E9=9D=A2=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=9D=9Enull=E6=A0=A1=E9=AA=8C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/doc/EditTable/index.vue      | 2 +-
 front/src/views/doc/RootArrayTable/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/src/views/doc/EditTable/index.vue b/front/src/views/doc/EditTable/index.vue
index 076dc0e6..dfb3cdb6 100644
--- a/front/src/views/doc/EditTable/index.vue
+++ b/front/src/views/doc/EditTable/index.vue
@@ -259,7 +259,7 @@ export default {
         if(e.id === row.id){
           e[code] = val
         }
-        if(e.children.length > 0){
+        if(e.children && e.children.length > 0){
           this.setChildren(val,row,code,e.children)
         }
       })
diff --git a/front/src/views/doc/RootArrayTable/index.vue b/front/src/views/doc/RootArrayTable/index.vue
index d3cf6bb9..17ed92e7 100644
--- a/front/src/views/doc/RootArrayTable/index.vue
+++ b/front/src/views/doc/RootArrayTable/index.vue
@@ -313,7 +313,7 @@ export default {
         if(e.id === row.id){
           e[code] = val
         }
-        if(e.children.length > 0){
+        if(e.children && e.children.length > 0){
           this.setChildren(val,row,code,e.children)
         }
       })
-- 
Gitee