From 253670963bc4fa1808249a023fd04d441ea47efd Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 5 Jun 2024 16:51:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E3=80=90=E8=8B=B1=E6=96=87=E5=90=8D=E3=80=91=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1168773799706624]后端-表单所有组件增加【英文名】属性 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1168773799706624 --- .../framework/changelog/2024-06-04/neatlogic_tenant.sql | 6 +++--- .../neatlogic/resources/framework/sqlscript/ddl.sql | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/neatlogic/resources/framework/changelog/2024-06-04/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/framework/changelog/2024-06-04/neatlogic_tenant.sql index 288163fe1..f637669d5 100644 --- a/src/main/resources/neatlogic/resources/framework/changelog/2024-06-04/neatlogic_tenant.sql +++ b/src/main/resources/neatlogic/resources/framework/changelog/2024-06-04/neatlogic_tenant.sql @@ -1,6 +1,6 @@ ALTER TABLE `form_attribute` - ADD COLUMN `key` VARCHAR(100) NOT NULL COMMENT '属性英文名' AFTER `uuid`; + ADD COLUMN `key` VARCHAR(100) NULL DEFAULT NULL COMMENT '属性英文名' AFTER `uuid`; ALTER TABLE `form_attribute_data` - ADD COLUMN `attribute_key` VARCHAR(100) NOT NULL COMMENT '属性英文名' AFTER `attribute_label`; + ADD COLUMN `attribute_key` VARCHAR(100) NULL DEFAULT NULL COMMENT '属性英文名' AFTER `attribute_label`; ALTER TABLE `form_extend_attribute_data` - ADD COLUMN `attribute_key` VARCHAR(100) NOT NULL COMMENT '属性英文名' AFTER `attribute_label`; \ No newline at end of file + ADD COLUMN `attribute_key` VARCHAR(100) NULL DEFAULT NULL COMMENT '属性英文名' AFTER `attribute_label`; \ No newline at end of file diff --git a/src/main/resources/neatlogic/resources/framework/sqlscript/ddl.sql b/src/main/resources/neatlogic/resources/framework/sqlscript/ddl.sql index 1bbf2fdca..ec663cff2 100644 --- a/src/main/resources/neatlogic/resources/framework/sqlscript/ddl.sql +++ b/src/main/resources/neatlogic/resources/framework/sqlscript/ddl.sql @@ -262,7 +262,7 @@ CREATE TABLE IF NOT EXISTS `form_attribute` ( `form_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单uuid', `formversion_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单版本uuid', `uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性uuid', - `key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性英文名', + `key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性英文名', `label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性名', `type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性类型，系统属性不允许修改', `handler` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性处理器', @@ -279,7 +279,7 @@ CREATE TABLE IF NOT EXISTS `form_attribute_data` ( `form_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单uuid', `handler` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型', `attribute_label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性名', - `attribute_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性英文名', + `attribute_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性英文名', `attribute_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性uuid', `data` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '属性值,json格式', PRIMARY KEY (`id`) USING BTREE @@ -340,7 +340,7 @@ CREATE TABLE IF NOT EXISTS `form_extend_attribute_data` ( `handler` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类型', `tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标签', `attribute_label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性名', - `attribute_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性英文名', + `attribute_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '属性英文名', `attribute_uuid` char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性uuid', `data` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '属性值,json格式', PRIMARY KEY (`id`) USING BTREE -- Gitee From 9c25066326f6cca2dbb7a841d8ee49105d9ca29f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 5 Jun 2024 16:54:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=89=80=E6=9C=89=E7=BB=84=E4=BB=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E3=80=90=E8=8B=B1=E6=96=87=E5=90=8D=E3=80=91=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1168773799706624]后端-表单所有组件增加【英文名】属性 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1168773799706624 --- .../framework/changelog/2024-06-04/neatlogic_tenant.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/neatlogic/resources/framework/changelog/2024-06-04/neatlogic_tenant.sql b/src/main/resources/neatlogic/resources/framework/changelog/2024-06-04/neatlogic_tenant.sql index f637669d5..b885a16fd 100644 --- a/src/main/resources/neatlogic/resources/framework/changelog/2024-06-04/neatlogic_tenant.sql +++ b/src/main/resources/neatlogic/resources/framework/changelog/2024-06-04/neatlogic_tenant.sql @@ -1,6 +1,6 @@ ALTER TABLE `form_attribute` - ADD COLUMN `key` VARCHAR(100) NULL DEFAULT NULL COMMENT '属性英文名' AFTER `uuid`; + ADD COLUMN `key` VARCHAR(100) NULL COMMENT '属性英文名' AFTER `uuid`; ALTER TABLE `form_attribute_data` - ADD COLUMN `attribute_key` VARCHAR(100) NULL DEFAULT NULL COMMENT '属性英文名' AFTER `attribute_label`; + ADD COLUMN `attribute_key` VARCHAR(100) NULL COMMENT '属性英文名' AFTER `attribute_label`; ALTER TABLE `form_extend_attribute_data` - ADD COLUMN `attribute_key` VARCHAR(100) NULL DEFAULT NULL COMMENT '属性英文名' AFTER `attribute_label`; \ No newline at end of file + ADD COLUMN `attribute_key` VARCHAR(100) NULL COMMENT '属性英文名' AFTER `attribute_label`; \ No newline at end of file -- Gitee