[Fix][web,sql] hotfix some problems (#1136)

* Optimize some problems

* Optimize some problems

* Optimize some sql comment to en-us

* Optimize main sql file comment to en-us

* delete some update sql

* Optimize main sql file

dlink-doc/sql/upgrade/0.6.0_schema/mysql/dinky_dml.sql

@@ -240,6 +240,15 @@ INSERT INTO `dlink_flink_document` VALUES (216, 'Function', '内置函数', '比
 INSERT INTO `dlink_flink_document` VALUES (217, 'Function', 'UDF', '表值聚合函数', 'TO_MAP(string1,object2[, string3])', '将非规则一维表转化为规则二维表，string1是key。string2是value。string3为非必填项，表示key的值域（维度），用英文逗号分割。', 'TO_MAP(${1:})', '1.12', 8, 1, '2021-05-20 19:59:22', '2021-05-20 20:00:54');
 
 
+update dlink_cluster set type ='yarn-session' where type = 'Yarn';
+update dlink_cluster set type ='standalone' where type = 'Standalone';
+
+-- ----------------------------
+-- 0.6.0 2022-02-03
+-- ----------------------------
+update dlink_task set dialect = 'FlinkJar' where jar_id is not null;
+update dlink_catalogue set type = 'FlinkJar' where task_id in (select id as task_id from dlink_task where jar_id is not null);
+
 
 -- ----------------------------
 -- Records of dlink_user

dlink-doc/sql/upgrade/0.6.2_schema/mysql/dinky_ddl.sql

@@ -22,5 +22,5 @@
 -- ----------------------------
 alter table dlink_task alter column fragment set default 0;
 alter table dlink_task alter column statement_set set default 0;
-alter table dlink_cluster_configuration modify column is_available  tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否可用';
+alter table dlink_cluster_configuration modify column is_available  tinyint(1) NOT NULL DEFAULT 0 COMMENT 'is available';
 

dlink-doc/sql/upgrade/0.6.5_schema/mysql/dinky_ddl.sql

@@ -19,21 +19,21 @@
 
 -- 0.6.5 2022-06-28
 -- ----------------------------
-alter table dlink_task ADD COLUMN `version_id` INT NULL COMMENT '版本号ID';
+alter table dlink_task ADD COLUMN `version_id` INT NULL COMMENT 'version id';
 
 -- ----------------------------
 -- Table structure for dlink_task_version
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `dlink_task_version`(
   `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `task_id` int NOT NULL COMMENT '作业ID ',
-  `version_id` int NOT NULL COMMENT '版本ID ',
-  `statement` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'flink sql 内容',
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
-  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '别名',
-  `dialect` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '方言',
-  `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '类型',
-  `task_configure` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '作业配置',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `task_id` int NOT NULL COMMENT 'task ID ',
+  `version_id` int NOT NULL COMMENT 'version ID ',
+  `statement` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'flink sql statement',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'version name',
+  `alias` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'alisa',
+  `dialect` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'dialect',
+  `type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'type',
+  `task_configure` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'task configuration',
+  `create_time` datetime DEFAULT NULL COMMENT 'create time',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='作业历史版本';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='job history version';

dlink-doc/sql/upgrade/0.6.6_schema/mysql/dinky_ddl.sql

@@ -24,79 +24,79 @@
 -- Table structure for metadata_database
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `metadata_database` (
-  `id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `database_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
-  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '描述',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `id` int NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `database_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'database name',
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'database description',
+  `update_time` datetime DEFAULT NULL COMMENT 'update time',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='元数据对象信息';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='metadata of database information';
 
 -- ----------------------------
 -- Table structure for metadata_table
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `metadata_table` (
   `id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `table_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
-  `table_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '对象类型，分为：database 和 table view',
-  `database_id` int NOT NULL COMMENT '数据库主键',
-  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '描述',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `table_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'table name',
+  `table_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'type，such as：database,table,view',
+  `database_id` int NOT NULL COMMENT 'database id',
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'table description',
+  `update_time` datetime DEFAULT NULL COMMENT 'update time',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='元数据对象信息';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='metadata of table information';
 
 -- ----------------------------
 -- Table structure for metadata_database_property
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS  `metadata_database_property` (
-  `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性key',
-  `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性value',
-  `database_id` int NOT NULL COMMENT '数据库主键',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'key',
+  `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'value',
+  `database_id` int NOT NULL COMMENT 'database id',
+  `update_time` datetime DEFAULT NULL COMMENT 'update time',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
   PRIMARY KEY (`key`,`database_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='元数据属性信息';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='metadata of database configurations';
 
 -- ----------------------------
 -- Table structure for metadata_table_property
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `metadata_table_property` (
-  `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '属性key',
-  `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '属性value',
-  `table_id` int NOT NULL COMMENT '数据表名称',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'key',
+  `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'value',
+  `table_id` int NOT NULL COMMENT 'table id',
+  `update_time` datetime DEFAULT NULL COMMENT 'update time',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create tiime',
   PRIMARY KEY (`key`,`table_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='元数据属性信息';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='metadata of table configurations';
 
 -- ----------------------------
 -- Table structure for metadata_column
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `metadata_column` (
-  `column_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '列名',
-  `column_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '列类型, 有Physical Metadata Computed WATERMARK ',
-  `data_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据类型',
-  `expr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '表达式',
-  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字段描述',
-  `table_id` int NOT NULL COMMENT '数据表名称',
-  `primary` bit(1) DEFAULT NULL COMMENT '主键',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `column_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column name',
+  `column_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column type, such as : Physical , Metadata , Computed , WATERMARK',
+  `data_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'data type',
+  `expr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'expression',
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'column description',
+  `table_id` int NOT NULL COMMENT 'table id',
+  `primary` bit(1) DEFAULT NULL COMMENT 'table primary key',
+  `update_time` datetime DEFAULT NULL COMMENT 'update time',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
   PRIMARY KEY (`table_id`,`column_name`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='数据列信息';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='column informations';
 
 -- ----------------------------
 -- Table structure for dlink_upload_file_record
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `metadata_function` (
   `id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `function_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
-  `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '类名',
-  `database_id` int NOT NULL COMMENT '数据库主键',
-  `function_language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'UDF语言',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `function_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'function name',
+  `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'class name',
+  `database_id` int NOT NULL COMMENT 'database id',
+  `function_language` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'function language',
+  `update_time` datetime DEFAULT NULL COMMENT 'update time',
+  `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='UDF信息';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='UDF informations';
 

dlink-doc/sql/upgrade/0.6.7_schema/mysql/dinky_ddl.sql

@@ -21,17 +21,17 @@
 -- Table structure for dlink_fragment
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `dlink_fragment`(
-  `id` int NOT NULL AUTO_INCREMENT COMMENT '实例主键',
-  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一名称',
-  `alias` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '别名',
-  `fragment_value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '变量值',
-  `note` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '说明/描述',
-  `enabled` tinyint DEFAULT '1' COMMENT '是否启用',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `id` int NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'fragment name',
+  `alias` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'alias',
+  `fragment_value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'fragment value',
+  `note` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT 'note',
+  `enabled` tinyint DEFAULT '1' COMMENT 'is enable',
+  `create_time` datetime DEFAULT NULL COMMENT 'create time',
+  `update_time` datetime DEFAULT NULL COMMENT 'update time',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE KEY `un_idx1` (`name`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='全局变量';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='fragment management';
 
 
 -- 0.6.7 2022-09-02
@@ -40,17 +40,17 @@ CREATE TABLE IF NOT EXISTS `dlink_fragment`(
 -- Table structure for dlink_upload_file_record
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `dlink_upload_file_record` (
-  `id` tinyint NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '上传文件的类型名称，目前有：hadoop-conf(1)、flink-conf(2)、flink-lib(3)、user-jar(4)、dlink-jar(5)',
-  `enabled` tinyint(1) DEFAULT NULL COMMENT '是否可用',
-  `file_type` tinyint DEFAULT '-1' COMMENT '上传文件的类型ID，目前有：hadoop-conf(1)、flink-conf(2)、flink-lib(3)、user-jar(4)、dlink-jar(5)，默认值-1表示无类型',
-  `target` tinyint NOT NULL COMMENT '上传文件的目的地，目前有：local(1)、hdfs(2)',
-  `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文件名称',
-  `file_parent_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文件父路径',
-  `file_absolute_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '文件完全绝对父路径',
-  `is_file` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否为文件',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `id` tinyint NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'upload file name',
+  `enabled` tinyint(1) DEFAULT NULL COMMENT 'is enable',
+  `file_type` tinyint DEFAULT '-1' COMMENT 'upload file type ，such as：hadoop-conf(1)、flink-conf(2)、flink-lib(3)、user-jar(4)、dlink-jar(5)，default is -1 ',
+  `target` tinyint NOT NULL COMMENT 'upload file of target ，such as：local(1)、hdfs(2)',
+  `file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'file name',
+  `file_parent_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'file parent path',
+  `file_absolute_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'fila absolute path',
+  `is_file` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'is file',
+  `create_time` datetime DEFAULT NULL COMMENT 'create time',
+  `update_time` datetime DEFAULT NULL COMMENT 'update time',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='上传文件记录';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='file upload history';
 

dlink-doc/sql/upgrade/0.6.8_schema/mysql/dinky_dml.sql

@@ -27,13 +27,13 @@ VALUES (1, 'DefaultTenant', 0, 'DefaultTenant', current_time, current_time);
 -- Records of dlink_role
 -- ----------------------------
 INSERT INTO `dlink_role`(`id`, `tenant_id`, `role_code`, `role_name`, `is_delete`, `note`, `create_time`, `update_time`)
-VALUES (1, 1, 'SuperAdmin', '超级管理员', 0, '超级管理员角色', current_time, current_time);
+VALUES (1, 1, 'SuperAdmin', 'SuperAdmin', 0, 'SuperAdmin of Role', current_time, current_time);
 
 -- ----------------------------
 -- Records of dlink_namespace
 -- ----------------------------
 INSERT INTO `dlink_namespace`(`id`, `tenant_id`, `namespace_code`, `enabled`, `note`, `create_time`, `update_time`)
-VALUES (1, 1, 'DefaultNameSpace', 1, '默认命名空间', current_time, current_time);
+VALUES (1, 1, 'DefaultNameSpace', 1, 'DefaultNameSpace', current_time, current_time);
 
 -- ----------------------------
 -- Records of dlink_role_namespace
@@ -62,3 +62,5 @@ VALUES (1, 'java_udf', 'java', 'UDF', 'package ${package};\n\nimport org.apache.
 
 INSERT INTO `dlink_udf_template` (`id`, `name`, `code_type`, `function_type`, `template_code`, `enabled`, `create_time`, `update_time`)
 VALUES (2, 'java_udtf', 'java', 'UDTF', 'package ${package};\n\nimport org.apache.flink.table.functions.ScalarFunction;\n\n@FunctionHint(output = @DataTypeHint(\"ROW<word STRING, length INT>\"))\npublic static class ${className} extends TableFunction<Row> {\n\n  public void eval(String str) {\n    for (String s : str.split(\" \")) {\n      // use collect(...) to emit a row\n      collect(Row.of(s, s.length()));\n    }\n  }\n}', NULL, '2022-10-19 09:22:58', '2022-10-19 10:01:57');
+
+

dlink-web/src/locales/en-US.ts

@@ -18,14 +18,12 @@
  */
 
 import component from './en-US/component';
-import globalHeader from './en-US/globalHeader';
+import globalHeader from './en-US/global';
 import menu from './en-US/menu';
 import pages from './en-US/pages';
 import pwa from './en-US/pwa';
 import request from './en-US/request';
-import settingDrawer from './en-US/settingDrawer';
 import settings from './en-US/settings';
-import button from './en-US/button';
 import shortKey from './en-US/shortcutKey';
 
 export default {
@@ -39,12 +37,10 @@ export default {
   'app.welcome.link.block-list': 'Quickly build standard, pages based on `block` development',
   ...globalHeader,
   ...menu,
-  ...settingDrawer,
   ...settings,
   ...pwa,
   ...component,
   ...pages,
   ...request,
-  ...button,
   ...shortKey,
 };

dlink-web/src/locales/en-US/button.ts

-/*
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-export default {
-  'button.create': 'Create',
-  'button.close': 'Close',
-  'button.confirm': 'Confirm',
-  'button.cancel': 'Cancel',
-  'button.finish': 'Finish',
-  'button.save': 'Save',
-  'button.delete': 'Delete',
-  'button.batchDelete': 'Batch Delete',
-  'button.batchEnable': 'Batch Enable',
-  'button.batchDisable': 'Batch Disable',
-  'button.more': 'More',
-  'button.config': 'Config',
-  'button.edit': 'Edit',
-  'button.assignUser': 'Assign Users',
-  'button.assignRole': 'Assign Role',
-  'button.changePassword': 'Change Password',
-  'button.enable': 'Enable',
-  'button.disable': 'Disable',
-  'button.reset': 'Reset',
-  'button.search': 'Search',
-  'button.upload': 'Upload',
-  'button.import': 'Import',
-  'button.export': 'Export',
-  'button.submit': 'Submit',
-
-  'right.menu.open': 'Open',
-  'right.menu.submit': 'Sync Submit',
-  'right.menu.exportJson': 'Export JSON',
-  'right.menu.rename': 'Rename',
-  'right.menu.copy': 'Copy',
-  'right.menu.cut': 'Cut',
-  'right.menu.paste': 'Paste',
-  'right.menu.delete': 'Delete',
-  'right.menu.createCatalogue': 'Creat Dire',
-  'right.menu.createRootCatalogue': 'Create Root Dir',
-  'right.menu.uploadZipToCreate': 'Upload Zip To Create',
-  'right.menu.createTask': 'Create Task',
-
-
-  'tips.selected': 'Selected {total} Item',
-  'tips.notSelected': 'Not Select',
-
-  'status.enabled': 'Enabled',
-  'status.disabled': 'Disabled',
-
-};

dlink-web/src/locales/en-US/globalHeader.ts → dlink-web/src/locales/en-US/global.ts

@@ -18,21 +18,55 @@
  */
 
 export default {
-  'component.globalHeader.search': 'Search',
-  'component.globalHeader.search.example1': 'Search example 1',
-  'component.globalHeader.search.example2': 'Search example 2',
-  'component.globalHeader.search.example3': 'Search example 3',
-  'component.globalHeader.help': 'Help',
-  'component.globalHeader.notification': 'Notification',
-  'component.globalHeader.notification.empty': 'You have viewed all notifications.',
-  'component.globalHeader.message': 'Message',
-  'component.globalHeader.message.empty': 'You have viewed all messsages.',
-  'component.globalHeader.event': 'Event',
-  'component.globalHeader.event.empty': 'You have viewed all events.',
-  'component.noticeIcon.clear': 'Clear',
-  'component.noticeIcon.cleared': 'Cleared',
-  'component.noticeIcon.empty': 'No notifications',
-  'component.noticeIcon.view-more': 'View more',
+  'button.create': 'Create',
+  'button.close': 'Close',
+  'button.confirm': 'Confirm',
+  'button.cancel': 'Cancel',
+  'button.finish': 'Finish',
+  'button.save': 'Save',
+  'button.delete': 'Delete',
+  'button.batchDelete': 'Batch Delete',
+  'button.batchEnable': 'Batch Enable',
+  'button.batchDisable': 'Batch Disable',
+  'button.more': 'More',
+  'button.config': 'Config',
+  'button.edit': 'Edit',
+  'button.assignUser': 'Assign Users',
+  'button.assignRole': 'Assign Role',
+  'button.changePassword': 'Change Password',
+  'button.enable': 'Enable',
+  'button.disable': 'Disable',
+  'button.reset': 'Reset',
+  'button.search': 'Search',
+  'button.upload': 'Upload',
+  'button.import': 'Import',
+  'button.export': 'Export',
+  'button.submit': 'Submit',
+  'button.createDir': 'Create Directory',
+  'button.heartbeat': 'Heartbeat',
+  'button.recycle': 'Recycle',
+  'button.refresh': 'Refresh',
+
+  'right.menu.open': 'Open',
+  'right.menu.submit': 'Sync Submit',
+  'right.menu.exportJson': 'Export JSON',
+  'right.menu.rename': 'Rename',
+  'right.menu.copy': 'Copy',
+  'right.menu.cut': 'Cut',
+  'right.menu.paste': 'Paste',
+  'right.menu.delete': 'Delete',
+  'right.menu.createCatalogue': 'Create Dir',
+  'right.menu.createRootCatalogue': 'Create Root Dir',
+  'right.menu.uploadZipToCreate': 'Upload Zip To Create',
+  'right.menu.createTask': 'Create Task',
+
+
+  'tips.selected': 'Selected {total} Item',
+  'tips.notSelected': 'Not Select',
+
+  'status.enabled': 'Enabled',
+  'status.disabled': 'Disabled',
+
 
   'global.table.operate': 'Operation',
   'global.table.config': 'Config',

dlink-web/src/locales/en-US/menu.ts

@@ -18,54 +18,6 @@
  */
 
 export default {
-  'menu.welcome': 'Welcome',
-  'menu.more-blocks': 'More Blocks',
-  'menu.home': 'Home',
-  'menu.admin': 'Admin',
-  'menu.admin.sub-page': 'Sub-Page',
-  'menu.login': 'Login',
-  'menu.register': 'Register',
-  'menu.register.result': 'Register Result',
-  'menu.dashboard': 'Dashboard',
-  'menu.dashboard.analysis': 'Analysis',
-  'menu.dashboard.monitor': 'Monitor',
-  'menu.dashboard.workplace': 'Workplace',
-  'menu.exception.403': '403',
-  'menu.exception.404': '404',
-  'menu.exception.500': '500',
-  'menu.form': 'Form',
-  'menu.form.basic-form': 'Basic Form',
-  'menu.form.step-form': 'Step Form',
-  'menu.form.step-form.info': 'Step Form(write transfer information)',
-  'menu.form.step-form.confirm': 'Step Form(confirm transfer information)',
-  'menu.form.step-form.result': 'Step Form(finished)',
-  'menu.form.advanced-form': 'Advanced Form',
-  'menu.list': 'List',
-  'menu.list.table-list': 'Search Table',
-  'menu.list.basic-list': 'Basic List',
-  'menu.list.card-list': 'Card List',
-  'menu.list.search-list': 'Search List',
-  'menu.list.search-list.articles': 'Search List(articles)',
-  'menu.list.search-list.projects': 'Search List(projects)',
-  'menu.list.search-list.applications': 'Search List(applications)',
-  'menu.profile': 'Profile',
-  'menu.profile.basic': 'Basic Profile',
-  'menu.profile.advanced': 'Advanced Profile',
-  'menu.result': 'Result',
-  'menu.result.success': 'Success',
-  'menu.result.fail': 'Fail',
-  'menu.exception': 'Exception',
-  'menu.exception.not-permission': '403',
-  'menu.exception.not-find': '404',
-  'menu.exception.server-error': '500',
-  'menu.exception.trigger': 'Trigger',
-  'menu.account': 'Account',
-  'menu.account.trigger': 'Trigger Error',
-  'menu.editor': 'Graphic Editor',
-  'menu.editor.flow': 'Flow Editor',
-  'menu.editor.mind': 'Mind Editor',
-  'menu.editor.koni': 'Koni Editor',
-
   'menu.account.center': 'Account Center',
   'menu.account.settings': 'Account Settings',
   'menu.account.changePassword': 'Change Password',

dlink-web/src/locales/en-US/pages.ts

@@ -216,16 +216,6 @@ export default {
   'pages.role.disable': 'Disable Role',
   'pages.role.disableConfirm': 'Are you sure you want to disable this Role？',
 
-  // registration center pages
-  'pages.register.alert.group': '',
-  'pages.register.alert.instance': '',
-
-  'pages.register.database': '',
-  'pages.register.jar': '',
-  'pages.register.1': '',
-  'pages.register.2': '',
-
-
   'pages.regist.openAPI': 'OpenAPI Document',
   'pages.regist.BusinessComponent': 'Business Component Document',
 

dlink-web/src/locales/en-US/settingDrawer.ts

-/*
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-export default {
-  'app.setting.pagestyle': 'Page style setting',
-  'app.setting.pagestyle.dark': 'Dark style',
-  'app.setting.pagestyle.light': 'Light style',
-  'app.setting.content-width': 'Content Width',
-  'app.setting.content-width.fixed': 'Fixed',
-  'app.setting.content-width.fluid': 'Fluid',
-  'app.setting.themecolor': 'Theme Color',
-  'app.setting.themecolor.dust': 'Dust Red',
-  'app.setting.themecolor.volcano': 'Volcano',
-  'app.setting.themecolor.sunset': 'Sunset Orange',
-  'app.setting.themecolor.cyan': 'Cyan',
-  'app.setting.themecolor.green': 'Polar Green',
-  'app.setting.themecolor.daybreak': 'Daybreak Blue (default)',
-  'app.setting.themecolor.geekblue': 'Geek Glue',
-  'app.setting.themecolor.purple': 'Golden Purple',
-  'app.setting.navigationmode': 'Navigation Mode',
-  'app.setting.sidemenu': 'Side Menu Layout',
-  'app.setting.topmenu': 'Top Menu Layout',
-  'app.setting.fixedheader': 'Fixed Header',
-  'app.setting.fixedsidebar': 'Fixed Sidebar',
-  'app.setting.fixedsidebar.hint': 'Works on Side Menu Layout',
-  'app.setting.hideheader': 'Hidden Header when scrolling',
-  'app.setting.hideheader.hint': 'Works when Hidden Header is enabled',
-  'app.setting.othersettings': 'Other Settings',
-  'app.setting.weakmode': 'Weak Mode',
-  'app.setting.copy': 'Copy Setting',
-  'app.setting.copyinfo': 'copy success，please replace defaultSettings in src/models/setting.js',
-  'app.setting.production.hint':
-    'Setting panel shows in development environment only, please manually modify',
-};

dlink-web/src/locales/en-US/settings.ts

@@ -76,4 +76,33 @@ export default {
     'The to-do list will be notified in the form of a letter from the station',
   'app.settings.open': 'Open',
   'app.settings.close': 'Close',
+  'app.setting.pagestyle': 'Page style setting',
+  'app.setting.pagestyle.dark': 'Dark style',
+  'app.setting.pagestyle.light': 'Light style',
+  'app.setting.content-width': 'Content Width',
+  'app.setting.content-width.fixed': 'Fixed',
+  'app.setting.content-width.fluid': 'Fluid',
+  'app.setting.themecolor': 'Theme Color',
+  'app.setting.themecolor.dust': 'Dust Red',
+  'app.setting.themecolor.volcano': 'Volcano',
+  'app.setting.themecolor.sunset': 'Sunset Orange',
+  'app.setting.themecolor.cyan': 'Cyan',
+  'app.setting.themecolor.green': 'Polar Green',
+  'app.setting.themecolor.daybreak': 'Daybreak Blue (default)',
+  'app.setting.themecolor.geekblue': 'Geek Glue',
+  'app.setting.themecolor.purple': 'Golden Purple',
+  'app.setting.navigationmode': 'Navigation Mode',
+  'app.setting.sidemenu': 'Side Menu Layout',
+  'app.setting.topmenu': 'Top Menu Layout',
+  'app.setting.fixedheader': 'Fixed Header',
+  'app.setting.fixedsidebar': 'Fixed Sidebar',
+  'app.setting.fixedsidebar.hint': 'Works on Side Menu Layout',
+  'app.setting.hideheader': 'Hidden Header when scrolling',
+  'app.setting.hideheader.hint': 'Works when Hidden Header is enabled',
+  'app.setting.othersettings': 'Other Settings',
+  'app.setting.weakmode': 'Weak Mode',
+  'app.setting.copy': 'Copy Setting',
+  'app.setting.copyinfo': 'copy success，please replace defaultSettings in src/models/setting.js',
+  'app.setting.production.hint':
+    'Setting panel shows in development environment only, please manually modify',
 };

dlink-web/src/locales/zh-CN.ts

@@ -18,14 +18,12 @@
  */
 
 import component from './zh-CN/component';
-import globalHeader from './zh-CN/globalHeader';
+import globalHeader from './zh-CN/global';
 import menu from './zh-CN/menu';
 import pwa from './zh-CN/pwa';
 import request from './zh-CN/request';
-import settingDrawer from './zh-CN/settingDrawer';
 import settings from './zh-CN/settings';
 import pages from './zh-CN/pages';
-import button from './zh-CN/button';
 import shortKey from './zh-CN/shortcutKey';
 
 export default {
@@ -40,11 +38,9 @@ export default {
   ...pages,
   ...globalHeader,
   ...menu,
-  ...settingDrawer,
   ...settings,
   ...pwa,
   ...component,
   ...request,
-  ...button,
   ...shortKey,
 };

dlink-web/src/locales/zh-CN/button.ts

-/*
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-export default {
-  'button.create': '新建',
-  'button.close': '关闭',
-  'button.confirm': '确定',
-  'button.cancel': '取消',
-  'button.finish': '完成',
-  'button.save': '保存',
-  'button.delete': '删除',
-  'button.batchDelete': '批量删除',
-  'button.batchEnable': '批量启用',
-  'button.batchDisable': '批量禁用',
-  'button.more': '更多',
-  'button.config': '配置',
-  'button.edit': '编辑',
-  'button.assignUser': '分配用户',
-  'button.assignRole': '分配角色',
-  'button.changePassword': '修改密码',
-  'button.enable': '启用',
-  'button.disable': '禁用',
-  'button.reset': '重置',
-  'button.search': '搜索',
-  'button.upload': '上传',
-  'button.import': '导入',
-  'button.export': '导出',
-  'button.submit': '提交',
-
-
-  'right.menu.open': '打开',
-  'right.menu.submit': '异步提交',
-  'right.menu.exportJson': '导出 JSON',
-  'right.menu.rename': '重命名',
-  'right.menu.copy': '复制',
-  'right.menu.cut': '剪切',
-  'right.menu.paste': '粘贴',
-  'right.menu.delete': '删除',
-  'right.menu.createCatalogue': '创建目录',
-  'right.menu.createRootCatalogue': '创建根目录',
-  'right.menu.uploadZipToCreate': '上传zip包创建工程',
-  'right.menu.createTask': '创建作业',
-
-
-  'tips.selected': '已选择 {total} 项',
-  'tips.notSelected': '未选',
-
-  'status.enabled': '已启用',
-  'status.disabled': '已禁用',
-
-};

dlink-web/src/locales/zh-CN/globalHeader.ts → dlink-web/src/locales/zh-CN/global.ts

@@ -18,21 +18,55 @@
  */
 
 export default {
-  'component.globalHeader.search': '站内搜索',
-  'component.globalHeader.search.example1': '搜索提示一',
-  'component.globalHeader.search.example2': '搜索提示二',
-  'component.globalHeader.search.example3': '搜索提示三',
-  'component.globalHeader.help': '使用文档',
-  'component.globalHeader.notification': '通知',
-  'component.globalHeader.notification.empty': '你已查看所有通知',
-  'component.globalHeader.message': '消息',
-  'component.globalHeader.message.empty': '您已读完所有消息',
-  'component.globalHeader.event': '待办',
-  'component.globalHeader.event.empty': '你已完成所有待办',
-  'component.noticeIcon.clear': '清空',
-  'component.noticeIcon.cleared': '清空了',
-  'component.noticeIcon.empty': '暂无数据',
-  'component.noticeIcon.view-more': '查看更多',
+  'button.create': '新建',
+  'button.close': '关闭',
+  'button.confirm': '确定',
+  'button.cancel': '取消',
+  'button.finish': '完成',
+  'button.save': '保存',
+  'button.delete': '删除',
+  'button.batchDelete': '批量删除',
+  'button.batchEnable': '批量启用',
+  'button.batchDisable': '批量禁用',
+  'button.more': '更多',
+  'button.config': '配置',
+  'button.edit': '编辑',
+  'button.assignUser': '分配用户',
+  'button.assignRole': '分配角色',
+  'button.changePassword': '修改密码',
+  'button.enable': '启用',
+  'button.disable': '禁用',
+  'button.reset': '重置',
+  'button.search': '搜索',
+  'button.upload': '上传',
+  'button.import': '导入',
+  'button.export': '导出',
+  'button.submit': '提交',
+  'button.createDir': '创建目录',
+  'button.heartbeat': '心跳',
+  'button.recycle': '回收',
+  'button.refresh': '刷新',
+
+  'right.menu.open': '打开',
+  'right.menu.submit': '异步提交',
+  'right.menu.exportJson': '导出 JSON',
+  'right.menu.rename': '重命名',
+  'right.menu.copy': '复制',
+  'right.menu.cut': '剪切',
+  'right.menu.paste': '粘贴',
+  'right.menu.delete': '删除',
+  'right.menu.createCatalogue': '创建目录',
+  'right.menu.createRootCatalogue': '创建根目录',
+  'right.menu.uploadZipToCreate': '上传zip包创建工程',
+  'right.menu.createTask': '创建作业',
+
+
+  'tips.selected': '已选择 {total} 项',
+  'tips.notSelected': '未选',
+
+  'status.enabled': '已启用',
+  'status.disabled': '已禁用',
+
 
   'global.table.operate': '操作',
   'global.table.config': '配置',

dlink-web/src/locales/zh-CN/menu.ts

@@ -18,60 +18,6 @@
  */
 
 export default {
-  'menu.welcome': '欢迎',
-  'menu.more-blocks': '更多区块',
-
-  'menu.admin': '管理页',
-  'menu.admin.sub-page': '二级管理页',
-  'menu.login': '登录',
-  'menu.register': '注册',
-  'menu.register.result': '注册结果',
-  'menu.dashboard': 'Dashboard',
-  'menu.dashboard.analysis': '分析页',
-  'menu.dashboard.monitor': '监控页',
-  'menu.dashboard.workplace': '工作台',
-  'menu.exception.403': '403',
-  'menu.exception.404': '404',
-  'menu.exception.500': '500',
-  'menu.demo.form': '表单页',
-  'menu.form.basic-form': '基础表单',
-  'menu.form.step-form': '分步表单',
-  'menu.form.step-form.info': '分步表单（填写转账信息）',
-  'menu.form.step-form.confirm': '分步表单（确认转账信息）',
-  'menu.form.step-form.result': '分步表单（完成）',
-  'menu.demo.form.advanced-form': '高级表单',
-  'menu.demo.list': '列表页',
-  'menu.demo.list.table-list': '查询表格',
-  'menu.demo.list.basic-list': '标准列表',
-  'menu.list.card-list': '卡片列表',
-  'menu.list.search-list': '搜索列表',
-  'menu.list.search-list.articles': '搜索列表（文章）',
-  'menu.list.search-list.projects': '搜索列表（项目）',
-  'menu.list.search-list.applications': '搜索列表（应用）',
-  'menu.profile': '详情页',
-  'menu.profile.basic': '基础详情页',
-  'menu.profile.advanced': '高级详情页',
-  'menu.result': '结果页',
-  'menu.result.success': '成功页',
-  'menu.result.fail': '失败页',
-  'menu.exception': '异常页',
-  'menu.exception.not-permission': '403',
-  'menu.exception.not-find': '404',
-  'menu.exception.server-error': '500',
-  'menu.exception.trigger': '触发错误',
-  'menu.account': '个人页',
-  'menu.account.trigger': '触发报错',
-  'menu.editor': '图形编辑器',
-  'menu.editor.flow': '流程编辑器',
-  'menu.editor.mind': '脑图编辑器',
-  'menu.editor.koni': '拓扑编辑器',
-  'menu.demo': 'Demo 开发模板',
-  'menu.dev.flink': 'Flink 计算框架',
-  'menu.dev.flink.docs': '官方文档',
-  'menu.dev.ant-design': 'Ant Design UI框架',
-  'menu.dev.ant-design.docs': '官方文档',
-  'menu.dev.ant-design.preview': '官方预览',
-
   'menu.account.center': '个人中心',
   'menu.account.settings': '个人设置',
   'menu.account.changePassword': '修改密码',

dlink-web/src/locales/zh-CN/pages.ts

@@ -125,13 +125,13 @@ export default {
   'pages.settings.FlinkNotUse': '禁用',
 
   'pages.user.UserManger': '用户管理',
-  'pages.user.UserName': '用户名',//用户名
-  'pages.user.UserJobNumber': '工号',//工号
-  'pages.user.UserPhoneNumber': '手机号',//手机号
-  'pages.user.UserNickName': '昵称',//昵称
-  'pages.user.UserIsUse': '是否启用',//是否启用
-  'pages.user.UserUpdateTime': '最近更新时间',//最近更新时间
-  'pages.user.UserCreateTime': '创建时间',//创建时间
+  'pages.user.UserName': '用户名',
+  'pages.user.UserJobNumber': '工号',
+  'pages.user.UserPhoneNumber': '手机号',
+  'pages.user.UserNickName': '昵称',
+  'pages.user.UserIsUse': '是否启用',
+  'pages.user.UserUpdateTime': '最近更新时间',
+  'pages.user.UserCreateTime': '创建时间',
 
 
   'pages.user.UserDeleteUser': '删除用户',

dlink-web/src/locales/zh-CN/settingDrawer.ts

-/*
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-export default {
-  'app.setting.pagestyle': '整体风格设置',
-  'app.setting.pagestyle.dark': '暗色菜单风格',
-  'app.setting.pagestyle.light': '亮色菜单风格',
-  'app.setting.content-width': '内容区域宽度',
-  'app.setting.content-width.fixed': '定宽',
-  'app.setting.content-width.fluid': '流式',
-  'app.setting.themecolor': '主题色',
-  'app.setting.themecolor.dust': '薄暮',
-  'app.setting.themecolor.volcano': '火山',
-  'app.setting.themecolor.sunset': '日暮',
-  'app.setting.themecolor.cyan': '明青',
-  'app.setting.themecolor.green': '极光绿',
-  'app.setting.themecolor.daybreak': '拂晓蓝（默认）',
-  'app.setting.themecolor.geekblue': '极客蓝',
-  'app.setting.themecolor.purple': '酱紫',
-  'app.setting.navigationmode': '导航模式',
-  'app.setting.sidemenu': '侧边菜单布局',
-  'app.setting.topmenu': '顶部菜单布局',
-  'app.setting.fixedheader': '固定 Header',
-  'app.setting.fixedsidebar': '固定侧边菜单',
-  'app.setting.fixedsidebar.hint': '侧边菜单布局时可配置',
-  'app.setting.hideheader': '下滑时隐藏 Header',
-  'app.setting.hideheader.hint': '固定 Header 时可配置',
-  'app.setting.othersettings': '其他设置',
-  'app.setting.weakmode': '色弱模式',
-  'app.setting.copy': '拷贝设置',
-  'app.setting.copyinfo': '拷贝成功，请到 src/defaultSettings.js 中替换默认配置',
-  'app.setting.production.hint':
-    '配置栏只在开发环境用于预览，生产环境不会展现，请拷贝后手动修改配置文件',
-};

dlink-web/src/locales/zh-CN/settings.ts

@@ -71,4 +71,33 @@ export default {
   'app.settings.notification.todo-description': '待办任务将以站内信的形式通知',
   'app.settings.open': '开',
   'app.settings.close': '关',
+  'app.setting.pagestyle': '整体风格设置',
+  'app.setting.pagestyle.dark': '暗色菜单风格',
+  'app.setting.pagestyle.light': '亮色菜单风格',
+  'app.setting.content-width': '内容区域宽度',
+  'app.setting.content-width.fixed': '定宽',
+  'app.setting.content-width.fluid': '流式',
+  'app.setting.themecolor': '主题色',
+  'app.setting.themecolor.dust': '薄暮',
+  'app.setting.themecolor.volcano': '火山',
+  'app.setting.themecolor.sunset': '日暮',
+  'app.setting.themecolor.cyan': '明青',
+  'app.setting.themecolor.green': '极光绿',
+  'app.setting.themecolor.daybreak': '拂晓蓝（默认）',
+  'app.setting.themecolor.geekblue': '极客蓝',
+  'app.setting.themecolor.purple': '酱紫',
+  'app.setting.navigationmode': '导航模式',
+  'app.setting.sidemenu': '侧边菜单布局',
+  'app.setting.topmenu': '顶部菜单布局',
+  'app.setting.fixedheader': '固定 Header',
+  'app.setting.fixedsidebar': '固定侧边菜单',
+  'app.setting.fixedsidebar.hint': '侧边菜单布局时可配置',
+  'app.setting.hideheader': '下滑时隐藏 Header',
+  'app.setting.hideheader.hint': '固定 Header 时可配置',
+  'app.setting.othersettings': '其他设置',
+  'app.setting.weakmode': '色弱模式',
+  'app.setting.copy': '拷贝设置',
+  'app.setting.copyinfo': '拷贝成功，请到 src/defaultSettings.js 中替换默认配置',
+  'app.setting.production.hint':
+    '配置栏只在开发环境用于预览，生产环境不会展现，请拷贝后手动修改配置文件',
 };

dlink-web/src/pages/Cluster/index.tsx

@@ -382,10 +382,10 @@ const ClusterTableList: React.FC<{}> = (props: any) => {
             <PlusOutlined/> {l('button.create')}
           </Button>,
           <Button type="primary" onClick={() => checkHeartBeats()}>
-            <HeartOutlined/> {l('global.table.heartbeat')}
+            <HeartOutlined/> {l('button.heartbeat')}
           </Button>,
           <Button type="primary" onClick={() => clearCluster()}>
-            <ClearOutlined/> {l('global.table.recycle')}
+            <ClearOutlined/> {l('button.recycle')}
           </Button>,
         ]}
         request={(params, sorter, filter) => queryData(url, {...params, sorter, filter})}