From 1c8e58a88ff8eb1ca67739f939743ab4b62a91c2 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Tue, 31 Dec 2024 10:55:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erm.frontend/package.json                     |  2 +-
 gradle.properties                             |  2 +-
 io.sc.engine.mv.frontend/package.json         |  2 +-
 io.sc.engine.rule.frontend/package.json       |  2 +-
 io.sc.engine.st.frontend/package.json         |  2 +-
 io.sc.platform.core.frontend/package.json     |  2 +-
 .../src/platform/components/grid/Td.vue       | 20 +++++-
 .../src/platform/components/grid/Tr.vue       |  2 +-
 .../grid/TreeGridFirstTdContent.vue           | 22 ++++---
 .../src/platform/components/grid/ts/Init.ts   |  3 +-
 .../grid/ts/constant/src/FieldNames.ts        |  6 ++
 .../grid/ts/event/src/UpdateTickeds.ts        |  2 +-
 .../components/grid/ts/function/RowData.ts    | 62 +++++++++++++++----
 .../components/grid/ts/types/PropsType.ts     |  4 ++
 .../template-project/package.json             |  4 +-
 io.sc.platform.developer.doc/package.json     |  2 +-
 .../package.json                              |  2 +-
 .../templates/pgp/setup/gradle.properties     |  2 +-
 io.sc.platform.lcdp.frontend/package.json     |  2 +-
 .../src/i18n/messages.json                    |  2 +
 .../src/i18n/messages_tw_CN.json              |  4 +-
 .../src/i18n/messages_zh_CN.json              |  4 +-
 .../src/menus/menus.json                      |  6 +-
 .../src/routes/routes.json                    | 46 ++++++++++++++
 .../META-INF/platform/plugins/components.json |  6 +-
 .../META-INF/platform/plugins/liquibase.json  |  4 +-
 .../platform/plugins/repositories.json        |  6 +-
 .../package.json                              |  2 +-
 io.sc.platform.mvc.frontend/package.json      |  2 +-
 .../package.json                              |  2 +-
 io.sc.platform.system.frontend/package.json   |  2 +-
 io.sc.standard.frontend/package.json          |  2 +-
 io.sc.website/package.json                    |  2 +-
 33 files changed, 185 insertions(+), 50 deletions(-)

diff --git a/erm.frontend/package.json b/erm.frontend/package.json
index 0141f0c8..fe229f27 100644
--- a/erm.frontend/package.json
+++ b/erm.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/gradle.properties b/gradle.properties
index 317065d1..cab54f22 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,7 +38,7 @@ application_version=1.0.0
 platform_group=io.sc
 platform_version=8.2.3
 platform_plugin_version=8.2.3
-platform_core_frontend_version=8.2.15
+platform_core_frontend_version=8.2.16
 
 ###########################################################
 # dependencies version
diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json
index 03515641..7d71dce7 100644
--- a/io.sc.engine.mv.frontend/package.json
+++ b/io.sc.engine.mv.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json
index d1672290..fcce8866 100644
--- a/io.sc.engine.rule.frontend/package.json
+++ b/io.sc.engine.rule.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json
index 65dbff25..3d021690 100644
--- a/io.sc.engine.st.frontend/package.json
+++ b/io.sc.engine.st.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json
index 2ba1f6eb..4a74c601 100644
--- a/io.sc.platform.core.frontend/package.json
+++ b/io.sc.platform.core.frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "platform-core",
-  "version": "8.2.15",
+  "version": "8.2.16",
   "description": "前端核心包,用于快速构建前端的脚手架",
   "//main": "库的主文件",
   "main": "dist/platform-core.js",
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/Td.vue b/io.sc.platform.core.frontend/src/platform/components/grid/Td.vue
index fdc27418..00f86ca0 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/Td.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/Td.vue
@@ -8,7 +8,8 @@
       :style="tdStyleComputed"
       :title="titleComputed"
       :rowspan="rowSpanComputed"
-      @click="tdClick"
+      @click.stop="tdClick($event, props.scope.row, props.scope.rowIndex, props.col.name)"
+      @dblclick.stop="tdDbClick($event, props.scope.row, props.scope.rowIndex, props.col.name)"
     >
       <!-- 前端排序号 -->
       <template v-if="props.col.name === Constant.FIELD_NAMES.SORT_NO">
@@ -81,6 +82,11 @@ const titleComputed = computed(() => {
 });
 const tdClassComputed = computed(() => {
   const tdClass = <any>[];
+  const colSelectable = tools.dataFM.getSelectable(props.scope.row, props.col['name']);
+  if (!colSelectable) {
+    tdClass.push('mouseDisabled');
+    return tdClass;
+  }
   if (props.col.name === Constant.FIELD_NAMES.SORT_NO) {
     tdClass.push('sortNo_td');
   }
@@ -131,8 +137,9 @@ const generateTdIfComputed = computed(() => {
   return true;
 });
 
-const tdClick = () => {
-  if (props.scope.row[Constant.FIELD_NAMES.SELECTABLE]) {
+const tdClick = (event: any, row: any, rowIndex: any, colName: string) => {
+  const colSelectable = tools.dataFM.getSelectable(props.scope.row, props.col['name']);
+  if (colSelectable) {
     // 判定是否要退出编辑模式
     const cellSelected = tools.table.store.cellSelected;
     if (cellSelected) {
@@ -159,9 +166,16 @@ const tdClick = () => {
         colName: props.col['name'],
         value: props.scope.row[props.col['name']],
       };
+      tools.em.rowClick(event, row, rowIndex);
     }
   }
 };
+const tdDbClick = (event: any, row: any, rowIndex: any, colName: string) => {
+  const colSelectable = tools.dataFM.getSelectable(props.scope.row, props.col['name']);
+  if (colSelectable) {
+    tools.em.rowDbClick(event, row, rowIndex);
+  }
+};
 
 onMounted(() => {
   if (tdRef.value?.$el) {
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/Tr.vue b/io.sc.platform.core.frontend/src/platform/components/grid/Tr.vue
index 0c5764b0..90209ccc 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/Tr.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/Tr.vue
@@ -18,7 +18,7 @@
       <q-checkbox
         v-model="rowDataComputed[tickedField]"
         flat
-        :disable="!props.scope.row[Constant.FIELD_NAMES.SELECTABLE]"
+        :disable="!tools.dataFM.getSelectable(props.scope.row)"
         :dense="tools.table.configStore.dense || tools.table.configStore.denseBody || false"
         @update:model-value="tools.em.updateTicked($event, scope.row)"
       />
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridFirstTdContent.vue b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridFirstTdContent.vue
index 3c35dbe4..ce883a02 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridFirstTdContent.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridFirstTdContent.vue
@@ -25,6 +25,7 @@
       v-model="rowDataComputed[tickedField]"
       flat
       dense
+      :disable="!tools.dataFM.getTreeTickable(props.row)"
       @dblclick.stop="() => {}"
       @update:model-value="selectedFun(rowDataComputed[tickedField], $event)"
     />
@@ -195,7 +196,9 @@ const selectedFun = (value, event) => {
 const selectedChildren = (row, value) => {
   if (row.children && row.children.length > 0) {
     for (let child of row.children) {
-      child[tickedField] = value;
+      if (tools.dataFM.getTreeTickable(child)) {
+        child[tickedField] = value;
+      }
       selectedChildren(child, value);
     }
   }
@@ -206,15 +209,18 @@ const selectedParent = (row, value) => {
   if (row.parent) {
     const parent = tools.dataFM.getRow(tools.table.rows, row.parent, true);
     if (parent) {
-      if (value && childrenSelectedStatus(parent).allSelected) {
-        parent[tickedField] = true;
-      } else if (value) {
-        parent[tickedField] = null;
-      } else {
-        if (childrenSelectedStatus(parent).partSelected) {
+      const treeTickable = tools.dataFM.getTreeTickable(parent);
+      if (treeTickable) {
+        if (value && childrenSelectedStatus(parent).allSelected) {
+          parent[tickedField] = true;
+        } else if (value) {
           parent[tickedField] = null;
         } else {
-          parent[tickedField] = false;
+          if (childrenSelectedStatus(parent).partSelected) {
+            parent[tickedField] = null;
+          } else {
+            parent[tickedField] = false;
+          }
         }
       }
       selectedParent(parent, value);
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
index 4a429687..8e9ca5bd 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/Init.ts
@@ -58,7 +58,8 @@ export class Init {
           return [];
         },
       },
-      selectableIf: { type: Function, default: undefined }, // 数据行可选规则函数，不配置都可选，配置后根据返回的布尔结果判定是否可选
+      selectableIf: { type: Function, default: undefined }, // 数据行可选规则函数，不配置都可选，配置后根据返回的布尔结果判定是否可选。
+      treeTickableIf: { type: Function, default: undefined }, // 树表格可勾选规则函数，不配置都可勾选，配置后根据返回的布尔结果判定是否可勾选。
       appendRows: {
         // 表格追加行，添加到当前表格数据行尾，可添加多行，支持跨行跨列配置，用于添加合计或者额外信息。
         type: Array,
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/constant/src/FieldNames.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/constant/src/FieldNames.ts
index 9e340b18..49c531e4 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/constant/src/FieldNames.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/constant/src/FieldNames.ts
@@ -47,6 +47,11 @@ export class FieldNames {
    */
   public static SELECTABLE = '_selectable';
 
+  /**
+   * 树表格的数据是否允许勾选
+   */
+  public static TREE_TICKABLE = '_treeTickable';
+
   /**
    * 获得行数据中拓展的字段属性名
    * @param props
@@ -64,6 +69,7 @@ export class FieldNames {
       rowIndex: FieldNames.ROW_INDEX,
       lazyloadNoChildren: FieldNames.LAZYLOAD_NO_CHILDREN,
       selectable: FieldNames.SELECTABLE,
+      treeTickable: FieldNames.TREE_TICKABLE,
     };
   }
 }
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/event/src/UpdateTickeds.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/event/src/UpdateTickeds.ts
index c83cf1cb..866860a1 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/event/src/UpdateTickeds.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/event/src/UpdateTickeds.ts
@@ -18,7 +18,7 @@ export class UpdateTickeds extends Base {
     const tickedField = this.props.tickedField;
     if (this.table?.store.inlineEditStatus === Constant.EDIT_STATUS.NONE) {
       this.table.rows.forEach((item) => {
-        if (this.tools?.dataFM.getRowSelectable(item)) {
+        if (this.tools?.dataFM.getSelectable(item)) {
           item[tickedField] = value;
           item[selectedField] = value;
         }
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
index d27406c8..8c03683e 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/function/RowData.ts
@@ -21,7 +21,8 @@ export class RowData extends Base {
     this.checkLastRow = this.checkLastRow.bind(this);
     this.setExtraProperty = this.setExtraProperty.bind(this);
     this.arrayOrderBy = this.arrayOrderBy.bind(this);
-    this.getRowSelectable = this.getRowSelectable.bind(this);
+    this.getSelectable = this.getSelectable.bind(this);
+    this.getTreeTickable = this.getTreeTickable.bind(this);
     this.mergeSortFields = this.mergeSortFields.bind(this);
     this.mergeDefaultSortBy = this.mergeDefaultSortBy.bind(this);
     this.rowDataExtraPropertyHandle = this.rowDataExtraPropertyHandle.bind(this);
@@ -366,7 +367,10 @@ export class RowData extends Base {
     rowData[this.props.tickedField] = this.getInitRowTicked(rowData);
     rowData[this.props.selectedField] = this.getInitRowSelected(rowData);
     rowData[Constant.FIELD_NAMES.ROW_OLD_VALUE] = {};
-    rowData[Constant.FIELD_NAMES.SELECTABLE] = this.getSelectable(rowData);
+    rowData[Constant.FIELD_NAMES.SELECTABLE] = this.getInitSelectable(rowData);
+    if (this.props.tree) {
+      rowData[Constant.FIELD_NAMES.TREE_TICKABLE] = this.getInitTreeTickable(rowData);
+    }
     this.setOldValue(rowData);
     if (this.props.tree) {
       if (this.table.store.expandDatas.length > 0 && this.table.store.expandDatas.includes(rowData[this.props.primaryKey])) {
@@ -381,11 +385,11 @@ export class RowData extends Base {
   }
 
   /**
-   * 获取是否可选
+   * 获取行数据初始化可选状态
    * @param rowData
    * @returns
    */
-  private getSelectable(rowData: any): boolean {
+  private getInitSelectable(rowData: any) {
     let selectable: any = true;
     const this_ = this;
     if (this_.props.selectMode === Constant.SELECT_MODE.NONE) {
@@ -401,8 +405,8 @@ export class RowData extends Base {
     } else if (this_.props.selectMode === Constant.SELECT_MODE.CELL) {
       if (this_.props.selectableIf && typeof this_.props.selectableIf === 'function') {
         selectable = {};
-        let cellSelectable = false;
         for (let i = 0; i < this_.table.columns.length; i++) {
+          let cellSelectable = false;
           const colName = this_.table.columns[i]['name'];
           if (colName !== Constant.FIELD_NAMES.SORT_NO) {
             const result = this_.props.selectableIf({ grid: this_.instance, data: rowData, colName });
@@ -418,26 +422,60 @@ export class RowData extends Base {
   }
 
   /**
-   * 根据传入的行数据中的_selectable字段，判断该行数据是否可选。
-   * @param row
+   * 获取树表格行数据初始化是否可勾选状态
+   * @param rowData
+   */
+  getInitTreeTickable(rowData: any) {
+    const this_ = this;
+    let tickable = true;
+    if (this_.props.treeTickableIf && typeof this_.props.treeTickableIf === 'function') {
+      const result = this_.props.treeTickableIf({ grid: this_.instance, data: rowData });
+      if (!result) {
+        tickable = false;
+      }
+    }
+    return tickable;
+  }
+
+  /**
+   * 根据传入的行数据中的_selectable字段，判断是否可选。
+   * @param row 行数据
+   * @param colName 列名称
    * @returns
    */
-  getRowSelectable(row) {
+  getSelectable(row: any, colName?: string) {
     if (this.props.selectMode === Constant.SELECT_MODE.CELL && typeof row[Constant.FIELD_NAMES.SELECTABLE] === 'object') {
-      let selectable = true;
+      if (colName) {
+        return row[Constant.FIELD_NAMES.SELECTABLE][colName];
+      }
+      let falseNumber = 0;
       const keys = Object.keys(row[Constant.FIELD_NAMES.SELECTABLE]);
       for (let i = 0; i < keys.length; i++) {
         if (row[Constant.FIELD_NAMES.SELECTABLE][keys[i]] === false) {
-          selectable = false;
-          break;
+          falseNumber++;
         }
       }
-      return selectable;
+      if (keys.length === falseNumber) {
+        return false;
+      }
+      return true;
     } else {
       return row[Constant.FIELD_NAMES.SELECTABLE];
     }
   }
 
+  /**
+   * 根据传入的行数据中的_treeTickable字段，判断是否可勾选。
+   * @param row 行数据
+   * @returns
+   */
+  getTreeTickable(row: any) {
+    if (row[Constant.FIELD_NAMES.TREE_TICKABLE] === undefined || row[Constant.FIELD_NAMES.TREE_TICKABLE] === true) {
+      return true;
+    }
+    return false;
+  }
+
   /**
    * 获取初始化行的ticked状态
    * @param rowData
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/types/PropsType.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/types/PropsType.ts
index 3fa2f12b..1f9f28e9 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/types/PropsType.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/types/PropsType.ts
@@ -211,6 +211,10 @@ export type PropsType = {
    * 数据行可选规则配置函数
    */
   selectableIf?: Function,
+  /**
+   * 数据行可选规则配置函数
+   */
+  treeTickableIf?: Function,
   /**
    * 分页大小，后台初始页码等配置
    */
diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json
index c01651b6..b910f6a1 100644
--- a/io.sc.platform.core.frontend/template-project/package.json
+++ b/io.sc.platform.core.frontend/template-project/package.json
@@ -1,6 +1,6 @@
 {
   "name": "platform-core",
-  "version": "8.2.15",
+  "version": "8.2.16",
   "description": "前端核心包,用于快速构建前端的脚手架",
   "private": false,
   "keywords": [],
@@ -110,7 +110,7 @@
     "mockjs": "1.1.0",
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json
index 035df65a..a922bac2 100644
--- a/io.sc.platform.developer.doc/package.json
+++ b/io.sc.platform.developer.doc/package.json
@@ -28,7 +28,7 @@
     "vuepress": "2.0.0-rc.15"
   },
   "dependencies": {
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "vue": "3.5.13",
     "vue-i18n": "10.0.4"
diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json
index 2c2044cf..bb9f5909 100644
--- a/io.sc.platform.developer.frontend/package.json
+++ b/io.sc.platform.developer.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties
index 7bff8e03..cab54f22 100644
--- a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties
+++ b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties
@@ -38,7 +38,7 @@ application_version=1.0.0
 platform_group=io.sc
 platform_version=8.2.3
 platform_plugin_version=8.2.3
-platform_core_frontend_version=8.2.14
+platform_core_frontend_version=8.2.16
 
 ###########################################################
 # dependencies version
diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json
index 695575c6..d5a423e0 100644
--- a/io.sc.platform.lcdp.frontend/package.json
+++ b/io.sc.platform.lcdp.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages.json b/io.sc.platform.lcdp.frontend/src/i18n/messages.json
index 55470600..84731085 100644
--- a/io.sc.platform.lcdp.frontend/src/i18n/messages.json
+++ b/io.sc.platform.lcdp.frontend/src/i18n/messages.json
@@ -3,6 +3,8 @@
   "menu.lcdp.frontend": "Frontend",
   "menu.lcdp.theme": "Theme",
   "menu.lcdp.bpm": "Bussiness Process Manager",
+  "menu.lcdp.form": "Form",
+  "menu.lcdp.excel.template": "Excel Template",
 
   "theme.action.setDefaultTheme":"Set As Default",
   "theme.action.setDefaultTheme.confirm":"Would you like to set \"{themeName}\" as default theme?",
diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json b/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json
index 482a014b..a67dfd2e 100644
--- a/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json
+++ b/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json
@@ -3,12 +3,14 @@
   "menu.lcdp.frontend": "前端",
   "menu.lcdp.theme": "主題",
   "menu.lcdp.bpm": "流程管理",
+  "menu.lcdp.form": "表单管理",
+  "menu.lcdp.excel.template": "报表模板管理(Excel)",
 
   "theme.action.setDefaultTheme":"設置為默認主題",
   "theme.action.setDefaultTheme.confirm":"您確定要將 \"{themeName}\" 設置為默認主題嗎?",
   "theme.action.delete.confirm":"您確定要刪除 \"{themeName}\" 主題嗎?",
   "theme.action.save.confirm":"您確定要保存 \"{themeName}\" 主題嗎?",
-  
+
   "theme.dark":"是否黑暗模式",
   "theme.minWidth":"整個頁面最小寬度",
   "theme.favicon":"favicon",
diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json b/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json
index cc2f703b..7ec282ab 100644
--- a/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json
+++ b/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json
@@ -3,6 +3,8 @@
   "menu.lcdp.frontend": "前端",
   "menu.lcdp.theme": "主题",
   "menu.lcdp.bpm": "流程管理",
+  "menu.lcdp.form": "表单管理",
+  "menu.lcdp.excel.template": "报表模板管理(Excel)",
 
   "theme.action.setDefaultTheme":"设置为默认主题",
   "theme.action.setDefaultTheme.confirm":"您确定要将 \"{themeName}\" 设置为默认主题吗?",
@@ -141,7 +143,7 @@
   "theme.grid.headBgColor":"表头背景颜色",
   "theme.grid.stickyBgColor":"锁定列背景颜色",
   "theme.grid.borderColor":"表格边框颜色",
-  
+
   "lcdp.frontend.export":"一键导出前端包",
   "lcdp.frontend.export.frontendWebContextPath":"前端应用上下文路径",
   "lcdp.frontend.export.backendApiWebContextPath":"后端应用上下文路径",
diff --git a/io.sc.platform.lcdp.frontend/src/menus/menus.json b/io.sc.platform.lcdp.frontend/src/menus/menus.json
index d76442b2..d53b7109 100644
--- a/io.sc.platform.lcdp.frontend/src/menus/menus.json
+++ b/io.sc.platform.lcdp.frontend/src/menus/menus.json
@@ -48,5 +48,9 @@
     "titleI18nKey": "menu.lcdp.bpm",
     "icon": "bi-share",
     "routeName": "route.lcdp.bpm"
-  }
+  },
+  /* 低代码管理/表单管理*/
+  {"type":"ROUTE",       "order":400,   "parentId":"menu.lcdp",                "id":"menu.lcdp.form",                        "titleI18nKey":"menu.lcdp.form",                        "icon":"widgets",                           "routeName":"route.lcdp.form"},
+  /* 低代码管理/报表模板管理(Excel)*/
+  {"type":"ROUTE",       "order":500,   "parentId":"menu.lcdp",                "id":"menu.lcdp.excel.template",                "titleI18nKey":"menu.lcdp.excel.template",              "icon":"view_list",                         "routeName":"route.lcdp.excel.template"}
 ]
diff --git a/io.sc.platform.lcdp.frontend/src/routes/routes.json b/io.sc.platform.lcdp.frontend/src/routes/routes.json
index 769dde32..fb8ee9ed 100644
--- a/io.sc.platform.lcdp.frontend/src/routes/routes.json
+++ b/io.sc.platform.lcdp.frontend/src/routes/routes.json
@@ -34,5 +34,51 @@
     "meta": {
       "permissions": ["/lcdp/bpm/**/*"]
     }
+  },
+  {
+    "parent": "/",
+    "name": "route.lcdp.form.page",
+    "path": "lcdp/form/page",
+    "priority": 0,
+    "component": "component.lcdp.form.page",
+    "componentPath": "@/views/form/Page.vue",
+    "redirect": null,
+    "meta": {
+      "permissions": ["/example/**/*"]
+    },
+    "children": []
+  },
+  {
+    "parent": "/",
+    "name": "route.lcdp.excel.report",
+    "path": "lcdp/excel/report",
+    "priority": 0,
+    "component": "component.lcdp.excel.report",
+    "componentPath": "@/views/excel_template/ExcelReport.vue",
+    "redirect": null,
+    "meta": {
+      "permissions": ["/example/**/*"]
+    },
+    "children": []
+  },
+  {
+    "parent": "/",
+    "name": "route.lcdp.form",
+    "path": "lcdp/form",
+    "component": "component.lcdp.formConfig",
+    "componentPath": "@/views/form/FormConfig.vue",
+    "meta": {
+    },
+    "children": []
+  },
+  {
+    "parent": "/",
+    "name": "route.lcdp.excel.template",
+    "path": "lcdp/excel/template",
+    "component": "component.lcdp.excel.template",
+    "componentPath": "@/views/excel_template/TemplateGrid.vue",
+    "meta": {
+    },
+    "children": []
   }
 ]
diff --git a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json
index f79a0266..75958b24 100644
--- a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json
+++ b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/components.json
@@ -10,7 +10,11 @@
 {
   "includes":[
     "io.sc.platform.lcdp.configure.controller",
-    "io.sc.platform.lcdp.configure.service.impl"
+    "io.sc.platform.lcdp.configure.service.impl",
+    "io.sc.platform.lcdp.form.controller",
+    "io.sc.platform.lcdp.form.service.impl",
+    "io.sc.platform.lcdp.excel.template.controller",
+    "io.sc.platform.lcdp.excel.template.service.impl"
   ],
   "excludes":[]
 }
\ No newline at end of file
diff --git a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/liquibase.json b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/liquibase.json
index c8c51673..270be2f6 100644
--- a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/liquibase.json
+++ b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/liquibase.json
@@ -4,7 +4,9 @@
         "order"    : 300,
         "description":"低代码平台",
         "locations":[
-            "classpath:/liquibase/io.sc.platform.lcdp_8.0.0_20220606__LowCode Developer Database Schema DDL.xml"
+            "classpath:/liquibase/io.sc.platform.lcdp_8.0.0_20220606__LowCode Developer Database Schema DDL.xml",
+            "classpath:/liquibase/io.sc.platform.lcdp_Form_DDL.xml",
+            "classpath:/liquibase/io.sc.platform.lcdp_Excel_Template_DDL.xml"
         ]
     }
 ]
\ No newline at end of file
diff --git a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/repositories.json b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/repositories.json
index 5f2f5793..3ddf50b0 100644
--- a/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/repositories.json
+++ b/io.sc.platform.lcdp/src/main/resources/META-INF/platform/plugins/repositories.json
@@ -10,7 +10,11 @@
 {
   "includes":[
     "io.sc.platform.lcdp.configure.jpa.entity",
-    "io.sc.platform.lcdp.configure.jpa.repository"
+    "io.sc.platform.lcdp.configure.jpa.repository",
+    "io.sc.platform.lcdp.form.entity",
+    "io.sc.platform.lcdp.form.repository",
+    "io.sc.platform.lcdp.excel.template.entity",
+    "io.sc.platform.lcdp.excel.template.repository"
   ],
   "excludes":[]
 }
\ No newline at end of file
diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json
index b15e39a8..bfb4c514 100644
--- a/io.sc.platform.license.keygen.frontend/package.json
+++ b/io.sc.platform.license.keygen.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json
index 2ec3cbbe..590a4f3b 100644
--- a/io.sc.platform.mvc.frontend/package.json
+++ b/io.sc.platform.mvc.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json
index d09fa6af..89fe51e1 100644
--- a/io.sc.platform.scheduler.manager.frontend/package.json
+++ b/io.sc.platform.scheduler.manager.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json
index 35e2bddf..fef94132 100644
--- a/io.sc.platform.system.frontend/package.json
+++ b/io.sc.platform.system.frontend/package.json
@@ -110,7 +110,7 @@
     "mockjs": "1.1.0",
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json
index d189766e..52070fa1 100644
--- a/io.sc.standard.frontend/package.json
+++ b/io.sc.standard.frontend/package.json
@@ -111,7 +111,7 @@
     "node-sql-parser": "5.3.4",
     "pinia": "2.2.6",
     "pinia-undo": "0.2.4",
-    "platform-core": "8.2.15",
+    "platform-core": "8.2.16",
     "quasar": "2.17.4",
     "sort-array": "5.0.0",
     "svg-path-commander": "2.1.5",
diff --git a/io.sc.website/package.json b/io.sc.website/package.json
index d943be35..6c272a24 100644
--- a/io.sc.website/package.json
+++ b/io.sc.website/package.json
@@ -28,6 +28,6 @@
   },
   "dependencies": {
     "vue": "3.5.13",
-    "platform-core": "8.2.15"
+    "platform-core": "8.2.16"
   }
 }
\ No newline at end of file