center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev_memory_component

Browse Source
This commit is contained in:
dataeaseShu 2023-01-11 15:22:47 +08:00
commit 3961cb774e
50 changed files with 1249 additions and 781 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.18.0</version>
<version>1.18.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -204,7 +204,7 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-interface</artifactId>
<version>1.18.0</version>
<version>1.18.2</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
@ -215,12 +215,12 @@
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-view</artifactId>
<version>1.18.0</version>
<version>1.18.2</version>
</dependency>
<dependency>
<groupId>io.dataease</groupId>
<artifactId>dataease-plugin-datasource</artifactId>
<version>1.18.0</version>
<version>1.18.2</version>
</dependency>
<!-- kettle及数据源依赖 -->
<dependency>

62
backend/src/main/java/io/dataease/commons/license/F2CLicense.java
View File

@ -1,5 +1,8 @@
package io.dataease.commons.license;
import lombok.Data;
@Data
public class F2CLicense {
private String corporation;
@ -10,61 +13,6 @@ public class F2CLicense {
private String edition;
private Long count;
public String getCorporation() {
return corporation;
}
public void setCorporation(String corporation) {
this.corporation = corporation;
}
public String getExpired() {
return expired;
}
public void setExpired(String expired) {
this.expired = expired;
}
public String getLicenseVersion() {
return licenseVersion;
}
public void setLicenseVersion(String licenseVersion) {
this.licenseVersion = licenseVersion;
}
public String getProduct() {
return product;
}
public void setProduct(String product) {
this.product = product;
}
public Long getGenerateTime() {
return generateTime;
}
public void setGenerateTime(Long generateTime) {
this.generateTime = generateTime;
}
public String getEdition() {
return edition;
}
public void setEdition(String edition) {
this.edition = edition;
}
public Long getCount() {
return count;
}
public void setCount(Long count) {
this.count = count;
}
private String serialNo;
private String remark;
}

10
backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
View File

@ -359,8 +359,8 @@ public class ExcelXlsxReader extends DefaultHandler {
formatIndex = style.getDataFormat();
formatString = style.getDataFormatString();
short format = this.formatIndex;
if ((14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59)
|| (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期
if ((14 <= format && format <= 17) || format == 0 || format == 20 || format == 22 || format == 31 || format == 35 || (45 <= format && format <= 49) || format == 46 || format == 47 || (57 <= format && format <= 59)
|| (59 < format && format <= 76) || (175 < format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期
isDateFormat = true;
}
@ -418,7 +418,11 @@ public class ExcelXlsxReader extends DefaultHandler {
break;
case NUMBER: //数字
if (formatString != null && isDateFormat) {
thisStr = formatter.formatRawCellContents(Double.parseDouble(value), formatIndex, formatString).trim();
if (obtainedNum != null) {
thisStr = formatter.formatRawCellContents(Double.parseDouble(value), formatIndex, formatString).trim();
} else {
thisStr = formatter.formatRawCellContents(Double.parseDouble(value), formatIndex, "yyyy-mm-dd hh:mm:ss").trim();
}
} else {
thisStr = value;
}

3
backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
View File

@ -81,6 +81,9 @@ public class DatasourceController {
datasource.setCreateTime(null);
datasource.setType(updataDsRequest.getType());
datasource.setUpdateTime(System.currentTimeMillis());
if (StringUtils.isNotEmpty(updataDsRequest.getId())) {
datasource.setId(updataDsRequest.getId());
}
datasourceService.preCheckDs(datasource);
if (StringUtils.isNotEmpty(updataDsRequest.getId())) {
datasourceService.updateDatasource(updataDsRequest.getId(), datasource);

10
backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java
View File

@ -8,6 +8,7 @@ import io.dataease.service.panel.PanelAppTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@ -57,7 +58,14 @@ public class PanelAppTemplateController {
@PostMapping("/nameCheck")
@I18n
public String nameCheck(@RequestBody PanelAppTemplateRequest request) {
return panelAppTemplateService.nameCheck(request);
return panelAppTemplateService.nameCheck(request);
}
@ApiOperation("移动")
@PostMapping("/move")
@I18n
public void move(@RequestBody PanelAppTemplateRequest request) {
panelAppTemplateService.move(request);
}
}

3
backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
View File

@ -1,5 +1,6 @@
package io.dataease.listener;
import io.dataease.listener.util.CacheUtils;
import io.dataease.service.datasource.DatasourceService;
import io.dataease.service.dataset.DataSetTableService;
import io.dataease.service.engine.EngineService;
@ -25,7 +26,7 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
datasourceService.initDsCheckJob();
dataSetTableService.updateDatasetTableStatus();
engineService.initSimpleEngine();
CacheUtils.removeAll("ENGINE");
}

4
backend/src/main/java/io/dataease/plugins/server/XLdapServer.java
View File

@ -31,10 +31,10 @@ public class XLdapServer {
}
@PostMapping("/testConn")
public void testConn() {
public void testConn(@RequestBody List<SysSettingDto> settings) {
LdapXpackService ldapXpackService = SpringContextUtil.getBean(LdapXpackService.class);
try {
ldapXpackService.testConn();
ldapXpackService.testConn(settings);
}catch(Exception e) {
throw new RuntimeException(e);
}

6
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -525,6 +525,9 @@ public class ChartViewService {
datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
}
}
List<ChartViewFieldDTO> xAxisForRequest = new ArrayList<>();
xAxisForRequest.addAll(xAxis); xAxisForRequest.addAll(extStack);
datasourceRequest.setXAxis(xAxisForRequest);
data = datasourceProvider.getData(datasourceRequest);
} else if (table.getMode() == 1) {// 抽取
datasourceRequest.setDatasource(ds);
@ -1039,6 +1042,9 @@ public class ChartViewService {
}
datasourceRequest.setQuery(querySql);
List<ChartViewFieldDTO> xAxisForRequest = new ArrayList<>();
xAxisForRequest.addAll(xAxis); xAxisForRequest.addAll(extStack);
datasourceRequest.setXAxis(xAxisForRequest);
data = datasourceProvider.getData(datasourceRequest);
if (CollectionUtils.isNotEmpty(assistFields)) {
datasourceAssistRequest.setQuery(assistSQL(datasourceRequest.getQuery(), assistFields));

8
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -1119,12 +1119,13 @@ public class DataSetTableService {
if (fromItem.getAlias() == null) {
throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
}
subSelect.setAlias(new Alias(fromItem.getAlias().toString()));
subSelect.setAlias(new Alias(fromItem.getAlias().toString(), false));
}
plainSelect.setFromItem(subSelect);
}
List<Join> joins = plainSelect.getJoins();
if (joins != null) {
List<Join> joinsList = new ArrayList<>();
for (Join join : joins) {
FromItem rightItem = join.getRightItem();
if (rightItem instanceof SubSelect) {
@ -1139,14 +1140,13 @@ public class DataSetTableService {
if (rightItem.getAlias() == null) {
throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
}
subSelect.setAlias(new Alias(rightItem.getAlias().toString()));
subSelect.setAlias(new Alias(rightItem.getAlias().toString(), false));
}
List<Join> joinsList = new ArrayList<>();
join.setRightItem(subSelect);
joinsList.add(join);
plainSelect.setJoins(joinsList);
}
}
plainSelect.setJoins(joinsList);
}
Expression expr = plainSelect.getWhere();
if (expr == null) {

10
backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
View File

@ -120,6 +120,16 @@ public class PanelAppTemplateService {
}
public void move(PanelAppTemplateRequest request) {
if (!CommonConstants.CHECK_RESULT.NONE.equals(nameCheck(CommonConstants.OPT_TYPE.INSERT, request.getName(), request.getPid(), request.getId()))) {
throw new RuntimeException("当前名称在目标分类中已经存在！请选择其他分类或修改名称");
}
PanelAppTemplateWithBLOBs appTemplate = new PanelAppTemplateWithBLOBs();
appTemplate.setId(request.getId());
appTemplate.setPid(request.getPid());
panelAppTemplateMapper.updateByPrimaryKeySelective(appTemplate);
}
//名称检查
public String nameCheck(String optType, String name, String pid, String id) {
PanelAppTemplateExample example = new PanelAppTemplateExample();

17
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@ -755,19 +755,20 @@ public class PanelGroupService {
cell.setCellStyle(cellStyle);
//设置列的宽度
detailsSheet.setColumnWidth(j, 255 * 20);
} else {
// with DataType
if ((excelTypes[j] == DeTypeConstants.DE_INT || excelTypes[j] == DeTypeConstants.DE_FLOAT) && StringUtils.isNotEmpty(cellValObj.toString())) {
try {
} else if (cellValObj != null) {
try {
// with DataType
if ((excelTypes[j] == DeTypeConstants.DE_INT || excelTypes[j] == DeTypeConstants.DE_FLOAT) && StringUtils.isNotEmpty(cellValObj.toString())) {
cell.setCellValue(Double.valueOf(cellValObj.toString()));
} catch (Exception e) {
LogUtil.warn("export excel data transform error");
} else {
cell.setCellValue(cellValObj.toString());
}
} else {
cell.setCellValue(cellValObj.toString());
} catch (Exception e) {
LogUtil.warn("export excel data transform error");
}
}
}
}
}

52
backend/src/main/resources/db/migration/V41__1.15-offical-panel-update.sql
View File

File diff suppressed because one or more lines are too long

640
backend/src/main/resources/db/migration/V46__1.18.sql
View File

@ -42,631 +42,283 @@ INSERT INTO `sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`,
VALUES (45, 1, 1, 1, '应用管理', 'system-app-template', 'panel/appTemplate/index', 13, 'sys-param',
'panel/appTemplate/index', b'0', b'0', b'0', 'app-template:read', NULL, NULL, NULL, 1620444227389);
delete
from sys_auth_detail
where auth_id in (select id from sys_auth where auth_target = 1 and auth_target_type = 'role');
FROM sys_auth_detail
WHERE auth_id IN (SELECT id
FROM sys_auth
WHERE auth_source_type = 'menu'
AND auth_target = 1
AND auth_target_type = 'role'
AND id NOT IN (
'00590a7c-8e7b-45f4-8428-55532be07602',
'06ba0edb-143d-4b51-a864-8cfcf2b5d71e',
'0c045d89-85ea-4676-8b5e-4b3dae5a734d',
'1a18aa12-8daa-4f47-b5eb-999e473273df',
'1bf39d8d-7fe9-4832-8df3-f74b21a69288',
'359771bb-95b8-40ad-a6c5-b5c39c93cb10',
'37457802-97a6-4303-be89-cf82b4059db1',
'46e4e2cb-1349-40c3-a72d-7b0b30ab5d14',
'5960fd93-013c-4636-8f6b-2e6b49b7e869',
'5e0a9ad5-81ed-4f83-91f6-a74be724bda7',
'5ec5c9a7-04c0-4655-9b63-9ca5a439e2f3',
'60b3644b-2493-4805-8204-90880cfac9c6',
'6e22ad53-d737-447f-9686-5041e122b4dc',
'74ff225f-2a79-4221-9b32-c6eb9bcadd61',
'7823499e-dbb6-42a9-a28f-22377de18a39',
'88c778e6-ede3-4397-af4c-375e1feac8ef',
'9019e9e4-8ea6-47ea-9279-98d10be107fc',
'998e402b-6f15-48dc-ae4d-2cd04460a3f3',
'9f01c7ef-753b-4dea-97d4-c199f84c2c74',
'a6837d68-80a6-4a26-a7c0-e84001dfc817',
'b319dc39-c499-423b-8e99-22e9a0caba6f',
'bdd3bed8-35d4-4aa8-84c2-85e2412d6cbb',
'c18b47e9-aa22-4f17-b12c-a3459ca4dd90',
'd2368c49-33b0-46b2-894d-b182d1c03bd4',
'd3d558e5-b0b1-4475-bb69-f20fa5c47f4f',
'd400c00f-9c18-4eb6-a70f-9c8caf8dddfe',
'd8d18115-c7b9-4e99-96a8-fd1bbfddf543',
'da17fcfe-7875-4aaf-983b-d750d71f36d2',
'f17dc7f3-c97a-41b4-a2f4-1a04a857ae8a'
));
delete
from sys_auth
where auth_target = 1
and auth_target_type = 'role';
where auth_source_type = 'menu'
and auth_target = 1
and auth_target_type = 'role'
and id not in (
'00590a7c-8e7b-45f4-8428-55532be07602',
'06ba0edb-143d-4b51-a864-8cfcf2b5d71e',
'0c045d89-85ea-4676-8b5e-4b3dae5a734d',
'1a18aa12-8daa-4f47-b5eb-999e473273df',
'1bf39d8d-7fe9-4832-8df3-f74b21a69288',
'359771bb-95b8-40ad-a6c5-b5c39c93cb10',
'37457802-97a6-4303-be89-cf82b4059db1',
'46e4e2cb-1349-40c3-a72d-7b0b30ab5d14',
'5960fd93-013c-4636-8f6b-2e6b49b7e869',
'5e0a9ad5-81ed-4f83-91f6-a74be724bda7',
'5ec5c9a7-04c0-4655-9b63-9ca5a439e2f3',
'60b3644b-2493-4805-8204-90880cfac9c6',
'6e22ad53-d737-447f-9686-5041e122b4dc',
'74ff225f-2a79-4221-9b32-c6eb9bcadd61',
'7823499e-dbb6-42a9-a28f-22377de18a39',
'88c778e6-ede3-4397-af4c-375e1feac8ef',
'9019e9e4-8ea6-47ea-9279-98d10be107fc',
'998e402b-6f15-48dc-ae4d-2cd04460a3f3',
'9f01c7ef-753b-4dea-97d4-c199f84c2c74',
'a6837d68-80a6-4a26-a7c0-e84001dfc817',
'b319dc39-c499-423b-8e99-22e9a0caba6f',
'bdd3bed8-35d4-4aa8-84c2-85e2412d6cbb',
'c18b47e9-aa22-4f17-b12c-a3459ca4dd90',
'd2368c49-33b0-46b2-894d-b182d1c03bd4',
'd3d558e5-b0b1-4475-bb69-f20fa5c47f4f',
'd400c00f-9c18-4eb6-a70f-9c8caf8dddfe',
'd8d18115-c7b9-4e99-96a8-fd1bbfddf543',
'da17fcfe-7875-4aaf-983b-d750d71f36d2',
'f17dc7f3-c97a-41b4-a2f4-1a04a857ae8a'
);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('00590a7c-8e7b-45f4-8428-55532be07602', '10', 'menu', '1', 'role', 1630482462199, NULL, 'admin', NULL, NULL,
VALUES ('11849638-ccd8-4049-9761-bd4e1acfcd3e', '61', 'menu', '1', 'role', 1673261995502, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('060b5084-e937-4212-8e7d-5b27d28d3813', '619', 'menu', '1', 'role', 1672306656110, NULL, 'admin', NULL, NULL,
VALUES ('17a685de-e5af-4fc0-80e6-6eceff1e3ad3', '800', 'menu', '1', 'role', 1673262012225, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('06ba0edb-143d-4b51-a864-8cfcf2b5d71e', '1', 'menu', '1', 'role', 1630482426344, NULL, 'admin', NULL, NULL,
VALUES ('20f0010a-7694-49a0-a504-fca3ee276bea', '60', 'menu', '1', 'role', 1673261994954, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('0a08d6de-a7de-40d9-86c4-fffd4bf54e3a', '101', 'menu', '1', 'role', 1672306649767, NULL, 'admin', NULL, NULL,
VALUES ('4a6e2b26-8030-471f-91ed-a8f2b621b6ea', '619', 'menu', '1', 'role', 1673262000181, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('0c045d89-85ea-4676-8b5e-4b3dae5a734d', '700', 'menu', '1', 'role', 1664521306828, NULL, 'admin', NULL, NULL,
VALUES ('5d6828fa-8c5a-47d6-b8cc-f3457b06b33d', '1100', 'menu', '1', 'role', 1673262007415, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('0d89fc57-8ecf-444f-aec2-868a6fec7e73', '45', 'menu', '1', 'role', 1672806834919, NULL, 'admin', NULL, NULL,
VALUES ('66c7372f-02f4-4a18-9dbe-ece5a08972ad', '202', 'menu', '1', 'role', 1673262009466, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('1a18aa12-8daa-4f47-b5eb-999e473273df', '6', 'menu', '1', 'role', 1630482450994, NULL, 'admin', NULL, NULL,
VALUES ('6d189cdf-6d9f-451a-a96f-80a0ff696d5e', '101', 'menu', '1', 'role', 1673261986693, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('1bf39d8d-7fe9-4832-8df3-f74b21a69288', '4', 'menu', '1', 'role', 1630482450458, NULL, 'admin', NULL, NULL,
VALUES ('6fa42a15-5111-427c-8fa0-ef9c73500bea', '618', 'menu', '1', 'role', 1673261999994, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('2cada094-9543-4636-9b6f-b25c655399f0', '103', 'menu', '1', 'role', 1672306650137, NULL, 'admin', NULL, NULL,
VALUES ('a3b53606-c887-424a-b3d0-834eebdbbd6b', '64', 'menu', '1', 'role', 1673261995689, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('359771bb-95b8-40ad-a6c5-b5c39c93cb10', '24', 'menu', '1', 'role', 1630482459156, NULL, 'admin', NULL, NULL,
VALUES ('a57fed94-b2d3-445f-b965-859b7925d978', '63', 'menu', '1', 'role', 1673261995321, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('37457802-97a6-4303-be89-cf82b4059db1', '910', 'menu', '1', 'role', 1664521307265, NULL, 'admin', NULL, NULL,
VALUES ('af6ed70a-a6fa-4d29-9942-0c5d1b2f9139', '102', 'menu', '1', 'role', 1673261986901, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('46e4e2cb-1349-40c3-a72d-7b0b30ab5d14', '203', 'menu', '1', 'role', 1666840141866, NULL, 'admin', NULL, NULL,
VALUES ('afb93259-1344-4724-80b9-28833c6ceff7', '65', 'menu', '1', 'role', 1673261995141, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('5960fd93-013c-4636-8f6b-2e6b49b7e869', '5', 'menu', '1', 'role', 1630482450626, NULL, 'admin', NULL, NULL,
VALUES ('c47bbcb6-65c5-4b3f-b070-4482d04b5dd0', '45', 'menu', '1', 'role', 1673262003475, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('5e0a9ad5-81ed-4f83-91f6-a74be724bda7', '23', 'menu', '1', 'role', 1630482452131, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('5ec5c9a7-04c0-4655-9b63-9ca5a439e2f3', '18', 'menu', '1', 'role', 1630482451166, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('60b3644b-2493-4805-8204-90880cfac9c6', '8', 'menu', '1', 'role', 1630482460538, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('6e22ad53-d737-447f-9686-5041e122b4dc', '205', 'menu', '1', 'role', 1666840141468, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('74ff225f-2a79-4221-9b32-c6eb9bcadd61', '19', 'menu', '1', 'role', 1630482451329, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('7669702f-1261-44a4-a1a6-4adc05c7edcd', '800', 'menu', '1', 'role', 1672306666561, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('7823499e-dbb6-42a9-a28f-22377de18a39', '40', 'menu', '1', 'role', 1630482427369, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('831449e3-cb7c-46a5-9ba2-4ef18af21985', '202', 'menu', '1', 'role', 1672306664677, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('88c778e6-ede3-4397-af4c-375e1feac8ef', '41', 'menu', '1', 'role', 1630482452340, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('9019e9e4-8ea6-47ea-9279-98d10be107fc', '710', 'menu', '1', 'role', 1664521307460, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('9037724f-b34c-45ca-9e73-59c4e7e72703', '64', 'menu', '1', 'role', 1672306653656, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('998e402b-6f15-48dc-ae4d-2cd04460a3f3', '15', 'menu', '1', 'role', 1630482426695, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('9f01c7ef-753b-4dea-97d4-c199f84c2c74', '17', 'menu', '1', 'role', 1630482427049, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('a2ece474-34d1-4d48-b7ff-4fcc6196d32b', '65', 'menu', '1', 'role', 1672306653103, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('a6837d68-80a6-4a26-a7c0-e84001dfc817', '34', 'menu', '1', 'role', 1630482458991, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('b319dc39-c499-423b-8e99-22e9a0caba6f', '58', 'menu', '1', 'role', 1630482427545, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('bdd3bed8-35d4-4aa8-84c2-85e2412d6cbb', '2', 'menu', '1', 'role', 1630482426513, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('c18b47e9-aa22-4f17-b12c-a3459ca4dd90', '28', 'menu', '1', 'role', 1630482427208, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('d234696d-bf9e-4a58-9670-b2ff91884bbe', '102', 'menu', '1', 'role', 1672306649957, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('d2368c49-33b0-46b2-894d-b182d1c03bd4', '810', 'menu', '1', 'role', 1664521307050, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('d3d558e5-b0b1-4475-bb69-f20fa5c47f4f', '22', 'menu', '1', 'role', 1630482451962, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('d400c00f-9c18-4eb6-a70f-9c8caf8dddfe', '21', 'menu', '1', 'role', 1630482451749, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('d8d18115-c7b9-4e99-96a8-fd1bbfddf543', '16', 'menu', '1', 'role', 1630482426857, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('d956b3af-588d-477b-b404-20ded826593d', '401', 'menu', '1', 'role', 1672306682532, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('da17fcfe-7875-4aaf-983b-d750d71f36d2', '204', 'menu', '1', 'role', 1666840141658, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('daf90066-0299-4feb-b369-3fbb4a0e0821', '60', 'menu', '1', 'role', 1672306652922, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('e4d09516-79ef-41d1-8358-584224e07b73', '618', 'menu', '1', 'role', 1672306655930, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('e9f0837f-e717-49cd-9167-4bf503997a4a', '63', 'menu', '1', 'role', 1672306653282, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('ee9c43c9-f599-4d4e-bccc-c46f62119ed2', '61', 'menu', '1', 'role', 1672306653481, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('f17dc7f3-c97a-41b4-a2f4-1a04a857ae8a', '20', 'menu', '1', 'role', 1630482451497, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`,
`auth_details`, `auth_user`, `update_time`, `copy_from`, `copy_id`)
VALUES ('fbb065cc-a5c7-47d7-bffb-4eda35928f34', '1100', 'menu', '1', 'role', 1672306662727, NULL, 'admin', NULL, NULL,
VALUES ('e11aff50-a167-44e1-8221-53290ee98b68', '103', 'menu', '1', 'role', 1673261987096, NULL, 'admin', NULL, NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('69e22055-875c-11ed-bd88-0242ac130004', '0a08d6de-a7de-40d9-86c4-fffd4bf54e3a', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306650000, NULL, NULL, NULL);
VALUES ('bb055790-900c-11ed-bd88-0242ac130004', '6d189cdf-6d9f-451a-a96f-80a0ff696d5e', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673261987000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('69e22488-875c-11ed-bd88-0242ac130004', '0a08d6de-a7de-40d9-86c4-fffd4bf54e3a', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306650000, NULL, NULL, NULL);
VALUES ('bb055bc3-900c-11ed-bd88-0242ac130004', '6d189cdf-6d9f-451a-a96f-80a0ff696d5e', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673261987000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('69fdd519-875c-11ed-bd88-0242ac130004', 'd234696d-bf9e-4a58-9670-b2ff91884bbe', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306650000, NULL, NULL, NULL);
VALUES ('bb2529a4-900c-11ed-bd88-0242ac130004', 'af6ed70a-a6fa-4d29-9942-0c5d1b2f9139', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673261987000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('69fddc55-875c-11ed-bd88-0242ac130004', 'd234696d-bf9e-4a58-9670-b2ff91884bbe', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306650000, NULL, NULL, NULL);
VALUES ('bb252f3e-900c-11ed-bd88-0242ac130004', 'af6ed70a-a6fa-4d29-9942-0c5d1b2f9139', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673261987000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6a19b826-875c-11ed-bd88-0242ac130004', '2cada094-9543-4636-9b6f-b25c655399f0', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306650000, NULL, NULL, NULL);
VALUES ('bb42448f-900c-11ed-bd88-0242ac130004', 'e11aff50-a167-44e1-8221-53290ee98b68', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673261987000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6a19bb9b-875c-11ed-bd88-0242ac130004', '2cada094-9543-4636-9b6f-b25c655399f0', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306650000, NULL, NULL, NULL);
VALUES ('bb424988-900c-11ed-bd88-0242ac130004', 'e11aff50-a167-44e1-8221-53290ee98b68', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673261987000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6bc259de-875c-11ed-bd88-0242ac130004', 'daf90066-0299-4feb-b369-3fbb4a0e0821', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306653000, NULL, NULL, NULL);
VALUES ('bff08bb5-900c-11ed-bd88-0242ac130004', '20f0010a-7694-49a0-a504-fca3ee276bea', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6bc25c58-875c-11ed-bd88-0242ac130004', 'daf90066-0299-4feb-b369-3fbb4a0e0821', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306653000, NULL, NULL, NULL);
VALUES ('bff08ee8-900c-11ed-bd88-0242ac130004', '20f0010a-7694-49a0-a504-fca3ee276bea', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6bdd7239-875c-11ed-bd88-0242ac130004', 'a2ece474-34d1-4d48-b7ff-4fcc6196d32b', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306653000, NULL, NULL, NULL);
VALUES ('c00c77b2-900c-11ed-bd88-0242ac130004', 'afb93259-1344-4724-80b9-28833c6ceff7', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6bdd758b-875c-11ed-bd88-0242ac130004', 'a2ece474-34d1-4d48-b7ff-4fcc6196d32b', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306653000, NULL, NULL, NULL);
VALUES ('c00c79ec-900c-11ed-bd88-0242ac130004', 'afb93259-1344-4724-80b9-28833c6ceff7', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6bfc3df2-875c-11ed-bd88-0242ac130004', 'e9f0837f-e717-49cd-9167-4bf503997a4a', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306653000, NULL, NULL, NULL);
VALUES ('c0280a9e-900c-11ed-bd88-0242ac130004', 'a57fed94-b2d3-445f-b965-859b7925d978', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6bfc43ec-875c-11ed-bd88-0242ac130004', 'e9f0837f-e717-49cd-9167-4bf503997a4a', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306653000, NULL, NULL, NULL);
VALUES ('c0280d39-900c-11ed-bd88-0242ac130004', 'a57fed94-b2d3-445f-b965-859b7925d978', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6c16b8f8-875c-11ed-bd88-0242ac130004', 'ee9c43c9-f599-4d4e-bccc-c46f62119ed2', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306653000, NULL, NULL, NULL);
VALUES ('c0445adc-900c-11ed-bd88-0242ac130004', '11849638-ccd8-4049-9761-bd4e1acfcd3e', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6c16bd6d-875c-11ed-bd88-0242ac130004', 'ee9c43c9-f599-4d4e-bccc-c46f62119ed2', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306653000, NULL, NULL, NULL);
VALUES ('c0445d4f-900c-11ed-bd88-0242ac130004', '11849638-ccd8-4049-9761-bd4e1acfcd3e', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6c3217b4-875c-11ed-bd88-0242ac130004', '9037724f-b34c-45ca-9e73-59c4e7e72703', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306654000, NULL, NULL, NULL);
VALUES ('c060d271-900c-11ed-bd88-0242ac130004', 'a3b53606-c887-424a-b3d0-834eebdbbd6b', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6c321bdc-875c-11ed-bd88-0242ac130004', '9037724f-b34c-45ca-9e73-59c4e7e72703', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306654000, NULL, NULL, NULL);
VALUES ('c060d50d-900c-11ed-bd88-0242ac130004', 'a3b53606-c887-424a-b3d0-834eebdbbd6b', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673261995000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6d8d3c6f-875c-11ed-bd88-0242ac130004', 'e4d09516-79ef-41d1-8358-584224e07b73', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306656000, NULL, NULL, NULL);
VALUES ('c2f16fa3-900c-11ed-bd88-0242ac130004', '6fa42a15-5111-427c-8fa0-ef9c73500bea', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673262000000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6d8d4031-875c-11ed-bd88-0242ac130004', 'e4d09516-79ef-41d1-8358-584224e07b73', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306656000, NULL, NULL, NULL);
VALUES ('c2f1754e-900c-11ed-bd88-0242ac130004', '6fa42a15-5111-427c-8fa0-ef9c73500bea', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673262000000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6daa85f3-875c-11ed-bd88-0242ac130004', '060b5084-e937-4212-8e7d-5b27d28d3813', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306656000, NULL, NULL, NULL);
VALUES ('c30dbae6-900c-11ed-bd88-0242ac130004', '4a6e2b26-8030-471f-91ed-a8f2b621b6ea', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673262000000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('6daa899a-875c-11ed-bd88-0242ac130004', '060b5084-e937-4212-8e7d-5b27d28d3813', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306656000, NULL, NULL, NULL);
VALUES ('c30dc057-900c-11ed-bd88-0242ac130004', '4a6e2b26-8030-471f-91ed-a8f2b621b6ea', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673262000000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('7199b798-875c-11ed-bd88-0242ac130004', 'fbb065cc-a5c7-47d7-bffb-4eda35928f34', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306663000, NULL, NULL, NULL);
VALUES ('c504bf90-900c-11ed-bd88-0242ac130004', 'c47bbcb6-65c5-4b3f-b070-4482d04b5dd0', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673262003000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('7199bc41-875c-11ed-bd88-0242ac130004', 'fbb065cc-a5c7-47d7-bffb-4eda35928f34', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306663000, NULL, NULL, NULL);
VALUES ('c504c229-900c-11ed-bd88-0242ac130004', 'c47bbcb6-65c5-4b3f-b070-4482d04b5dd0', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673262003000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('72c4a847-875c-11ed-bd88-0242ac130004', '831449e3-cb7c-46a5-9ba2-4ef18af21985', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306665000, NULL, NULL, NULL);
VALUES ('c75e9179-900c-11ed-bd88-0242ac130004', '5d6828fa-8c5a-47d6-b8cc-f3457b06b33d', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673262007000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('72c4adde-875c-11ed-bd88-0242ac130004', '831449e3-cb7c-46a5-9ba2-4ef18af21985', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306665000, NULL, NULL, NULL);
VALUES ('c75e9478-900c-11ed-bd88-0242ac130004', '5d6828fa-8c5a-47d6-b8cc-f3457b06b33d', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673262007000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('73e2fd98-875c-11ed-bd88-0242ac130004', '7669702f-1261-44a4-a1a6-4adc05c7edcd', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306666000, NULL, NULL, NULL);
VALUES ('c895eaaf-900c-11ed-bd88-0242ac130004', '66c7372f-02f4-4a18-9dbe-ece5a08972ad', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673262009000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('73e301e6-875c-11ed-bd88-0242ac130004', '7669702f-1261-44a4-a1a6-4adc05c7edcd', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306666000, NULL, NULL, NULL);
VALUES ('c895efa5-900c-11ed-bd88-0242ac130004', '66c7372f-02f4-4a18-9dbe-ece5a08972ad', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673262009000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('7d68534e-875c-11ed-bd88-0242ac130004', 'd956b3af-588d-477b-b404-20ded826593d', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672306682000, NULL, NULL, NULL);
VALUES ('ca3baed4-900c-11ed-bd88-0242ac130004', '17a685de-e5af-4fc0-80e6-6eceff1e3ad3', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1673262012000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('7d6856d4-875c-11ed-bd88-0242ac130004', 'd956b3af-588d-477b-b404-20ded826593d', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672306682000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('b4fe2e52-55a4-11ed-bf84-0242ac130005', '6e22ad53-d737-447f-9686-5041e122b4dc', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1666840141000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('b4fe3215-55a4-11ed-bf84-0242ac130005', '6e22ad53-d737-447f-9686-5041e122b4dc', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1666840141000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('b51affbf-55a4-11ed-bf84-0242ac130005', 'da17fcfe-7875-4aaf-983b-d750d71f36d2', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1666840141000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('b51b0473-55a4-11ed-bf84-0242ac130005', 'da17fcfe-7875-4aaf-983b-d750d71f36d2', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1666840141000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('b53a1ad7-55a4-11ed-bf84-0242ac130005', '46e4e2cb-1349-40c3-a72d-7b0b30ab5d14', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1666840142000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('b53a1dfd-55a4-11ed-bf84-0242ac130005', '46e4e2cb-1349-40c3-a72d-7b0b30ab5d14', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1666840142000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('bfddec25-408d-11ed-8009-0242ac130005', '0c045d89-85ea-4676-8b5e-4b3dae5a734d', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1664521307000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('bfddf2e8-408d-11ed-8009-0242ac130005', '0c045d89-85ea-4676-8b5e-4b3dae5a734d', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1664521307000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('bfffbd09-408d-11ed-8009-0242ac130005', 'd2368c49-33b0-46b2-894d-b182d1c03bd4', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1664521307000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('bfffbf74-408d-11ed-8009-0242ac130005', 'd2368c49-33b0-46b2-894d-b182d1c03bd4', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1664521307000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('c01e6d09-408d-11ed-8009-0242ac130005', '37457802-97a6-4303-be89-cf82b4059db1', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1664521307000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('c01e6fb3-408d-11ed-8009-0242ac130005', '37457802-97a6-4303-be89-cf82b4059db1', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1664521307000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('c03c0af2-408d-11ed-8009-0242ac130005', '9019e9e4-8ea6-47ea-9279-98d10be107fc', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1664521307000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('c03c0dc3-408d-11ed-8009-0242ac130005', '9019e9e4-8ea6-47ea-9279-98d10be107fc', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1664521307000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cf3c570c-0af8-11ec-a2b0-0242ac130003', '06ba0edb-143d-4b51-a864-8cfcf2b5d71e', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482428000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cf3c59d1-0af8-11ec-a2b0-0242ac130003', '06ba0edb-143d-4b51-a864-8cfcf2b5d71e', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482428000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cf573296-0af8-11ec-a2b0-0242ac130003', 'bdd3bed8-35d4-4aa8-84c2-85e2412d6cbb', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482428000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cf57354a-0af8-11ec-a2b0-0242ac130003', 'bdd3bed8-35d4-4aa8-84c2-85e2412d6cbb', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482428000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cf705f77-0af8-11ec-a2b0-0242ac130003', '998e402b-6f15-48dc-ae4d-2cd04460a3f3', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cf7061d1-0af8-11ec-a2b0-0242ac130003', '998e402b-6f15-48dc-ae4d-2cd04460a3f3', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cf8b490d-0af8-11ec-a2b0-0242ac130003', 'd8d18115-c7b9-4e99-96a8-fd1bbfddf543', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cf8b4b35-0af8-11ec-a2b0-0242ac130003', 'd8d18115-c7b9-4e99-96a8-fd1bbfddf543', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cfa66a8d-0af8-11ec-a2b0-0242ac130003', '9f01c7ef-753b-4dea-97d4-c199f84c2c74', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cfa66ca4-0af8-11ec-a2b0-0242ac130003', '9f01c7ef-753b-4dea-97d4-c199f84c2c74', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cfbf0608-0af8-11ec-a2b0-0242ac130003', 'c18b47e9-aa22-4f17-b12c-a3459ca4dd90', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cfbf0839-0af8-11ec-a2b0-0242ac130003', 'c18b47e9-aa22-4f17-b12c-a3459ca4dd90', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cfd814bc-0af8-11ec-a2b0-0242ac130003', '7823499e-dbb6-42a9-a28f-22377de18a39', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cfd816d7-0af8-11ec-a2b0-0242ac130003', '7823499e-dbb6-42a9-a28f-22377de18a39', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cff28219-0af8-11ec-a2b0-0242ac130003', 'b319dc39-c499-423b-8e99-22e9a0caba6f', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('cff28507-0af8-11ec-a2b0-0242ac130003', 'b319dc39-c499-423b-8e99-22e9a0caba6f', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482429000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('dd9ba5c6-0af8-11ec-a2b0-0242ac130003', '1bf39d8d-7fe9-4832-8df3-f74b21a69288', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482452000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('dd9ba7e8-0af8-11ec-a2b0-0242ac130003', '1bf39d8d-7fe9-4832-8df3-f74b21a69288', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482452000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('ddb3094b-0af8-11ec-a2b0-0242ac130003', '5960fd93-013c-4636-8f6b-2e6b49b7e869', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482452000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('ddb30bd2-0af8-11ec-a2b0-0242ac130003', '5960fd93-013c-4636-8f6b-2e6b49b7e869', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482452000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('ddec6eab-0af8-11ec-a2b0-0242ac130003', '1a18aa12-8daa-4f47-b5eb-999e473273df', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482453000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('ddeccfa8-0af8-11ec-a2b0-0242ac130003', '1a18aa12-8daa-4f47-b5eb-999e473273df', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482453000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de0719cb-0af8-11ec-a2b0-0242ac130003', '5ec5c9a7-04c0-4655-9b63-9ca5a439e2f3', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482453000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de071bd9-0af8-11ec-a2b0-0242ac130003', '5ec5c9a7-04c0-4655-9b63-9ca5a439e2f3', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482453000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de202758-0af8-11ec-a2b0-0242ac130003', '74ff225f-2a79-4221-9b32-c6eb9bcadd61', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482453000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de202961-0af8-11ec-a2b0-0242ac130003', '74ff225f-2a79-4221-9b32-c6eb9bcadd61', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482453000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de42f5ec-0af8-11ec-a2b0-0242ac130003', 'f17dc7f3-c97a-41b4-a2f4-1a04a857ae8a', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482453000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de42f8b4-0af8-11ec-a2b0-0242ac130003', 'f17dc7f3-c97a-41b4-a2f4-1a04a857ae8a', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482453000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de65f6d9-0af8-11ec-a2b0-0242ac130003', 'd400c00f-9c18-4eb6-a70f-9c8caf8dddfe', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482454000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de65fa72-0af8-11ec-a2b0-0242ac130003', 'd400c00f-9c18-4eb6-a70f-9c8caf8dddfe', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482454000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de80ddc9-0af8-11ec-a2b0-0242ac130003', 'd3d558e5-b0b1-4475-bb69-f20fa5c47f4f', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482454000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de80e001-0af8-11ec-a2b0-0242ac130003', 'd3d558e5-b0b1-4475-bb69-f20fa5c47f4f', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482454000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de9f30cd-0af8-11ec-a2b0-0242ac130003', '5e0a9ad5-81ed-4f83-91f6-a74be724bda7', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482454000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('de9f32d3-0af8-11ec-a2b0-0242ac130003', '5e0a9ad5-81ed-4f83-91f6-a74be724bda7', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482454000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('dec15e1b-0af8-11ec-a2b0-0242ac130003', '88c778e6-ede3-4397-af4c-375e1feac8ef', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482454000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('dec16031-0af8-11ec-a2b0-0242ac130003', '88c778e6-ede3-4397-af4c-375e1feac8ef', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482454000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('e2b029b9-0af8-11ec-a2b0-0242ac130003', 'a6837d68-80a6-4a26-a7c0-e84001dfc817', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482461000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('e2b02bcb-0af8-11ec-a2b0-0242ac130003', 'a6837d68-80a6-4a26-a7c0-e84001dfc817', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482461000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('e2c9aba7-0af8-11ec-a2b0-0242ac130003', '359771bb-95b8-40ad-a6c5-b5c39c93cb10', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482461000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('e2c9adc8-0af8-11ec-a2b0-0242ac130003', '359771bb-95b8-40ad-a6c5-b5c39c93cb10', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482461000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('e39cb3fe-0af8-11ec-a2b0-0242ac130003', '60b3644b-2493-4805-8204-90880cfac9c6', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482462000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('e39cb619-0af8-11ec-a2b0-0242ac130003', '60b3644b-2493-4805-8204-90880cfac9c6', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482462000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('e49bef48-0af8-11ec-a2b0-0242ac130003', '00590a7c-8e7b-45f4-8428-55532be07602', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1630482464000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('e49bf17e-0af8-11ec-a2b0-0242ac130003', '00590a7c-8e7b-45f4-8428-55532be07602', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1630482464000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('ff6c996a-8be8-11ed-bd88-0242ac130004', '0d89fc57-8ecf-444f-aec2-868a6fec7e73', 'i18n_auth_grant', 15, 0,
'grant', '基础权限-授权', 'admin', 1672806835000, NULL, NULL, NULL);
INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`,
`privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`, `copy_from`,
`copy_id`)
VALUES ('ff6c9ec3-8be8-11ed-bd88-0242ac130004', '0d89fc57-8ecf-444f-aec2-868a6fec7e73', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1672806835000, NULL, NULL, NULL);
VALUES ('ca3bb3ff-900c-11ed-bd88-0242ac130004', '17a685de-e5af-4fc0-80e6-6eceff1e3ad3', 'i18n_auth_use', 1, 1, 'use',
'基础权限-使用', 'admin', 1673262012000, NULL, NULL, NULL);
UPDATE `sys_menu`
SET `permission` = 'app-template:read'

12
backend/src/main/resources/db/migration/V48__1.18.1.sql Normal file
View File

@ -0,0 +1,12 @@
UPDATE `my_plugin`
SET `version` = '1.18.1'
where `plugin_id` > 0 and `version` = '1.18.0';
ALTER TABLE `dataset_table_field`
CHANGE COLUMN `origin_name` `origin_name` LONGTEXT BINARY NOT NULL COMMENT '原始字段名' ;
ALTER TABLE `dataset_table_field`
CHANGE COLUMN `name` `name` LONGTEXT BINARY NOT NULL COMMENT '字段名名' ;
ALTER TABLE `datasource`
CHANGE COLUMN `name` `name` VARCHAR(50) BINARY NOT NULL COMMENT '数据源名称' ;

186
backend/src/main/resources/db/migration/V49__1.18.2.sql Normal file
View File

@ -0,0 +1,186 @@
UPDATE `my_plugin`
SET `version` = '1.18.2'
where `plugin_id` > 0
and `version` = '1.18.1';
UPDATE `sys_menu`
SET `pid` = 8
WHERE `menu_id` = 800;
INSERT INTO `sys_menu` (`menu_id`,
`pid`,
`sub_count`,
`type`,
`title`,
`name`,
`component`,
`menu_sort`,
`icon`,
`path`,
`i_frame`,
`cache`,
`hidden`,
`permission`,
`create_by`,
`update_by`,
`create_time`,
`update_time`)
VALUES (802,
0,
0,
2,
'视图导出',
NULL,
NULL,
999,
NULL,
NULL,
0,
0,
0,
'view:export',
NULL,
NULL,
NULL,
NULL);
INSERT INTO `sys_auth` (`id`,
`auth_source`,
`auth_source_type`,
`auth_target`,
`auth_target_type`,
`auth_time`,
`auth_details`,
`auth_user`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('dc3536c2-5193-4fcd-a875-926e3e712344',
'802',
'menu',
'2',
'role',
1673405964319,
NULL,
'admin',
NULL,
NULL,
NULL);
INSERT INTO `sys_auth` (`id`,
`auth_source`,
`auth_source_type`,
`auth_target`,
`auth_target_type`,
`auth_time`,
`auth_details`,
`auth_user`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('dc7fa546-9ac4-49a7-8af2-152be9fdde68',
'802',
'menu',
'1',
'role',
1673405986872,
NULL,
'admin',
NULL,
NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`,
`auth_id`,
`privilege_name`,
`privilege_type`,
`privilege_value`,
`privilege_extend`,
`remark`,
`create_user`,
`create_time`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('01c6367b-915c-11ed-bd88-0242ac130004',
'dc7fa546-9ac4-49a7-8af2-152be9fdde68',
'i18n_auth_grant',
15,
0,
'grant',
'基础权限-授权',
'admin',
1673405987000,
NULL,
NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`,
`auth_id`,
`privilege_name`,
`privilege_type`,
`privilege_value`,
`privilege_extend`,
`remark`,
`create_user`,
`create_time`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('01c63c6c-915c-11ed-bd88-0242ac130004',
'dc7fa546-9ac4-49a7-8af2-152be9fdde68',
'i18n_auth_use',
1,
1,
'use',
'基础权限-使用',
'admin',
1673405987000,
NULL,
NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`,
`auth_id`,
`privilege_name`,
`privilege_type`,
`privilege_value`,
`privilege_extend`,
`remark`,
`create_user`,
`create_time`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('f4559db9-915b-11ed-bd88-0242ac130004',
'dc3536c2-5193-4fcd-a875-926e3e712344',
'i18n_auth_grant',
15,
0,
'grant',
'基础权限-授权',
'admin',
1673405964000,
NULL,
NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`,
`auth_id`,
`privilege_name`,
`privilege_type`,
`privilege_value`,
`privilege_extend`,
`remark`,
`create_user`,
`create_time`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('f455a074-915b-11ed-bd88-0242ac130004',
'dc3536c2-5193-4fcd-a875-926e3e712344',
'i18n_auth_use',
1,
1,
'use',
'基础权限-使用',
'admin',
1673405964000,
NULL,
NULL,
NULL);

2
frontend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "dataease",
"version": "1.18.0",
"version": "1.18.2",
"description": "dataease front",
"private": true,
"scripts": {

2
frontend/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.18.0</version>
<version>1.18.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
frontend/src/api/system/appTemplate.js
View File

@ -56,3 +56,11 @@ export function nameCheck(data) {
method: 'post'
})
}
export function move(data) {
return request({
url: '/appTemplate/move',
data: data,
method: 'post'
})
}

13
frontend/src/components/canvas/components/editor/CanvasOptBar.vue
View File

@ -14,6 +14,7 @@
<el-button
v-if="!isNewBlank"
size="mini"
type="button"
@click="back2Last"
><span><svg-icon
style="width: 12px;height: 12px"
@ -53,6 +54,7 @@
<script>
import { mapState } from 'vuex'
import { isMobile } from '@/utils'
import bus from '@/utils/bus'
export default {
@ -103,7 +105,16 @@ export default {
bus.$emit('clear_panel_linkage', { viewId: 'all' })
},
back2Last() {
this.$router.back(-1)
if (isMobile()) {
let parentUrl = window.location.href
parentUrl = localStorage.getItem('beforeJumpUrl')
localStorage.removeItem('beforeJumpUrl')
window.location.href = parentUrl
window.location.reload()
return false
} else {
this.$router.back(-1)
}
},
exportPDF() {
this.$refs['widget-div'].style.display = ''

8
frontend/src/components/canvas/components/editor/EditBar.vue
View File

@ -278,16 +278,16 @@ export default {
return JSON.parse(this.chart.yaxis)
},
showMapLayerController() {
return this.curComponent.type === 'view' && this.terminal === 'pc' && this.curComponent.propValue.innerType === 'map' && this.yaxis.length > 1
return this.curComponent.type === 'view' && this.terminal === 'pc' && this.curComponent.propValue.innerType && this.curComponent.propValue.innerType === 'map' && this.yaxis.length > 1
},
detailsShow() {
return this.curComponent.type === 'view' && this.terminal === 'pc' && this.curComponent.propValue.innerType !== 'richTextView'
return this.curComponent.type === 'view' && this.terminal === 'pc' && this.curComponent.propValue.innerType && this.curComponent.propValue.innerType !== 'richTextView'
},
enlargeShow() {
return this.curComponent.type === 'view' && this.curComponent.propValue.innerType !== 'richTextView' && !this.curComponent.propValue.innerType.includes('table')
return this.curComponent.type === 'view' && this.curComponent.propValue.innerType && this.curComponent.propValue.innerType !== 'richTextView' && !this.curComponent.propValue.innerType.includes('table')
},
selectFieldShow() {
return this.activeModel === 'edit' && this.curComponent.type === 'view' && this.curComponent.propValue.innerType === 'richTextView' && this.curComponent.editing
return this.activeModel === 'edit' && this.curComponent.type === 'view' && this.curComponent.propValue.innerType && this.curComponent.propValue.innerType === 'richTextView' && this.curComponent.editing
},
curComponentTypes() {
const types = []

24
frontend/src/components/canvas/components/editor/FieldsList.vue
View File

@ -1,5 +1,5 @@
<template>
<div @mousedown="fieldsAreaDown">
<div @mousedown="fieldsAreaDown" class="field-main">
<el-button
v-for="(field) in fields"
:key="field.id"
@ -29,15 +29,10 @@ export default {
}
},
data() {
return {
}
},
computed: {
},
watch: {
return {}
},
computed: {},
watch: {},
mounted() {
},
methods: {
@ -53,11 +48,18 @@ export default {
</script>
<style scoped>
.field-area{
.field-main {
width: 183px;
max-height: 300px;
overflow-x: hidden;
overflow-y: auto;
}
.field-area {
width: 174px;
margin: 4px 0 0 0;
text-align: left;
margin-left: 0px!important;
margin-left: 0px !important;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;

1
frontend/src/components/canvas/components/editor/Preview.vue
View File

@ -121,6 +121,7 @@
</el-button>
<el-button
v-if="showChartInfoType==='details'"
v-permission="['view:export']"
size="mini"
@click="exportExcel"
>

13
frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -32,7 +32,7 @@
v-if="chart.isPlugin"
:ref="element.propValue.id"
:component-name="chart.type + '-view'"
:obj="{chart, trackMenu, searchCount, terminalType: scaleCoefficientType}"
:obj="{active, chart, trackMenu, searchCount, terminalType: scaleCoefficientType}"
:chart="chart"
:track-menu="trackMenu"
:search-count="searchCount"
@ -66,6 +66,7 @@
:terminal-type="scaleCoefficientType"
:scale="scale"
:theme-style="element.commonBackground"
:active="this.active"
@onChartClick="chartClick"
@onJumpClick="jumpClick"
/>
@ -149,6 +150,7 @@
</el-button>
<el-button
v-if="showChartInfoType==='details'"
v-permission="['view:export']"
size="mini"
@click="exportExcel"
>
@ -475,7 +477,9 @@ export default {
watch: {
'innerPadding': {
handler: function(val1, val2) {
this.resizeChart()
if (val1 !== val2) {
this.resizeChart()
}
},
deep: true
},
@ -575,7 +579,7 @@ export default {
this.$refs[this.element.propValue.id].chartResize()
}
},
//编辑状态下 不启动刷新
// 编辑状态下 不启动刷新
buildInnerRefreshTimer(refreshViewEnable = false, refreshUnit = 'minute', refreshTime = 5) {
if (this.editMode === 'preview' && !this.innerRefreshTimer && refreshViewEnable) {
this.innerRefreshTimer && clearInterval(this.innerRefreshTimer)
@ -972,6 +976,8 @@ export default {
// 判断是否有公共链接ID
if (jumpInfo.publicJumpId) {
const url = '/link/' + jumpInfo.publicJumpId
const currentUrl = window.location.href
localStorage.setItem('beforeJumpUrl', currentUrl)
this.windowsJump(url, jumpInfo.jumpType)
} else {
this.$message({
@ -1268,6 +1274,7 @@ export default {
width: 100%;
height: 100%;
overflow: hidden;
position: relative;
}
.chart-class {

4
frontend/src/components/canvas/store/copy.js
View File

@ -115,8 +115,8 @@ export default {
// 仪表板复制的组件默认不在移动端部署中mobileSelected = false
data.mobileSelected = false
if (!state.curComponent.auxiliaryMatrix) {
data.style.top += 20
data.style.left += 20
data.style.top = Number(data.style.top) + 20
data.style.left = Number(data.style.left) + 20
}
data.id = generateID()
// 如果是用户视图 测先进行底层复制

11
frontend/src/lang/en.js
View File

@ -1366,6 +1366,7 @@ export default {
chart_table_pivot: 'Pivot Table',
table_pivot_row: 'Data Row',
field_error_tips: 'This field is changed(Include dimension、quota，field type，deleted),please edit again.',
mark_field_error: 'The current field does not exist, please select again',
table_border_color: 'Border Color',
table_header_align: 'Header Align',
table_item_align: 'Body Align',
@ -2425,7 +2426,9 @@ export default {
standard: 'Standard',
enterprise: 'Enterprise',
support: 'Get technical support',
update_success: 'Update Success'
update_success: 'Update Success',
serial_no: 'Serial Number',
remark: 'Remark'
},
template: {
exit_same_template_check: 'The Same Name Exists In Now Class. Do You Want To Override It?',
@ -2786,6 +2789,8 @@ export default {
'I18N_USER_TEMPLATE_ERROR': 'Template file error',
'i18n_max_user_import_size': 'File size exceeds 10M',
app_template: {
move: 'Move',
move_item: 'Move App',
datasource_new: 'New',
datasource_history: 'Multiplexing',
datasource_from: 'Datasource From',
@ -2836,8 +2841,8 @@ export default {
watermark_color: 'Watermark Color',
watermark_font_size: 'Watermark Fontsize',
watermark_space: 'Watermark Space',
horizontal: 'Horizontal',
vertical: 'Vertical',
horizontal: 'Horizontal Space',
vertical: 'Vertical Space',
reset: 'Reset',
preview: 'Preview',
save: 'Save'

11
frontend/src/lang/tw.js
View File

@ -1365,6 +1365,7 @@ export default {
chart_table_pivot: '透視表',
table_pivot_row: '數據行',
field_error_tips: '該字段所對應的數據集原始字段發生變更（包括維度、指標，字段類型，字段被刪除等），建議重新編輯',
mark_field_error: '數據集變更，當前字段不存在，請重新選擇',
table_border_color: '邊框顏色',
table_header_align: '表頭對齊方式',
table_item_align: '表格對齊方式',
@ -2419,7 +2420,9 @@ export default {
standard: '標準版',
enterprise: '企業版',
support: '獲取技術支持',
update_success: '更新成功'
update_success: '更新成功',
serial_no: '序列號',
remark: '備註'
},
template: {
exit_same_template_check: '當前分類存在相同名稱模闆，是否覆蓋？',
@ -2780,6 +2783,8 @@ export default {
'I18N_USER_TEMPLATE_ERROR': '模版錯誤',
'i18n_max_user_import_size': '文件最大不能超過10M',
app_template: {
move: '移動',
move_item: '移動應用',
datasource_new: '新建',
datasource_history: '復用',
datasource_from: '數據來源',
@ -2829,8 +2834,8 @@ export default {
watermark_color: '水印顏色',
watermark_font_size: '水印字號',
watermark_space: '水印間距',
horizontal: '橫向',
vertical: '縱向',
horizontal: '橫向間距',
vertical: '縱向間距',
reset: '重置',
preview: '預覽',
save: '保存'

11
frontend/src/lang/zh.js
View File

@ -1364,6 +1364,7 @@ export default {
chart_table_pivot: '透视表',
table_pivot_row: '数据行',
field_error_tips: '该字段所对应的数据集原始字段发生变更（包括维度、指标，字段类型，字段被删除等），建议重新编辑',
mark_field_error: '数据集变更，当前字段不存在，请重新选择',
table_border_color: '边框颜色',
table_header_align: '表头对齐方式',
table_item_align: '表格对齐方式',
@ -2419,7 +2420,9 @@ export default {
standard: '标准版',
enterprise: '企业版',
support: '获取技术支持',
update_success: '更新成功'
update_success: '更新成功',
serial_no: '序列号',
remark: '备注'
},
template: {
exit_same_template_check: '当前分类存在相同名称模板，是否覆盖？',
@ -2780,6 +2783,8 @@ export default {
'I18N_USER_TEMPLATE_ERROR': '模版错误',
'i18n_max_user_import_size': '文件最大不能超过10M',
app_template: {
move: '移动',
move_item: '移动应用',
datasource_new: '新建',
datasource_history: '复用',
datasource_from: '数据来源',
@ -2829,8 +2834,8 @@ export default {
watermark_color: '水印颜色',
watermark_font_size: '水印字号',
watermark_space: '水印间距',
horizontal: '横向',
vertical: '纵向',
horizontal: '横向间距',
vertical: '纵向间距',
reset: '重置',
preview: '预览',
save: '保存'

24
frontend/src/views/chart/chart/chart.js
View File

@ -507,12 +507,14 @@ export const BASE_BAR = {
},
{
type: 'inside',
disabled: true,
xAxisIndex: [0],
start: 0,
end: 100
},
{
type: 'inside',
disabled: true,
yAxisIndex: [0],
start: 0,
end: 100
@ -563,12 +565,14 @@ export const HORIZONTAL_BAR = {
},
{
type: 'inside',
disabled: true,
xAxisIndex: [0],
start: 0,
end: 100
},
{
type: 'inside',
disabled: true,
yAxisIndex: [0],
start: 0,
end: 100
@ -621,12 +625,14 @@ export const BASE_LINE = {
},
{
type: 'inside',
disabled: true,
xAxisIndex: [0],
start: 0,
end: 100
},
{
type: 'inside',
disabled: true,
yAxisIndex: [0],
start: 0,
end: 100
@ -903,14 +909,10 @@ export const BASE_MAP = {
},
geo: {
map: 'MAP',
roam: true,
nameMap: {
},
roam: false,
nameMap: {},
itemStyle: {
normal: {
},
normal: {},
emphasis: {
label: {
show: false
@ -926,9 +928,7 @@ export const BASE_MAP = {
roam: true,
data: [],
itemStyle: {
normal: {
},
normal: {},
emphasis: {
label: {
show: false
@ -984,12 +984,14 @@ export const BASE_SCATTER = {
},
{
type: 'inside',
disabled: true,
xAxisIndex: [0],
start: 0,
end: 100
},
{
type: 'inside',
disabled: true,
yAxisIndex: [0],
start: 0,
end: 100
@ -1079,12 +1081,14 @@ export const BASE_MIX = {
},
{
type: 'inside',
disabled: true,
xAxisIndex: [0],
start: 0,
end: 100
},
{
type: 'inside',
disabled: true,
yAxisIndex: [0],
start: 0,
end: 100

4
frontend/src/views/chart/chart/common/common.js
View File

@ -352,7 +352,7 @@ export function seniorCfg(chart_option, chart) {
label: {
show: true,
color: ele.color,
fontSize: 10,
fontSize: ele.fontSize ? parseInt(ele.fontSize) : 10,
position: xAxis.position === 'bottom' ? 'insideStartTop' : 'insideEndTop',
formatter: function(param) {
return ele.name + ' : ' + valueFormatter(param.value, axisFormatterCfg)
@ -374,7 +374,7 @@ export function seniorCfg(chart_option, chart) {
label: {
show: true,
color: ele.color,
fontSize: 10,
fontSize: ele.fontSize ? parseInt(ele.fontSize) : 10,
position: yAxis.position === 'left' ? 'insideStartTop' : 'insideEndTop',
formatter: function(param) {
return ele.name + ' : ' + valueFormatter(param.value, axisFormatterCfg)

4
frontend/src/views/chart/chart/common/common_antv.js
View File

@ -850,7 +850,7 @@ export function getAnalyse(chart) {
style: {
textBaseline: 'bottom',
fill: ele.color,
fontSize: 10
fontSize: ele.fontSize ? parseInt(ele.fontSize) : 10
}
})
} else {
@ -864,7 +864,7 @@ export function getAnalyse(chart) {
style: {
textBaseline: 'bottom',
fill: ele.color,
fontSize: 10
fontSize: ele.fontSize ? parseInt(ele.fontSize) : 10
}
})
}

2
frontend/src/views/chart/chart/map/map.js
View File

@ -73,7 +73,7 @@ export function baseMapOption(chart_option, chart, themeStyle, curAreaCode, seri
tooltip.formatter = params => {
const a = params.seriesName
const b = params.name
const c = params.value ? params.value : ''
const c = params.value ?? ''
return text.replace(new RegExp('{a}', 'g'), a).replace(new RegExp('{b}', 'g'), b).replace(new RegExp('{c}', 'g'), c)
}
chart_option.tooltip = tooltip

63
frontend/src/views/chart/components/ChartComponent.vue
View File

@ -65,6 +65,11 @@ export default {
MapController
},
props: {
active: {
type: Boolean,
required: false,
default: false
},
chart: {
type: Object,
required: true
@ -121,7 +126,18 @@ export default {
buttonTextColor: null,
loading: true,
showSuspension: true,
currentSeriesId: null
currentSeriesId: null,
haveScrollType: [
'map',
'chart-mix',
'bar',
'bar-stack',
'bar-horizontal',
'bar-stack-horizontal',
'line',
'line-stack',
'scatter'
]
}
},
@ -134,6 +150,11 @@ export default {
])
},
watch: {
active: {
handler(newVal, oldVla) {
this.scrollStatusChange(newVal)
}
},
currentSeriesId(value, old) {
if (value !== old) {
this.preDraw()
@ -173,6 +194,31 @@ export default {
this.loadThemeStyle()
},
methods: {
scrollStatusChange() {
if (this.haveScrollType.includes(this.chart.type)) {
const opt = this.myChart.getOption()
this.adaptorOpt(opt)
this.myChart.setOption(opt)
}
},
adaptorOpt(opt) {
const disabledStatus = !this.active
if (opt.dataZoom) {
opt.dataZoom.forEach(function(s) {
if (s.type === 'inside') {
s.disabled = disabledStatus
}
})
}
//地图
if (opt.geo) {
if (opt.geo instanceof Array) {
opt.geo[0].roam = this.active
} else {
opt.geo.roam = this.active
}
}
},
changeSeriesId(param) {
const { id, seriesId } = param
if (id !== this.chart.id) {
@ -332,12 +378,14 @@ export default {
})
return
}
if (this.canvasStyleData.panel.themeColor === 'dark') {
chart_option.legend['pageIconColor'] = '#ffffff'
chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
} else {
chart_option.legend['pageIconColor'] = '#000000'
chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
if (chart_option.legend) {
if (this.canvasStyleData.panel.themeColor === 'dark') {
chart_option.legend['pageIconColor'] = '#ffffff'
chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
} else {
chart_option.legend['pageIconColor'] = '#000000'
chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
}
}
this.myEcharts(chart_option)
this.$nextTick(() => (this.linkageActive()))
@ -389,6 +437,7 @@ export default {
}
},
myEcharts(option) {
this.adaptorOpt(option)
// 指定图表的配置项和数据
const chart = this.myChart
this.setBackGroundBorder()

46
frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
View File

@ -6,11 +6,13 @@
:model="markForm"
label-width="40px"
size="mini"
:rules="rules"
>
<el-form-item
class="form-item"
:label="$t('chart.mark_field')"
prop="fieldId"
>
<el-select
v-model="markForm.fieldId"
@ -174,7 +176,11 @@ export default {
return {
markForm: JSON.parse(JSON.stringify(DEFAULT_MARK)),
values: null,
rules: {
fieldId: [
{ validator: this.fieldIdValidator, trigger: 'blur' }
]
},
calcOptions: [{
value: 'eq',
label: '等于',
@ -287,6 +293,20 @@ export default {
this.loadSvg()
},
methods: {
fieldIdValidator(rule, value, callback) {
if (!value) {
return callback()
}
const field = this.getField(value)
if (!field) {
return callback(new Error(this.$t('chart.mark_field_error')))
}
const tagType = getItemType(this.dimensionData, this.quotaData, field)
if (tagType === 'danger') {
return callback(new Error(this.$t('chart.mark_field_error')))
}
callback()
},
setConditionColor(index, color) {
this.markForm.conditions[index].color = color
this.changeMarkAttr('conditions')
@ -317,10 +337,7 @@ export default {
if (customAttr.mark) {
this.markForm = customAttr.mark
if (this.markForm.fieldId) {
const valid = this.fieldOptions.some(group => group.options.some(item => item.id === this.markForm.fieldId))
if (!valid) {
this.markForm.fieldId = null
}
this.getItemTagType()
}
}
}
@ -375,22 +392,9 @@ export default {
this.changeMarkAttr('fieldId')
},
getItemTagType() {
if (this.markForm.fieldId) {
const field = this.getField(this.markForm.fieldId)
if (!field) {
this.changeFields()
this.markForm.fieldId = null
return
}
const tagType = getItemType(this.dimensionData, this.quotaData, field)
if (tagType === 'danger') {
this.changeFields()
this.markForm.fieldId = null
}
} else {
this.changeFields()
this.markForm.fieldId = null
}
this.$refs['markForm'].validate((valid) => {
console.log(valid)
})
}
}
}

6
frontend/src/views/chart/components/map/MapController.vue
View File

@ -8,7 +8,7 @@
size="mini"
icon="el-icon-plus"
circle
@click="callParent('roamMap', true)"
@click.stop="callParent('roamMap', true)"
/>
</div>
@ -18,7 +18,7 @@
size="mini"
icon="el-icon-refresh"
circle
@click="callParent('resetZoom')"
@click.stop="callParent('resetZoom')"
/>
</div>
@ -28,7 +28,7 @@
size="mini"
icon="el-icon-minus"
circle
@click="callParent('roamMap', false)"
@click.stop="callParent('roamMap', false)"
/>
</div>

5
frontend/src/views/chart/components/senior/AssistLine.vue
View File

@ -121,6 +121,11 @@ export default {
senior = JSON.parse(chart.senior)
}
if (senior.assistLine) {
for (let i = 0; i < senior.assistLine.length; i++) {
if (!senior.assistLine[i].fontSize) {
senior.assistLine[i].fontSize = '10'
}
}
this.assistLine = senior.assistLine
} else {
this.assistLine = []

42
frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue
View File

@ -41,7 +41,7 @@
</el-col>
<el-col
v-if="item.field === '0'"
:span="8"
:span="6"
>
<el-input
v-model="item.value"
@ -54,7 +54,7 @@
</el-col>
<el-col
v-if="item.field === '1'"
:span="8"
:span="6"
>
<el-select
v-model="item.fieldId"
@ -119,7 +119,24 @@
/>
</el-select>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-select
v-model="item.fontSize"
size="mini"
class="select-item"
style="margin-left: 10px;"
:placeholder="$t('chart.text_fontsize')"
@change="changeAssistLine"
>
<el-option
v-for="option in fontSize"
:key="option.value"
:label="option.name"
:value="option.value"
/>
</el-select>
</el-col>
<el-col :span="3">
<el-select
v-model="item.lineType"
size="mini"
@ -135,7 +152,7 @@
</el-select>
</el-col>
<el-col
:span="2"
:span="1"
style="text-align: center;"
>
<el-color-picker
@ -145,7 +162,7 @@
@change="changeAssistLine"
/>
</el-col>
<el-col :span="2">
<el-col :span="1">
<el-button
type="text"
icon="el-icon-delete"
@ -186,7 +203,8 @@ export default {
value: '0',
lineType: 'solid',
color: '#ff0000',
curField: {}
curField: {},
fontSize: '10'
},
fieldOptions: [
{ label: this.$t('chart.field_fixed'), value: '0' },
@ -198,7 +216,8 @@ export default {
{ label: this.$t('chart.line_type_dotted'), value: 'dotted' }
],
predefineColors: COLOR_PANEL,
quotaData: []
quotaData: [],
fontSize: []
}
},
watch: {
@ -216,6 +235,15 @@ export default {
},
init() {
this.lineArr = JSON.parse(JSON.stringify(this.line))
const arr = []
for (let i = 10; i <= 60; i = i + 2) {
arr.push({
name: i + '',
value: i + ''
})
}
this.fontSize = arr
},
addLine() {
const obj = { ...this.lineObj,

22
frontend/src/views/chart/view/PositionAdjust.vue
View File

@ -16,7 +16,6 @@
:min="0"
:max="maxTop"
class="hide-icon-number"
@change="topOnChange"
>
<template slot="append">px</template>
</el-input>
@ -33,7 +32,6 @@
:min="0"
:max="maxLeft"
class="hide-icon-number"
@change="leftOnChange"
>
<template slot="append">px</template>
</el-input>
@ -50,7 +48,6 @@
:max="maxWidth"
type="number"
class="hide-icon-number"
@change="widthOnChange"
>
<template slot="append">px</template>
</el-input>
@ -59,7 +56,6 @@
:label="$t('panel.space_height')"
:min="0"
class="form-item"
prop="marginTop"
>
<el-input
v-model="styleInfo.height"
@ -67,7 +63,6 @@
:min="0"
:max="maxHeight"
class="hide-icon-number"
@change="heightOnChange"
>
<template slot="append">px</template>
</el-input>
@ -87,7 +82,7 @@ export default {
data() {
return {
maxHeight: 2000,
maxTop: 40000
maxTop: 20000
}
},
computed: {
@ -104,7 +99,20 @@ export default {
'componentGap'
])
},
watch: {},
watch: {
'styleInfo.top': function() {
this.topOnChange()
},
'styleInfo.left': function() {
this.leftOnChange()
},
'styleInfo.width': function() {
this.widthOnChange()
},
'styleInfo.height': function() {
this.heightOnChange()
}
},
mounted() {
},
methods: {

4
frontend/src/views/dataset/group/Group.vue
View File

@ -923,7 +923,7 @@ export default {
}
}
const { queryType = 'dataset', id } = data
const { queryType = 'dataset', id, name } = data
if (checkPermission(['relationship:read'])) {
let hasSubRelation = false
await getDatasetRelationship(id).then((res) => {
@ -938,7 +938,7 @@ export default {
options.templateDel = msgContent
options.confirmButtonText = undefined
options.type = 'danger'
options.linkTo = this.linkTo.bind(this, { queryType, id })
options.linkTo = this.linkTo.bind(this, { queryType, id, name })
this.withLink(options, this.$t('commons.delete'))
return
}

37
frontend/src/views/panel/appTemplate/AppTemplateContent.vue
View File

@ -77,7 +77,7 @@
:label="dialogTitleLabel"
prop="name"
>
<el-input v-model="templateEditForm.name" />
<el-input v-model="templateEditForm.name"/>
</el-form-item>
<el-form-item
:label="$t('app_template.app_group_icon')"
@ -95,7 +95,7 @@
:http-request="upload"
:file-list="fileList"
>
<i class="el-icon-plus" />
<i class="el-icon-plus"/>
</el-upload>
<el-dialog
top="25vh"
@ -147,6 +147,23 @@
@closeEditTemplateDialog="closeEditTemplateDialog"
/>
</el-dialog>
<!--导入templatedialog-->
<el-dialog
:title="$t('app_template.move_item') "
:visible.sync="moveItemDialogShow"
:show-close="true"
class="de-dialog-form"
width="300px"
>
<template-move-list
:template-list="templateList"
:source-template-info="currentMoveItem"
@closeDialog="moveItemDialogShow=false"
@templateMoveClose="templateMoveClose"
>
</template-move-list>
</el-dialog>
</div>
</template>
@ -159,10 +176,11 @@ import elementResizeDetectorMaker from 'element-resize-detector'
import msgCfm from '@/components/msgCfm/index'
import { uploadFileResult } from '@/api/staticResource/staticResource'
import { imgUrlTrans } from '@/components/canvas/utils/utils'
import TemplateMoveList from '@/views/panel/appTemplate/component/TemplateMoveList'
export default {
name: 'AppTemplateContent',
components: { TemplateList, TemplateItem, TemplateImport },
components: { TemplateMoveList, TemplateList, TemplateItem, TemplateImport },
mixins: [msgCfm],
props: {
showPosition: {
@ -173,6 +191,8 @@ export default {
},
data() {
return {
moveItemDialogShow: false,
currentMoveItem: {},
templateOptType: 'add',
currentAppTemplateInfo: null,
fileList: [],
@ -302,6 +322,9 @@ export default {
case 'update':
this.updateAppTemplate(data)
break
case 'move':
this.moveTo(data)
break
default:
break
}
@ -312,6 +335,10 @@ export default {
this.currentAppTemplateInfo = data
this.templateDialog.pid = data.pid
},
moveTo(data) {
this.moveItemDialogShow = true
this.currentMoveItem = data
},
templateDeleteConfirm(template) {
const options = {
title: '是否卸载当前应用？',
@ -349,6 +376,10 @@ export default {
})
}
},
templateMoveClose() {
this.moveItemDialogShow = false
this.showCurrentTemplate(this.currentTemplateId, this.currentTemplateLabel)
},
showTemplateEditDialog(type, templateInfo) {
this.templateEditForm = null
this.formType = type

13
frontend/src/views/panel/appTemplate/component/TemplateItem.vue
View File

@ -29,20 +29,26 @@
trigger="click"
@command="handleCommand"
>
<i class="el-icon-more" />
<i class="el-icon-more"/>
<el-dropdown-menu
slot="dropdown"
class="de-card-dropdown"
>
<slot>
<el-dropdown-item command="update">
<i class="el-icon-edit" />
<i class="el-icon-edit"/>
{{ $t('commons.update') }}
</el-dropdown-item>
<el-dropdown-item command="delete">
<i class="el-icon-delete" />
<i class="el-icon-delete"/>
{{ $t('commons.uninstall') }}
</el-dropdown-item>
<el-dropdown-item
icon="el-icon-right"
command="move"
>
{{ $t('app_template.move') }}
</el-dropdown-item>
</slot>
</el-dropdown-menu>
</el-dropdown>
@ -84,6 +90,7 @@
</template>
<script>
import { imgUrlTrans } from '@/components/canvas/utils/utils'
export default {
props: {
showPosition: {

229
frontend/src/views/panel/appTemplate/component/TemplateMoveList.vue Normal file
View File

@ -0,0 +1,229 @@
<template xmlns:el-col="http://www.w3.org/1999/html">
<div class="de-template-list">
<el-input
v-model="templateFilterText"
:placeholder="$t('system_parameter_setting.search_keywords')"
size="small"
class="de-input-search"
clearable
>
<svg-icon
slot="prefix"
icon-class="de-search"
/>
</el-input>
<el-empty
v-if="!templateListComputed.length && templateFilterText === ''"
:image="noneImg"
:description="$t('components.no_classification')"
/>
<el-empty
v-if="!templateListComputed.length && templateFilterText !== ''"
:image="nothingImg"
:description="$t('components.relevant_content_found')"
/>
<ul>
<li
v-for="ele in templateListComputed"
:key="ele.name"
:class="[{ select: activeTemplate === ele.id }]"
@click="nodeClick(ele)"
>
<img
:src="iconImgRul(ele.icon)"
style="margin-right: 8px;border-radius: 4px"
width="24"
height="24"
>
<span>{{ ele.name }}</span>
</li>
</ul>
<el-row class="de-root-class">
<deBtn
secondary
@click="cancel()"
>{{
$t('commons.cancel')
}}
</deBtn>
<deBtn
type="primary"
@click="save()"
:disabled="!activeTemplate"
>{{
$t('commons.confirm')
}}
</deBtn>
</el-row>
</div>
</template>
<script>
import msgCfm from '@/components/msgCfm/index'
import { imgUrlTrans } from '@/components/canvas/utils/utils'
import { move } from '@/api/system/appTemplate'
export default {
name: 'TemplateMoveList',
components: {},
mixins: [msgCfm],
props: {
sourceTemplateInfo: {
type: Object
},
templateList: {
type: Array,
default: function() {
return []
}
}
},
data() {
return {
templateFilterText: '',
activeTemplate: '',
noneImg: require('@/assets/None.png'),
nothingImg: require('@/assets/nothing.png')
}
},
computed: {
templateListComputed() {
if (!this.templateFilterText) {
return this.templateList.filter((ele) =>
ele.id !== this.sourceTemplateInfo.pid
)
}
return this.templateList.filter((ele) =>
ele.name.includes(this.templateFilterText) && ele.id !== this.sourceTemplateInfo.pid
)
}
},
methods: {
iconImgRul(iconUrl) {
return imgUrlTrans(iconUrl)
},
cancel() {
this.$emit('closeDialog')
},
save() {
const request = {
id: this.sourceTemplateInfo.id,
pid: this.activeTemplate,
name: this.sourceTemplateInfo.name
}
move(request).then((response) => {
this.$emit('templateMoveClose')
})
},
showPositionCheck(requiredPosition) {
return this.showPosition === requiredPosition
},
nodeClick({ id, name }) {
this.activeTemplate = id
}
}
}
</script>
<style scoped lang="scss">
.de-template-list {
height: 380px;
overflow-y: hidden;
position: relative;
ul {
margin: 16px 0 20px 0;
padding: 0;
overflow-y: auto;
max-height: calc(100% - 90px);
}
li {
list-style: none;
width: 100%;
box-sizing: border-box;
height: 40px;
padding: 0 30px 0 12px;
display: flex;
align-items: center;
border-radius: 4px;
color: var(--deTextPrimary, #1f2329);
font-family: "PingFang SC";
font-style: normal;
font-weight: 500;
font-size: 14px;
cursor: pointer;
position: relative;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.folder {
color: #8f959e;
margin-right: 9px;
}
.more {
position: absolute;
top: 50%;
right: 10px;
transform: translateY(-50%);
display: none;
.el-icon-more {
width: 24px;
height: 24px;
line-height: 24px;
text-align: center;
font-size: 12px;
color: #646a73;
cursor: pointer;
}
.el-icon-more:hover {
background: rgba(31, 35, 41, 0.1);
border-radius: 4px;
}
.el-icon-more:active {
background: rgba(31, 35, 41, 0.2);
border-radius: 4px;
}
}
&:hover {
background: rgba(31, 35, 41, 0.1);
.more {
display: block;
}
}
}
li.select {
background: var(--deWhiteHover, #3370ff);
color: var(--TextActive, #f4f4f5);
}
.de-btn-fix {
position: absolute;
bottom: 0;
left: 0;
}
}
.de-template-dropdown {
margin-top: 0 !important;
.popper__arrow {
display: none !important;
}
}
.de-root-class {
bottom: 0;
width: 100%;
position: absolute;
text-align: right;
}
</style>

2
frontend/src/views/panel/filter/FilterDialog.vue
View File

@ -275,7 +275,7 @@
:control-attrs="myAttrs"
:child-views="childViews"
:dataset-params="datasetParams"
:activeName="activeName"
:active-name="activeName"
/>
<filter-foot :element="currentElement" />

22
frontend/src/views/panel/filter/filterMain/FilterControl.vue
View File

@ -117,7 +117,7 @@
@change="checkedViewsChange"
>
<el-checkbox
v-for="(item ) in childViews.viewInfos"
v-for="(item ) in curTableViews"
:key="item.id"
:label="item.id"
class="de-checkbox"
@ -280,10 +280,8 @@ export default {
datasetParams: {
type: Array,
default: () => []
},
activeName:{
}
},
data() {
return {
@ -310,6 +308,12 @@ export default {
computed: {
fieldIds() {
return this.element.options.attrs.fieldId || []
},
curTableViews() {
const tableIdList = this.element.options.attrs.dragItems.map(item => item.tableId) || []
const views = this.childViews.viewInfos.filter(view => tableIdList.includes(view.tableId))
return views
}
},
watch: {
@ -344,18 +348,18 @@ export default {
hasParam = true
}
}
if(!hasParam){
if (!hasParam) {
this.allParams.push(this.datasetParams[j])
}
}
}
}
},
'activeName':{
'activeName': {
handler(newName, oldName) {
if(this.activeName === 'assembly'){
if (this.activeName === 'assembly') {
this.allParams = JSON.parse(JSON.stringify(this.childViews.datasetParams))
}else {
} else {
if (this.datasetParams.length > 0) {
for (var j = 0; j < this.datasetParams.length; j++) {
var hasParam = false
@ -364,7 +368,7 @@ export default {
hasParam = true
}
}
if(!hasParam){
if (!hasParam) {
this.allParams.push(this.datasetParams[j])
}
}

16
frontend/src/views/system/about/index.vue
View File

@ -48,6 +48,18 @@
<span>{{ build }}</span>
</td>
</tr>
<tr v-if="license.serialNo">
<th>{{ $t('about.serial_no') }}</th>
<td>
<span>{{ license.serialNo }}</span>
</td>
</tr>
<tr v-if="license.remark">
<th>{{ $t('about.remark') }}</th>
<td>
<span>{{ license.remark }}</span>
</td>
</tr>
</table>
</div>
@ -137,7 +149,9 @@ export default {
expired: result.license ? result.license.expired : '',
count: result.license ? result.license.count : '',
version: result.license ? result.license.version : '',
edition: result.license ? result.license.edition : ''
edition: result.license ? result.license.edition : '',
serialNo: result.license ? result.license.serialNo : '',
remark: result.license ? result.license.remark : ''
}
},
importLic(file) {

2
frontend/src/views/system/datasource/DsTree.vue
View File

@ -760,7 +760,7 @@ export default {
params.link = this.$t('datasource.click_to_check')
params.content = this.$t('datasource.cannot_be_deleted_datasource')
params.templateDel = msgContent
params.linkTo = this.linkTo.bind(this, { queryType, id })
params.linkTo = this.linkTo.bind(this, { queryType, id, name: label })
this.withLink(params)
return
}

2
frontend/src/views/system/plugin/index.vue
View File

@ -263,7 +263,7 @@ export default {
},
del(row) {
if (row.pluginId < 4) return
if (this.btnDisabled(row)) return
const options = {
title: 'components.uninstall_the_plugin',
content: 'components.it_takes_effect',

338
frontend/src/views/system/relationship/index.vue
View File

@ -1,11 +1,14 @@
<template>
<div class="consanguinity">
<div
class="consanguinity"
@click.stop="resetFilter"
>
<div class="route-title">{{ $t('commons.consanguinity') }}</div>
<div class="container-wrapper">
<el-form
ref="form"
:rules="rules"
:inline="true"
ref="form"
:model="formInline"
class="de-form-inline"
>
@ -15,59 +18,114 @@
>
<el-select
v-model="formInline.queryType"
@change="queryTypeChange"
:placeholder="$t('fu.search_bar.please_select')"
@change="queryTypeChange"
@focus="resetFilter"
>
<el-option
v-for="item in queryTypeNameList"
:key="item.value"
:label="$t(item.label)"
:value="item.value"
>
</el-option>
/>
</el-select>
</el-form-item>
<el-form-item prop="dataSourceName" :label="queryTypeTitle">
<el-select
v-model="formInline.dataSourceName"
filterable
:placeholder="$t('fu.search_bar.please_select')"
<el-form-item
prop="dataSourceName"
:label="queryTypeTitle"
>
<el-popover
v-model="showTree"
placement="bottom"
trigger="manual"
:width="popoverSize"
>
<el-option
v-for="item in dataSourceNameList"
:key="item.value"
:label="item.label"
:value="item.value"
<el-tree
v-show="showTree"
ref="resourceTree"
accordion
node-key="id"
:indent="8"
:data="resourceTreeData"
:highlight-current="true"
:filter-node-method="filterNodeMethod"
:current-node-key="formInline.dataSourceName"
@node-click="nodeClick"
>
</el-option>
</el-select>
<span
slot-scope="{ data }"
>
<span>
<span>
<svg-icon
:icon-class="getIconClass(formInline.queryType, data)"
:class="getNodeClass(formInline.queryType, data)"
/>
</span>
<span
:title="data.name"
style="padding-right: 8px"
>
{{ data.name }}
</span>
</span>
</span>
</el-tree>
<el-select
ref="treeSelect"
slot="reference"
v-model="formInline.dataSourceName"
filterable
remote
:filter-method="filterMethod"
:title="nodeData.name"
popper-class="tree-select"
@focus="showTree = true"
>
<el-option
v-for="item in ignoredOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-popover>
</el-form-item>
<el-form-item style="float: right">
<de-btn type="primary" @click="onSubmit">{{
$t('commons.adv_search.search')
}}</de-btn>
<de-btn
type="primary"
@click="onSubmit"
>
{{ $t('commons.adv_search.search') }}
</de-btn>
</el-form-item>
</el-form>
<div class="select-icon">
<i
@click="activeQueryType('date')"
:class="[activeIcon === 'date' ? 'active-icon' : '']"
class="el-icon-date"
></i>
@click="activeQueryType('date')"
/>
<svg-icon
icon-class="sys-relationship"
:class="[activeIcon === 'share' ? 'active-icon' : '']"
@click="activeQueryType('share')"
/>
</div>
<div v-show="activeIcon === 'share'" id="consanguinity">
<div
v-show="activeIcon === 'share'"
id="consanguinity"
>
<consanguinity
:chartSize="chartSize"
:current="current"
ref="consanguinity"
:chart-size="chartSize"
:current="current"
/>
</div>
<div v-show="activeIcon === 'date'" class="consanguinity-table">
<div
v-show="activeIcon === 'date'"
class="consanguinity-table"
>
<grid-table
v-loading="loading"
:table-data="tableData"
@ -75,7 +133,11 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
<el-table-column :label="$t('table.id')" type="index" width="50" />
<el-table-column
:label="$t('table.id')"
type="index"
width="50"
/>
<el-table-column
prop="datasource"
:formatter="formatter"
@ -106,15 +168,14 @@ import {
getDatasetRelationship,
getPanelRelationship
} from '@/api/chart/chart.js'
import {
listDatasource,
getDatasetList,
getPanelGroupList
} from '@/api/dataset/dataset'
import { listDatasource } from '@/api/dataset/dataset'
import _ from 'lodash'
import GridTable from '@/components/gridTable/index.vue'
import consanguinity from './consanguinity.vue'
import { log } from '@antv/g2plot/lib/utils'
import { defaultTree, groupTree } from '@/api/panel/panel'
import { queryAuthModel } from '@/api/authModel/authModel'
import { data } from 'vue2-ace-editor'
export default {
name: 'Consanguinity',
components: { GridTable, consanguinity },
@ -128,7 +189,6 @@ export default {
queryType: [{ required: true, trigger: 'blur' }],
dataSourceName: [{ required: true, trigger: 'blur', message: this.$t('chart.name_can_not_empty') }]
},
dataSourceNameList: [],
queryTypeNameList: [
{
label: 'commons.datasource',
@ -155,19 +215,21 @@ export default {
currentPage: 1,
pageSize: 10,
total: 0
}
},
resourceTreeData: [],
ignoredOptions: [],
showTree: false,
nodeData: {},
popoverSize: 400,
currentNode: {}
}
},
computed: {
current() {
const { queryType = '', dataSourceName } = this.formInline
const obj =
this.dataSourceNameList.find((ele) => dataSourceName === ele.value) ||
{}
return {
queryType,
num: obj.value,
label: obj.label
queryType: this.formInline.queryType,
num: this.formInline.dataSourceName,
label: this.nodeData.name
}
},
queryTypeTitle() {
@ -189,9 +251,9 @@ export default {
},
created() {
this.routerWithParams = this.$route.query
const { id, queryType } = this.routerWithParams
const { id, queryType, name } = this.routerWithParams
if (id && queryType) {
this.searchDetail(id, queryType)
this.searchDetail(id, queryType, name)
return
}
this.listDatasource()
@ -204,11 +266,12 @@ export default {
this.getChartSize()
},
methods: {
data,
activeQueryType(activeIcon) {
this.activeIcon = activeIcon
this.onSubmit()
},
async searchDetail(id, queryType) {
async searchDetail(id, queryType, name) {
switch (queryType) {
case 'datasource':
await this.listDatasource()
@ -223,6 +286,13 @@ export default {
break
}
this.formInline = { queryType, dataSourceName: id }
this.nodeData = { id, name }
this.ignoredOptions = [this.nodeData]
this.$refs.resourceTree.setCurrentKey(id)
const currentParents = this.$refs.resourceTree.getNodePath(this.nodeData)
currentParents.forEach((node) => {
this.$refs.resourceTree.store.nodesMap[node.id].expanded = true
})
this.getChartData()
},
getChartData() {
@ -270,7 +340,7 @@ export default {
})
},
formatter(row, column, cellValue) {
return cellValue ? cellValue : '-'
return cellValue || '-'
},
initTable() {
this.paginationConfig.total = this.treeData.length
@ -302,7 +372,7 @@ export default {
}
})
},
getChartSize: _.debounce(function () {
getChartSize: _.debounce(function() {
const dom = document.querySelector(
this.activeIcon === 'date' ? '.consanguinity-table' : '#consanguinity'
)
@ -313,44 +383,67 @@ export default {
}, 200),
listDatasource() {
return listDatasource().then((res) => {
const arr = res?.data || []
this.dataSourceNameList = arr.map((ele) => ({
value: ele.id,
label: ele.name
}))
const dsArr = res?.data || []
const typeMap = {}
dsArr.forEach((item) => {
if (!typeMap[item.type]) {
typeMap[item.type] = [{ id: item.id, name: item.name, type: 'datasource' }]
this.resourceTreeData.push({
id: item.type,
name: item.typeDesc,
type: 'folder',
children: typeMap[item.type]
})
} else {
typeMap[item.type].push({ id: item.id, name: item.name, type: 'datasource' })
}
})
})
},
getDatasetList() {
return getDatasetList().then((res) => {
const arr = res?.data || []
this.dataSourceNameList = arr.map((ele) => ({
value: ele.id,
label: ele.name
}))
return queryAuthModel({ modelType: 'dataset' }, false).then((res) => {
this.resourceTreeData = res.data
})
},
getPanelGroupList() {
return getPanelGroupList().then((res) => {
const arr = res?.data || []
this.dataSourceNameList = arr.map((ele) => ({
value: ele.id,
label: ele.name
}))
return defaultTree({ panelType: 'system' }, true).then((res) => {
if (res.data?.length > 0) {
const defaultPanelTree = {
id: 'defaultPanel',
name: this.$t('panel.default_panel'),
nodeType: 'folder',
children: res.data
}
this.resourceTreeData.push(defaultPanelTree)
}
}).then(() => {
const form = {
panelType: 'self',
sort: 'create_time desc,node_type desc,name asc'
}
groupTree(form, true).then((res) => {
this.resourceTreeData = [...this.resourceTreeData, ...res.data]
})
})
},
queryTypeChange(val) {
this.formInline.dataSourceName = ''
this.dataSourceNameList = []
this.resourceTreeData = []
this.nodeData = {}
this.currentNode = {}
switch (val) {
case 'datasource':
case 'datasource': {
this.listDatasource()
break
case 'dataset':
}
case 'dataset': {
this.getDatasetList()
break
case 'panel':
}
case 'panel': {
this.getPanelGroupList()
break
}
default:
break
}
@ -374,6 +467,88 @@ export default {
handleCurrentChange(currentPage) {
this.paginationConfig.currentPage = currentPage
this.onSubmit()
},
getIconClass(queryType, nodeData) {
switch (queryType) {
case 'datasource': {
if (nodeData.type === 'folder') {
return 'scene'
}
return 'db-de'
}
case 'dataset': {
if (nodeData.modelInnerType === 'group') {
return 'scene'
}
return `ds-${nodeData.modelInnerType}`
}
case 'panel':
if (nodeData.nodeType === 'panel') {
let iconClass = 'panel-'
if (nodeData.mobileLayout) {
iconClass += 'mobile-'
}
iconClass += nodeData.status
return iconClass
}
return 'scene'
default:
break
}
},
getNodeClass(queryType, nodeData) {
switch (queryType) {
case 'dataset': {
if (nodeData.modelInnerType !== 'group') {
return `ds-icon-${nodeData.modelInnerType}`
}
return ''
}
case 'panel': {
if (nodeData.nodeType === 'panel') {
return 'ds-icon-scene'
}
return ''
}
default: {
return ''
}
}
},
filterNodeMethod(value, data) {
if (!value) {
return true
}
return data.name.toLowerCase().indexOf(value.toLowerCase()) !== -1
},
filterMethod(filterText) {
this.$refs.resourceTree.filter(filterText)
},
nodeClick(data, node) {
if (node.isLeaf) {
this.ignoredOptions = [{ id: data.id, name: data.name }]
this.formInline.dataSourceName = data.id
this.showTree = false
this.nodeData = data
this.currentNode = node
}
},
resetFilter() {
if (this.showTree) {
this.showTree = false
this.$refs.resourceTree.filter()
this.$refs.resourceTree.setCurrentKey(this.formInline.dataSourceName)
if (this.formInline.dataSourceName === '') {
this.$refs.resourceTree.setCurrentKey(null)
}
if (this.formInline.dataSourceName) {
const currentParents = this.$refs.resourceTree.getNodePath(this.nodeData).map((item) => item.id)
const nodesMap = this.$refs.resourceTree.store.nodesMap || {}
for (const key in nodesMap) {
nodesMap[key].expanded = currentParents.includes(key)
}
}
}
}
}
}
@ -428,4 +603,31 @@ export default {
}
}
}
.custom-tree-node {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
padding-right: 8px;
}
.custom-tree-node-list {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
padding: 0 8px;
}
.father .child {
/*display: none;*/
visibility: hidden;
}
.father:hover .child {
/*display: inline;*/
visibility: visible;
}
</style>

4
frontend/src/views/system/user/index.vue
View File

@ -285,6 +285,7 @@
<el-button
slot="reference"
v-permission="['user:editPwd']"
:disabled="resetPwdDisabled(scope.row)"
class="de-text-btn mar16"
type="text"
>{{ $t("member.edit_password") }}</el-button>
@ -436,6 +437,9 @@ export default {
bus.$off('reload-user-grid', this.search)
},
methods: {
resetPwdDisabled(row) {
return ((row.from ?? '') !== '') && row.from > 0
},
resizeObserver() {
this.resizeForFilter = new ResizeObserver(entries => {
if (!this.filterTexts.length) return

2
mobile/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<artifactId>dataease-server</artifactId>
<groupId>io.dataease</groupId>
<version>1.18.0</version>
<version>1.18.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.dataease</groupId>
<artifactId>dataease-server</artifactId>
<version>1.18.0</version>
<version>1.18.2</version>
<packaging>pom</packaging>
<parent>