From ddcfd700ff4987ef3a46892f2e6bee5c73a1526c Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 13:24:35 +0800
Subject: [PATCH 01/17] =?UTF-8?q?feat:=20=E5=87=BD=E6=95=B0=E5=BA=93flyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V18__area_mapping.sql        | 134 ++++++++++++++----
 1 file changed, 107 insertions(+), 27 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V18__area_mapping.sql b/backend/src/main/resources/db/migration/V18__area_mapping.sql
index 6e114370af..f6f04ae661 100644
--- a/backend/src/main/resources/db/migration/V18__area_mapping.sql
+++ b/backend/src/main/resources/db/migration/V18__area_mapping.sql
@@ -2945,22 +2945,6 @@ SET FOREIGN_KEY_CHECKS = 1;
 ALTER TABLE `dataset_table_field` MODIFY COLUMN `origin_name` LONGTEXT;
 
 
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local
- Source Server Type    : MySQL
- Source Server Version : 50730
- Source Host           : 127.0.0.1:3306
- Source Schema         : dataease
-
- Target Server Type    : MySQL
- Target Server Version : 50730
- File Encoding         : 65001
-
- Date: 29/07/2021 11:55:10
-*/
-
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
@@ -2984,17 +2968,113 @@ CREATE TABLE `dataset_table_function` (
 BEGIN;
 INSERT INTO `dataset_table_function` VALUES (1, 'ABS', 'ABS(x)', 'mysql', 2, '返回x的绝对值');
 INSERT INTO `dataset_table_function` VALUES (2, 'PI', 'PI()', 'mysql', 2, '返回圆周率π，默认显示6位小数');
-INSERT INTO `dataset_table_function` VALUES (3, 'CHAR_LENGTH', 'CHAR_LENGTH(str)', 'mysql', 4, '计算字符串字符个数');
-INSERT INTO `dataset_table_function` VALUES (4, 'TRIM', 'TRIM(s)', 'mysql', 4, '返回字符串s删除了两边空格之后的字符串');
-INSERT INTO `dataset_table_function` VALUES (5, 'REPLACE', 'REPLACE(s,s1,s2)', 'mysql', 4, '返回一个字符串，用字符串s2替代字符串s中所有的字符串s1');
-INSERT INTO `dataset_table_function` VALUES (6, 'SUBSTRING', 'SUBSTRING(s,n,len)', 'mysql', 4, '获取从字符串s中的第n个位置开始长度为len的字符串');
-INSERT INTO `dataset_table_function` VALUES (7, 'IF', 'IF(expr,v1,v2)', 'mysql', 5, '如果expr是TRUE则返回v1，否则返回v2');
-INSERT INTO `dataset_table_function` VALUES (8, 'IFNULL', 'IFNULL(v1,v2)', 'mysql', 5, '如果v1不为NULL，则返回v1，否则返回v2');
-INSERT INTO `dataset_table_function` VALUES (9, 'FLOOR', 'FLOOR(x)', 'mysql', 2, '返回不大于x的最大整数');
-INSERT INTO `dataset_table_function` VALUES (10, 'ROUND', 'ROUND(x)', 'mysql', 2, '返回离x最近的整数');
-INSERT INTO `dataset_table_function` VALUES (11, 'ROUND', 'ROUND(x,y)', 'mysql', 2, '保留x小数点后y位的值，但截断时要进行四舍五入');
-INSERT INTO `dataset_table_function` VALUES (12, 'ABS', 'ABS(x)', 'doris', 2, '返回x的绝对值');
-INSERT INTO `dataset_table_function` VALUES (13, 'SUBSTR', 'SUBSTR(char, position, substring_length)', 'oracle', 4, '获取从字符串char中的第position个位置开始长度为substring_lenght的字符串');
+INSERT INTO `dataset_table_function` VALUES (3, 'SQRT', 'SQRT(x)', 'mysql', 2, '返回非负数的x的二次方根');
+INSERT INTO `dataset_table_function` VALUES (4, 'MOD', 'MOD(x,y)', 'mysql', 2, '返回x被y除后的余数');
+INSERT INTO `dataset_table_function` VALUES (5, 'CEIL', 'CEIL(x)', 'mysql', 2, '返回不小于x的最小整数');
+INSERT INTO `dataset_table_function` VALUES (6, 'FLOOR', 'FLOOR(x)', 'mysql', 2, '返回不大于x的最大整数');
+INSERT INTO `dataset_table_function` VALUES (7, 'ROUND', 'ROUND(x)', 'mysql', 2, '返回离x最近的整数');
+INSERT INTO `dataset_table_function` VALUES (8, 'ROUND', 'ROUND(x,y)', 'mysql', 2, '保留x小数点后y位的值，但截断时要进行四舍五入');
+INSERT INTO `dataset_table_function` VALUES (9, 'SIGN', 'SIGN(x)', 'mysql', 2, '返回参数x的符号，-1表示负数，0表示0，1表示正数');
+INSERT INTO `dataset_table_function` VALUES (10, 'POW', 'POW(x,y)', 'mysql', 2, '返回x的y次乘方的值');
+INSERT INTO `dataset_table_function` VALUES (11, 'EXP', 'EXP(x)', 'mysql', 2, '返回e的x乘方后的值');
+INSERT INTO `dataset_table_function` VALUES (12, 'LOG', 'LOG(x)', 'mysql', 2, '返回x的自然对数，x相对于基数e的对数');
+INSERT INTO `dataset_table_function` VALUES (13, 'LOG10', 'LOG10(x)', 'mysql', 2, '返回x的基数为10的对数');
+INSERT INTO `dataset_table_function` VALUES (14, 'RADIANS', 'RADIANS(x)', 'mysql', 2, '返回x由角度转化为弧度的值');
+INSERT INTO `dataset_table_function` VALUES (15, 'DEGREES', 'DEGREES(x)', 'mysql', 2, '返回x由弧度转化为角度的值');
+INSERT INTO `dataset_table_function` VALUES (16, 'SIN', 'SIN(x)', 'mysql', 2, '返回x的正弦，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (17, 'ASIN', 'ASIN(x)', 'mysql', 2, '返回x的反正弦值');
+INSERT INTO `dataset_table_function` VALUES (18, 'COS', 'COS(x)', 'mysql', 2, '返回x的余弦，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (19, 'ACOS', 'ACOS(x)', 'mysql', 2, '返回x的反余弦值');
+INSERT INTO `dataset_table_function` VALUES (20, 'TAN', 'TAN(x)', 'mysql', 2, '返回x的正切，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (21, 'ATAN', 'ATAN(x)', 'mysql', 2, '返回x的反正切值');
+INSERT INTO `dataset_table_function` VALUES (22, 'COT', 'COT(x)', 'mysql', 2, '返回给定弧度值x的余切');
+INSERT INTO `dataset_table_function` VALUES (23, 'CHAR_LENGTH', 'CHAR_LENGTH(str)', 'mysql', 4, '计算字符串字符个数');
+INSERT INTO `dataset_table_function` VALUES (24, 'TRIM', 'TRIM(s)', 'mysql', 4, '返回字符串s删除了两边空格之后的字符串');
+INSERT INTO `dataset_table_function` VALUES (25, 'LTRIM', 'LTRIM(s)', 'mysql', 4, '返回字符串s，其左边所有空格被删除');
+INSERT INTO `dataset_table_function` VALUES (26, 'RTRIM', 'RTRIM(s)', 'mysql', 4, '返回字符串s，其右边所有空格被删除');
+INSERT INTO `dataset_table_function` VALUES (27, 'REPLACE', 'REPLACE(s,s1,s2)', 'mysql', 4, '返回一个字符串，用字符串s2替代字符串s中所有的字符串s1');
+INSERT INTO `dataset_table_function` VALUES (28, 'SUBSTRING', 'SUBSTRING(s,n,len)', 'mysql', 4, '获取从字符串s中的第n个位置开始长度为len的字符串');
+INSERT INTO `dataset_table_function` VALUES (29, 'CONCAT', 'CONCAT(s1,s2，...)', 'mysql', 4, '返回连接参数产生的字符串，一个或多个待拼接的内容，任意一个为NULL则返回值为NULL');
+INSERT INTO `dataset_table_function` VALUES (30, 'INSERT', 'INSERT(s1,x,len,s2)', 'mysql', 4, '返回字符串s1，其子字符串起始于位置x，被字符串s2取代len个字符');
+INSERT INTO `dataset_table_function` VALUES (31, 'LOWER', 'LOWER(str)', 'mysql', 4, '将str中的字母全部转换成小写');
+INSERT INTO `dataset_table_function` VALUES (32, 'UPPER', 'UPPER(str)', 'mysql', 4, '将字符串中的字母全部转换成大写');
+INSERT INTO `dataset_table_function` VALUES (33, 'LEFT', 'LEFT(s,n)', 'mysql', 4, '返回字符串s从最左边开始的n个字符');
+INSERT INTO `dataset_table_function` VALUES (34, 'RIGHT', 'RIGHT(s,n)', 'mysql', 4, '返回字符串s从最右边开始的n个字符');
+INSERT INTO `dataset_table_function` VALUES (35, 'REPEAT', 'REPEAT(s,n)', 'mysql', 4, '返回一个由重复字符串s组成的字符串，字符串s的数目等于n');
+INSERT INTO `dataset_table_function` VALUES (36, 'SPACE', 'SPACE(n)', 'mysql', 4, '返回一个由n个空格组成的字符串');
+INSERT INTO `dataset_table_function` VALUES (37, 'REVERSE', 'REVERSE(s)', 'mysql', 4, '将字符串s反转');
+INSERT INTO `dataset_table_function` VALUES (38, 'CURDATE', 'CURDATE()', 'mysql', 3, '将当前日期按照\"YYYY-MM-DD\"或者\"YYYYMMDD\"格式的值返回，具体格式根据函数用在字符串或是数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (39, 'CURRENT_DATE', 'CURRENT_DATE()', 'mysql', 3, '将当前日期按照\"YYYY-MM-DD\"或者\"YYYYMMDD\"格式的值返回，具体格式根据函数用在字符串或是数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (40, 'NOW', 'NOW()', 'mysql', 3, '返回当前日期和时间值，格式为\"YYYY_MM-DD HH:MM:SS\"或\"YYYYMMDDHHMMSS\"，具体格式根据函数用在字符串或数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (41, 'SYSDATE', 'SYSDATE()', 'mysql', 3, '返回当前日期和时间值，格式为\"YYYY_MM-DD HH:MM:SS\"或\"YYYYMMDDHHMMSS\"，具体格式根据函数用在字符串或数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (42, 'LOCALTIME', 'LOCALTIME()', 'mysql', 3, '返回当前日期和时间值，格式为\"YYYY_MM-DD HH:MM:SS\"或\"YYYYMMDDHHMMSS\"，具体格式根据函数用在字符串或数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (43, 'CURRENT_TIMESTAMP', 'CURRENT_TIMESTAMP()', 'mysql', 3, '返回当前日期和时间值，格式为\"YYYY_MM-DD HH:MM:SS\"或\"YYYYMMDDHHMMSS\"，具体格式根据函数用在字符串或数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (44, 'UNIX_TIMESTAMP', 'UNIX_TIMESTAMP()', 'mysql', 3, '返回一个格林尼治标准时间1970-01-01 00:00:00到现在的秒数');
+INSERT INTO `dataset_table_function` VALUES (45, 'UNIX_TIMESTAMP', 'UNIX_TIMESTAMP(date)', 'mysql', 3, '返回一个格林尼治标准时间1970-01-01 00:00:00到指定时间的秒数');
+INSERT INTO `dataset_table_function` VALUES (46, 'FROM_UNIXTIME', 'FROM_UNIXTIME(date)', 'mysql', 3, '把UNIX时间戳转换为普通格式的时间');
+INSERT INTO `dataset_table_function` VALUES (47, 'CASE', 'CASE expr WHEN v1 THEN r1 [WHEN v2 THEN v2] [ELSE rn] END', 'mysql', 3, '如果expr等于某个vn，则返回对应位置THEN后面的结果，如果与所有值都不想等，则返回ELSE后面的rn');
+INSERT INTO `dataset_table_function` VALUES (48, 'IF', 'IF(expr,v1,v2)', 'mysql', 5, '如果expr是TRUE则返回v1，否则返回v2');
+INSERT INTO `dataset_table_function` VALUES (49, 'IFNULL', 'IFNULL(v1,v2)', 'mysql', 5, '如果v1不为NULL，则返回v1，否则返回v2');
+INSERT INTO `dataset_table_function` VALUES (50, 'ABS', 'ABS(x)', 'doris', 2, '返回x的绝对值');
+INSERT INTO `dataset_table_function` VALUES (51, 'PI', 'PI()', 'doris', 2, '返回圆周率π，默认显示6位小数');
+INSERT INTO `dataset_table_function` VALUES (52, 'SQRT', 'SQRT(x)', 'doris', 2, '返回非负数的x的二次方根');
+INSERT INTO `dataset_table_function` VALUES (53, 'MOD', 'MOD(x,y)', 'doris', 2, '返回x被y除后的余数');
+INSERT INTO `dataset_table_function` VALUES (54, 'CEIL', 'CEIL(x)', 'doris', 2, '返回不小于x的最小整数');
+INSERT INTO `dataset_table_function` VALUES (55, 'FLOOR', 'FLOOR(x)', 'doris', 2, '返回不大于x的最大整数');
+INSERT INTO `dataset_table_function` VALUES (56, 'ROUND', 'ROUND(x)', 'doris', 2, '返回离x最近的整数');
+INSERT INTO `dataset_table_function` VALUES (57, 'ROUND', 'ROUND(x,y)', 'doris', 2, '保留x小数点后y位的值，但截断时要进行四舍五入');
+INSERT INTO `dataset_table_function` VALUES (58, 'SIGN', 'SIGN(x)', 'doris', 2, '返回参数x的符号，-1表示负数，0表示0，1表示正数');
+INSERT INTO `dataset_table_function` VALUES (59, 'POW', 'POW(x,y)', 'doris', 2, '返回x的y次乘方的值');
+INSERT INTO `dataset_table_function` VALUES (60, 'EXP', 'EXP(x)', 'doris', 2, '返回e的x乘方后的值');
+INSERT INTO `dataset_table_function` VALUES (61, 'LOG', 'LOG(x)', 'doris', 2, '返回x的自然对数，x相对于基数e的对数');
+INSERT INTO `dataset_table_function` VALUES (62, 'LOG10', 'LOG10(x)', 'doris', 2, '返回x的基数为10的对数');
+INSERT INTO `dataset_table_function` VALUES (63, 'RADIANS', 'RADIANS(x)', 'doris', 2, '返回x由角度转化为弧度的值');
+INSERT INTO `dataset_table_function` VALUES (64, 'DEGREES', 'DEGREES(x)', 'doris', 2, '返回x由弧度转化为角度的值');
+INSERT INTO `dataset_table_function` VALUES (65, 'SIN', 'SIN(x)', 'doris', 2, '返回x的正弦，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (66, 'ASIN', 'ASIN(x)', 'doris', 2, '返回x的反正弦值');
+INSERT INTO `dataset_table_function` VALUES (67, 'COS', 'COS(x)', 'doris', 2, '返回x的余弦，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (68, 'ACOS', 'ACOS(x)', 'doris', 2, '返回x的反余弦值');
+INSERT INTO `dataset_table_function` VALUES (69, 'TAN', 'TAN(x)', 'doris', 2, '返回x的正切，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (70, 'ATAN', 'ATAN(x)', 'doris', 2, '返回x的反正切值');
+INSERT INTO `dataset_table_function` VALUES (71, 'COT', 'COT(x)', 'doris', 2, '返回给定弧度值x的余切');
+INSERT INTO `dataset_table_function` VALUES (72, 'CHAR_LENGTH', 'CHAR_LENGTH(str)', 'doris', 4, '计算字符串字符个数');
+INSERT INTO `dataset_table_function` VALUES (73, 'TRIM', 'TRIM(s)', 'doris', 4, '返回字符串s删除了两边空格之后的字符串');
+INSERT INTO `dataset_table_function` VALUES (74, 'LTRIM', 'LTRIM(s)', 'doris', 4, '返回字符串s，其左边所有空格被删除');
+INSERT INTO `dataset_table_function` VALUES (75, 'RTRIM', 'RTRIM(s)', 'doris', 4, '返回字符串s，其右边所有空格被删除');
+INSERT INTO `dataset_table_function` VALUES (76, 'REPLACE', 'REPLACE(s,s1,s2)', 'doris', 4, '返回一个字符串，用字符串s2替代字符串s中所有的字符串s1');
+INSERT INTO `dataset_table_function` VALUES (77, 'SUBSTRING', 'SUBSTRING(s,n,len)', 'doris', 4, '获取从字符串s中的第n个位置开始长度为len的字符串');
+INSERT INTO `dataset_table_function` VALUES (78, 'CONCAT', 'CONCAT(s1,s2，...)', 'doris', 4, '返回连接参数产生的字符串，一个或多个待拼接的内容，任意一个为NULL则返回值为NULL');
+INSERT INTO `dataset_table_function` VALUES (79, 'INSERT', 'INSERT(s1,x,len,s2)', 'doris', 4, '返回字符串s1，其子字符串起始于位置x，被字符串s2取代len个字符');
+INSERT INTO `dataset_table_function` VALUES (80, 'LOWER', 'LOWER(str)', 'doris', 4, '将str中的字母全部转换成小写');
+INSERT INTO `dataset_table_function` VALUES (81, 'UPPER', 'UPPER(str)', 'doris', 4, '将字符串中的字母全部转换成大写');
+INSERT INTO `dataset_table_function` VALUES (82, 'LEFT', 'LEFT(s,n)', 'doris', 4, '返回字符串s从最左边开始的n个字符');
+INSERT INTO `dataset_table_function` VALUES (83, 'RIGHT', 'RIGHT(s,n)', 'doris', 4, '返回字符串s从最右边开始的n个字符');
+INSERT INTO `dataset_table_function` VALUES (84, 'REPEAT', 'REPEAT(s,n)', 'doris', 4, '返回一个由重复字符串s组成的字符串，字符串s的数目等于n');
+INSERT INTO `dataset_table_function` VALUES (85, 'SPACE', 'SPACE(n)', 'doris', 4, '返回一个由n个空格组成的字符串');
+INSERT INTO `dataset_table_function` VALUES (86, 'REVERSE', 'REVERSE(s)', 'doris', 4, '将字符串s反转');
+INSERT INTO `dataset_table_function` VALUES (87, 'CURDATE', 'CURDATE()', 'doris', 3, '将当前日期按照\"YYYY-MM-DD\"或者\"YYYYMMDD\"格式的值返回，具体格式根据函数用在字符串或是数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (88, 'CURRENT_DATE', 'CURRENT_DATE()', 'doris', 3, '将当前日期按照\"YYYY-MM-DD\"或者\"YYYYMMDD\"格式的值返回，具体格式根据函数用在字符串或是数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (89, 'NOW', 'NOW()', 'doris', 3, '返回当前日期和时间值，格式为\"YYYY_MM-DD HH:MM:SS\"或\"YYYYMMDDHHMMSS\"，具体格式根据函数用在字符串或数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (90, 'SYSDATE', 'SYSDATE()', 'doris', 3, '返回当前日期和时间值，格式为\"YYYY_MM-DD HH:MM:SS\"或\"YYYYMMDDHHMMSS\"，具体格式根据函数用在字符串或数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (91, 'LOCALTIME', 'LOCALTIME()', 'doris', 3, '返回当前日期和时间值，格式为\"YYYY_MM-DD HH:MM:SS\"或\"YYYYMMDDHHMMSS\"，具体格式根据函数用在字符串或数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (92, 'CURRENT_TIMESTAMP', 'CURRENT_TIMESTAMP()', 'doris', 3, '返回当前日期和时间值，格式为\"YYYY_MM-DD HH:MM:SS\"或\"YYYYMMDDHHMMSS\"，具体格式根据函数用在字符串或数字语境中而定');
+INSERT INTO `dataset_table_function` VALUES (93, 'UNIX_TIMESTAMP', 'UNIX_TIMESTAMP()', 'doris', 3, '返回一个格林尼治标准时间1970-01-01 00:00:00到现在的秒数');
+INSERT INTO `dataset_table_function` VALUES (94, 'UNIX_TIMESTAMP', 'UNIX_TIMESTAMP(date)', 'doris', 3, '返回一个格林尼治标准时间1970-01-01 00:00:00到指定时间的秒数');
+INSERT INTO `dataset_table_function` VALUES (95, 'FROM_UNIXTIME', 'FROM_UNIXTIME(date)', 'doris', 3, '把UNIX时间戳转换为普通格式的时间');
+INSERT INTO `dataset_table_function` VALUES (96, 'CASE', 'CASE expr WHEN v1 THEN r1 [WHEN v2 THEN v2] [ELSE rn] END', 'doris', 3, '如果expr等于某个vn，则返回对应位置THEN后面的结果，如果与所有值都不想等，则返回ELSE后面的rn');
+INSERT INTO `dataset_table_function` VALUES (97, 'IF', 'IF(expr,v1,v2)', 'doris', 5, '如果expr是TRUE则返回v1，否则返回v2');
+INSERT INTO `dataset_table_function` VALUES (98, 'IFNULL', 'IFNULL(v1,v2)', 'doris', 5, '如果v1不为NULL，则返回v1，否则返回v2');
+INSERT INTO `dataset_table_function` VALUES (99, 'SUBSTR', 'SUBSTR(char, position, substring_length)', 'oracle', 4, '获取从字符串char中的第position个位置开始长度为substring_lenght的字符串');
+INSERT INTO `dataset_table_function` VALUES (100, 'REPLACE', 'REPLACE(X,old,new)', 'oracle', 4, '在X中查找old，并替换成new');
+INSERT INTO `dataset_table_function` VALUES (101, 'TRIM', 'TRIM([TRIM_STR  FROM]X)', 'oracle', 4, '把X的两边截去trim_str字符串，缺省截去空格');
+INSERT INTO `dataset_table_function` VALUES (102, 'LOWER', 'LOWER(X)', 'oracle', 4, 'X转换成小写');
+INSERT INTO `dataset_table_function` VALUES (103, 'UPPER', 'UPPER(X)', 'oracle', 4, 'X转换成大写');
+INSERT INTO `dataset_table_function` VALUES (104, 'LENGTH', 'LENGTH(X)', 'oracle', 4, '返回X的长度');
+INSERT INTO `dataset_table_function` VALUES (105, 'ABS', 'ABS(value)', 'oracle', 2, '返回value的绝对值');
+INSERT INTO `dataset_table_function` VALUES (106, 'CEIL', 'CEIL(value)', 'oracle', 2, '返回大于等于value的最小整数');
+INSERT INTO `dataset_table_function` VALUES (107, 'FLOOR', 'FLOOR(value)', 'oracle', 2, '返回小于等于value的最大整数');
+INSERT INTO `dataset_table_function` VALUES (108, 'ROUND', 'ROUND(value,n)', 'oracle', 2, '对value进行四舍五入，保存小数点右侧的n位。如果n省略的话，相当于n=0的情况');
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;
+

From b0905f98d29720c4beb0a3de3096ab7605764669 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Aug 2021 13:25:27 +0800
Subject: [PATCH 02/17] =?UTF-8?q?fix:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E8=BF=98=E6=98=AF=E7=81=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/Editor/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index b647626b30..e3ba326800 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -275,6 +275,7 @@ export default {
         // 第一次变化 不需要 重置边界 待改进
         if (this.changeIndex++ > 0) {
           this.resizeParentBounds()
+          this.$store.state.styleChangeTimes++
         }
         // this.changeScale()
       },

From bb58d690dc6c48acd82a2f0f633124184a49920f Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 13:48:14 +0800
Subject: [PATCH 03/17] =?UTF-8?q?refactor:=20=E7=BC=96=E8=BE=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/CalcFieldEdit.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue
index 5b5cc96e6f..02a1cd4b3c 100644
--- a/frontend/src/views/dataset/data/CalcFieldEdit.vue
+++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue
@@ -371,7 +371,8 @@ export default {
     padding: 0 4px;
   }
   .field-height{
-    height: calc(50% - 20px);
+    height: calc(50% - 25px);
+    margin-top: 4px;
   }
   .drag-list {
     height: calc(100% - 26px);
@@ -442,8 +443,9 @@ export default {
     text-overflow: ellipsis;
   }
   .function-height{
-    height: calc(100% - 20px);
+    height: calc(100% - 50px);
     overflow: auto;
+    margin-top: 4px;
   }
   .function-pop>>>.el-popover{
     padding: 6px!important;

From 94d716d1bc200259959477f7c77269b5184d2c18 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 3 Aug 2021 14:03:34 +0800
Subject: [PATCH 04/17] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js       | 71 +++++++++++++++++++++++++-
 frontend/src/lang/tw.js       | 95 +++++++++++++++++++++++++++++------
 frontend/src/lang/zh.js       | 73 +++++++++++++++++++++++++--
 frontend/src/utils/request.js | 10 ++--
 4 files changed, 227 insertions(+), 22 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index e5c46b3c94..d69856e896 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -127,7 +127,7 @@ export default {
     tokenError: 'Token error, please login again',
     username_error: 'Please enter the correct ID',
     password_error: 'The password can not be less than 8 digits',
-    login_again: 'Login again'
+    re_login: 'Login again'
   },
   commons: {
     no_target_permission: 'No permission',
@@ -752,6 +752,7 @@ export default {
     chart_funnel: 'Funnel',
     chart_radar: 'Radar',
     chart_gauge: 'Gauge',
+    chart_map: 'Map',
     dateStyle: 'Date Style',
     datePattern: 'Date Format',
     y: 'Year',
@@ -820,6 +821,11 @@ export default {
     drag_block_funnel_split: 'Funnel Split',
     drag_block_radar_length: 'Branch Length',
     drag_block_radar_label: 'Branch Label',
+    stack_item: 'Stack Item',
+    map_range: 'Map range',
+    select_map_range: 'Please select map range',
+    area: 'Area',
+    placeholder_field: 'Drag Field To Here',
     axis_label_rotate: 'Label Rotate'
   },
   dataset: {
@@ -974,7 +980,19 @@ export default {
     right_join: 'RIGHT JOIN',
     inner_join: 'INNER JOIN',
     full_join: 'FULL JOIN',
-    can_not_union_diff_datasource: 'Union dataset must have same data source'
+    can_not_union_diff_datasource: 'Union dataset must have same data source',
+    operator: 'Operator',
+    d_q_trans: 'Dimension/Quota Transform',
+    add_calc_field: 'Create calc field',
+    input_name: 'Please input name',
+    field_exp: 'Field Expression',
+    data_type: 'Data Type',
+    click_ref_field: 'Click Quote Field',
+    click_ref_function: 'Click Quote Function',
+    field_manage: 'Field Manage',
+    edit_calc_field: 'Edit calc field',
+    calc_field: 'Calc Field',
+    show_sql: 'Show SQL'
   },
   datasource: {
     datasource: 'Data Source',
@@ -1288,5 +1306,54 @@ export default {
     i18n_msg_type_dataset_sync_faild: 'Dataset synchronization failed',
     i18n_msg_type_all: 'All type',
     channel_inner_msg: 'On site news'
+  },
+  denumberrange: {
+    label: 'Number range',
+    split_placeholder: 'To',
+    please_key_min: 'Please key min value',
+    please_key_max: 'Please key max value',
+    out_of_min: 'The min value cannot be less than the min integer -2³²',
+    out_of_max: 'The max value cannot be more than the max integer 2³²-1',
+    must_int: 'Please key interger',
+    min_out_max: 'The min value must be less than the max value',
+    max_out_min: 'The max value must be more than the min value'
+  },
+  denumberselect: {
+    label: 'Number selector',
+    placeholder: 'Please select'
+  },
+  deinputsearch: {
+    label: 'Text search',
+    placeholder: 'Please key keyword'
+  },
+  detextselect: {
+    label: 'Text selector',
+    placeholder: 'Please select'
+  },
+  detextgridselect: {
+    label: 'Text list',
+    placeholder: 'Please select'
+  },
+  denumbergridselect: {
+    label: 'Number list',
+    placeholder: 'Please select'
+  },
+  dedaterange: {
+    label: 'Date range',
+    to_placeholder: 'End date',
+    from_placeholder: 'Start date',
+    split_placeholder: 'To'
+  },
+  dedate: {
+    label: 'Date',
+    placeholder: 'Please select date'
+  },
+  deyearmonth: {
+    label: 'Month',
+    placeholder: 'Please select month'
+  },
+  deyear: {
+    label: 'Year',
+    placeholder: 'Please select year'
   }
 }
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 054b685549..21a06c5527 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -109,25 +109,25 @@ export default {
   navbar: {
     dashboard: '首頁',
     github: '項目地址',
-    logOut: '退出登錄',
+    logOut: '退出登陸',
     profile: '個人中心',
     theme: '換膚',
     size: '佈局大小'
   },
   login: {
-    title: '系統登錄',
+    title: '系統登陸',
     welcome: '歡迎使用',
-    logIn: '登錄',
+    logIn: '登陸',
     username: '帳號',
     password: '密碼',
     any: '任意字符',
-    thirdparty: '第三方登錄',
+    thirdparty: '第三方登陸',
     thirdpartyTips: '本地不能模擬，請結合自己業務進行模擬！！！',
-    expires: '登錄信息過期，請重新登錄',
-    tokenError: '信息錯誤，請重新登錄',
+    expires: '登陸信息過期，請重新登陸',
+    tokenError: '信息錯誤，請重新登陸',
     username_error: '請輸入正確的 ID',
     password_error: '密碼不小於 8 位',
-    login_again: '重新登錄'
+    re_login: '重新登陸'
   },
   commons: {
     no_target_permission: '沒有權限',
@@ -184,7 +184,7 @@ export default {
     prompt: '提示',
     operating: '操作',
     input_limit: '長度在 {0} 到 {1} 個字符',
-    login: '登錄',
+    login: '登陸',
     welcome: '一站式開源數據分析平臺',
     username: '姓名',
     password: '密碼',
@@ -256,7 +256,7 @@ export default {
     remove: '移除',
     remove_cancel: '移除取消',
     remove_success: '移除成功',
-    tips: '認證信息已過期，請重新登錄',
+    tips: '認證信息已過期，請重新登陸',
     not_performed_yet: '尚未執行',
     incorrect_input: '輸入內容不正確',
     delete_confirm: '請輸入以下內容，確認刪除：',
@@ -752,6 +752,7 @@ export default {
     chart_funnel: '漏鬥圖',
     chart_radar: '雷達圖',
     chart_gauge: '儀表盤',
+    chart_map: '地圖',
     dateStyle: '日期顯示',
     datePattern: '日期格式',
     y: '年',
@@ -820,6 +821,11 @@ export default {
     drag_block_funnel_split: '漏鬥分層',
     drag_block_radar_length: '分支長度',
     drag_block_radar_label: '分支標簽',
+    map_range: '地圖範圍',
+    select_map_range: '請選擇地圖範圍',
+    area: '地區',
+    stack_item: '堆疊項',
+    placeholder_field: '拖動字段至此處',
     axis_label_rotate: '標簽角度'
   },
   dataset: {
@@ -974,7 +980,19 @@ export default {
     right_join: '右連接',
     inner_join: '內連接',
     full_join: '全連接',
-    can_not_union_diff_datasource: '被關聯數據集必須與當前數據集的數據源一致'
+    can_not_union_diff_datasource: '被關聯數據集必須與當前數據集的數據源一致',
+    operator: '操作',
+    d_q_trans: '維度/指標轉換',
+    add_calc_field: '新建计算字段',
+    input_name: '請輸入名稱',
+    field_exp: '字段表達式',
+    data_type: '數據類型',
+    click_ref_field: '點擊引用字段',
+    click_ref_function: '點擊引用函數',
+    field_manage: '字段管理',
+    edit_calc_field: '編輯計算字段',
+    calc_field: '計算字段',
+    show_sql: '顯示SQL'
   },
   datasource: {
     datasource: '數據源',
@@ -1127,7 +1145,7 @@ export default {
     lineHeight: '行高',
     letterSpacing: '字間距',
     textAlign: '左右對齊',
-    opacity: '透明度',
+    opacity: '不透明度',
     verticalAlign: '上下對齊',
     text_align_left: '左對齊',
     text_align_center: '左右居中',
@@ -1166,9 +1184,9 @@ export default {
   },
   display: {
     logo: '頭部系統 Logo',
-    loginLogo: '登錄頁面頭部 Logo',
-    loginImage: '登錄頁面右側圖片',
-    loginTitle: '登錄頁面標題',
+    loginLogo: '登陸頁面頭部 Logo',
+    loginImage: '登陸頁面右側圖片',
+    loginTitle: '登陸頁面標題',
     title: '系統名稱',
     advice_size: '建議圖片大小'
   },
@@ -1288,5 +1306,54 @@ export default {
     i18n_msg_type_dataset_sync_faild: '數據集同步失敗',
     i18n_msg_type_all: '全部類型',
     channel_inner_msg: '站內消息'
+  },
+  denumberrange: {
+    label: '數值區間',
+    split_placeholder: '至',
+    please_key_min: '請輸入最小值',
+    please_key_max: '請輸入最大值',
+    out_of_min: '最小值不能小于最小整數-2³²',
+    out_of_max: '最大值不能大于最大整數2³²-1',
+    must_int: '請輸入整數',
+    min_out_max: '最小值必須小于最大值',
+    max_out_min: '最大值必須大于最小值'
+  },
+  denumberselect: {
+    label: '數字下拉',
+    placeholder: '請選擇'
+  },
+  deinputsearch: {
+    label: '文本搜索',
+    placeholder: '請輸入關鍵字'
+  },
+  detextselect: {
+    label: '文本下拉',
+    placeholder: '請選擇'
+  },
+  detextgridselect: {
+    label: '文本列表',
+    placeholder: '請選擇'
+  },
+  denumbergridselect: {
+    label: '數字列表',
+    placeholder: '請選擇'
+  },
+  dedaterange: {
+    label: '日期範圍',
+    to_placeholder: '結束日期',
+    from_placeholder: '開始日期',
+    split_placeholder: '至'
+  },
+  dedate: {
+    label: '日期',
+    placeholder: '請選擇日期'
+  },
+  deyearmonth: {
+    label: '年月',
+    placeholder: '請選擇年月'
+  },
+  deyear: {
+    label: '年份',
+    placeholder: '請選擇年份'
   }
 }
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 703ff6edf5..b542905147 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -127,7 +127,7 @@ export default {
     tokenError: '登陆信息错误，请重新登录',
     username_error: '请输入正确的 ID',
     password_error: '密码不小于 8 位',
-    login_again: '重新登录'
+    re_login: '重新登录'
   },
   commons: {
     no_target_permission: '没有权限',
@@ -752,6 +752,7 @@ export default {
     chart_funnel: '漏斗图',
     chart_radar: '雷达图',
     chart_gauge: '仪表盘',
+    chart_map: '地图',
     dateStyle: '日期显示',
     datePattern: '日期格式',
     y: '年',
@@ -820,6 +821,11 @@ export default {
     drag_block_funnel_split: '漏斗分层',
     drag_block_radar_length: '分支长度',
     drag_block_radar_label: '分支标签',
+    map_range: '地图范围',
+    select_map_range: '请选择地图范围',
+    area: '地区',
+    stack_item: '堆叠项',
+    placeholder_field: '拖动字段至此处',
     axis_label_rotate: '标签角度'
   },
   dataset: {
@@ -974,7 +980,19 @@ export default {
     right_join: '右连接',
     inner_join: '内连接',
     full_join: '全连接',
-    can_not_union_diff_datasource: '被关联数据集必须与当前数据集的数据源一致'
+    can_not_union_diff_datasource: '被关联数据集必须与当前数据集的数据源一致',
+    operator: '操作',
+    d_q_trans: '维度/指标转换',
+    add_calc_field: '新建计算字段',
+    input_name: '请输入名称',
+    field_exp: '字段表达式',
+    data_type: '数据类型',
+    click_ref_field: '点击引用字段',
+    click_ref_function: '点击引用函数',
+    field_manage: '字段管理',
+    edit_calc_field: '编辑计算字段',
+    calc_field: '计算字段',
+    show_sql: '显示SQL'
   },
   datasource: {
     datasource: '数据源',
@@ -1128,7 +1146,7 @@ export default {
     lineHeight: '行高',
     letterSpacing: '字间距',
     textAlign: '左右对齐',
-    opacity: '透明度',
+    opacity: '不透明度',
     verticalAlign: '上下对齐',
     text_align_left: '左对齐',
     text_align_center: '左右居中',
@@ -1290,5 +1308,54 @@ export default {
     i18n_msg_type_dataset_sync_faild: '数据集同步失败',
     i18n_msg_type_all: '全部类型',
     channel_inner_msg: '站内消息'
+  },
+  denumberrange: {
+    label: '数值区间',
+    split_placeholder: '至',
+    please_key_min: '请输入最小值',
+    please_key_max: '请输入最大值',
+    out_of_min: '最小值不能小于最小整数-2³²',
+    out_of_max: '最大值不能大于最大整数2³²-1',
+    must_int: '请输入整数',
+    min_out_max: '最小值必须小于最大值',
+    max_out_min: '最大值必须大于最小值'
+  },
+  denumberselect: {
+    label: '数字下拉',
+    placeholder: '请选择'
+  },
+  deinputsearch: {
+    label: '文本搜索',
+    placeholder: '请输入关键字'
+  },
+  detextselect: {
+    label: '文本下拉',
+    placeholder: '请选择'
+  },
+  detextgridselect: {
+    label: '文本列表',
+    placeholder: '请选择'
+  },
+  denumbergridselect: {
+    label: '数字列表',
+    placeholder: '请选择'
+  },
+  dedaterange: {
+    label: '日期范围',
+    to_placeholder: '结束日期',
+    from_placeholder: '开始日期',
+    split_placeholder: '至'
+  },
+  dedate: {
+    label: '日期',
+    placeholder: '请选择日期'
+  },
+  deyearmonth: {
+    label: '年月',
+    placeholder: '请选择年月'
+  },
+  deyear: {
+    label: '年份',
+    placeholder: '请选择年份'
   }
 }
diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js
index 23b2a1f7dd..77623de695 100644
--- a/frontend/src/utils/request.js
+++ b/frontend/src/utils/request.js
@@ -16,7 +16,7 @@ const LinkTokenKey = Config.LinkTokenKey
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 20000 // request timeout
+  timeout: 10000 // request timeout
 })
 
 // request interceptor
@@ -52,6 +52,10 @@ service.interceptors.request.use(
   }
 )
 
+// const defaultOptions = {
+//   confirmButtonText: i18n.t('login.re_login')
+// }
+
 const checkAuth = response => {
   // 请根据实际需求修改
 
@@ -63,7 +67,7 @@ const checkAuth = response => {
         location.reload()
       })
     }, {
-      confirmButtonText: i18n.t('login.login_again'),
+      confirmButtonText: i18n.t('login.re_login'),
       showClose: false
     })
   }
@@ -75,7 +79,7 @@ const checkAuth = response => {
         location.reload()
       })
     }, {
-      confirmButtonText: i18n.t('login.login_again'),
+      confirmButtonText: i18n.t('login.re_login'),
       showClose: false
     })
   }

From b1096a6151be7b012fbe852e773ff49f6891da4b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 3 Aug 2021 14:14:35 +0800
Subject: [PATCH 05/17] =?UTF-8?q?fix:=20=E6=89=93=E5=8C=85=E5=90=8E?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 7539ed412b..9f0f5c4b44 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -384,7 +384,7 @@
                 <includes>
                     <include>**/*</include>
                 </includes>
-                <filtering>true</filtering>
+                <filtering>false</filtering>
             </resource>
         </resources>
         <plugins>
@@ -414,11 +414,11 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.4.3</version>
-            </plugin>
+            </plugin>-->
 
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>

From a76ab930097a1721010980056da07911540d4554 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 14:35:39 +0800
Subject: [PATCH 06/17] =?UTF-8?q?feat:=20=E5=87=BD=E6=95=B0=E5=BA=93flyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V18__area_mapping.sql     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/resources/db/migration/V18__area_mapping.sql b/backend/src/main/resources/db/migration/V18__area_mapping.sql
index f6f04ae661..93d2e96315 100644
--- a/backend/src/main/resources/db/migration/V18__area_mapping.sql
+++ b/backend/src/main/resources/db/migration/V18__area_mapping.sql
@@ -3012,7 +3012,7 @@ INSERT INTO `dataset_table_function` VALUES (43, 'CURRENT_TIMESTAMP', 'CURRENT_T
 INSERT INTO `dataset_table_function` VALUES (44, 'UNIX_TIMESTAMP', 'UNIX_TIMESTAMP()', 'mysql', 3, '返回一个格林尼治标准时间1970-01-01 00:00:00到现在的秒数');
 INSERT INTO `dataset_table_function` VALUES (45, 'UNIX_TIMESTAMP', 'UNIX_TIMESTAMP(date)', 'mysql', 3, '返回一个格林尼治标准时间1970-01-01 00:00:00到指定时间的秒数');
 INSERT INTO `dataset_table_function` VALUES (46, 'FROM_UNIXTIME', 'FROM_UNIXTIME(date)', 'mysql', 3, '把UNIX时间戳转换为普通格式的时间');
-INSERT INTO `dataset_table_function` VALUES (47, 'CASE', 'CASE expr WHEN v1 THEN r1 [WHEN v2 THEN v2] [ELSE rn] END', 'mysql', 3, '如果expr等于某个vn，则返回对应位置THEN后面的结果，如果与所有值都不想等，则返回ELSE后面的rn');
+INSERT INTO `dataset_table_function` VALUES (47, 'CASE', 'CASE expr WHEN v1 THEN r1 [WHEN v2 THEN v2] [ELSE rn] END', 'mysql', 5, '如果expr等于某个vn，则返回对应位置THEN后面的结果，如果与所有值都不想等，则返回ELSE后面的rn');
 INSERT INTO `dataset_table_function` VALUES (48, 'IF', 'IF(expr,v1,v2)', 'mysql', 5, '如果expr是TRUE则返回v1，否则返回v2');
 INSERT INTO `dataset_table_function` VALUES (49, 'IFNULL', 'IFNULL(v1,v2)', 'mysql', 5, '如果v1不为NULL，则返回v1，否则返回v2');
 INSERT INTO `dataset_table_function` VALUES (50, 'ABS', 'ABS(x)', 'doris', 2, '返回x的绝对值');
@@ -3074,6 +3074,16 @@ INSERT INTO `dataset_table_function` VALUES (105, 'ABS', 'ABS(value)', 'oracle',
 INSERT INTO `dataset_table_function` VALUES (106, 'CEIL', 'CEIL(value)', 'oracle', 2, '返回大于等于value的最小整数');
 INSERT INTO `dataset_table_function` VALUES (107, 'FLOOR', 'FLOOR(value)', 'oracle', 2, '返回小于等于value的最大整数');
 INSERT INTO `dataset_table_function` VALUES (108, 'ROUND', 'ROUND(value,n)', 'oracle', 2, '对value进行四舍五入，保存小数点右侧的n位。如果n省略的话，相当于n=0的情况');
+INSERT INTO `dataset_table_function` VALUES (109, 'SIN', 'SIN(x)', 'oracle', 2, '返回x的正弦，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (110, 'ASIN', 'ASIN(x)', 'oracle', 2, '返回x的反正弦值');
+INSERT INTO `dataset_table_function` VALUES (111, 'COS', 'COS(x)', 'oracle', 2, '返回x的余弦，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (112, 'ACOS', 'ACOS(x)', 'oracle', 2, '返回x的反余弦值');
+INSERT INTO `dataset_table_function` VALUES (113, 'TAN', 'TAN(x)', 'oracle', 2, '返回x的正切，其中x为给定的弧度值');
+INSERT INTO `dataset_table_function` VALUES (114, 'ATAN', 'ATAN(x)', 'oracle', 2, '返回x的反正切值');
+INSERT INTO `dataset_table_function` VALUES (115, 'COT', 'COT(x)', 'oracle', 2, '返回给定弧度值x的余切');
+INSERT INTO `dataset_table_function` VALUES (116, 'CASE', 'CASE expr WHEN v1 THEN r1 [WHEN v2 THEN v2] [ELSE rn] END', 'oracle', 5, '如果expr等于某个vn，则返回对应位置THEN后面的结果，如果与所有值都不想等，则返回ELSE后面的rn');
+INSERT INTO `dataset_table_function` VALUES (117, 'IF', 'IF(expr,v1,v2)', 'oracle', 5, '如果expr是TRUE则返回v1，否则返回v2');
+INSERT INTO `dataset_table_function` VALUES (118, 'IFNULL', 'IFNULL(v1,v2)', 'oracle', 5, '如果v1不为NULL，则返回v1，否则返回v2');
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;

From 4b039160e32a18cdf5aa2eea13f30f11ac2ae641 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 14:51:52 +0800
Subject: [PATCH 07/17] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/CalcFieldEdit.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue
index 02a1cd4b3c..ede881388d 100644
--- a/frontend/src/views/dataset/data/CalcFieldEdit.vue
+++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue
@@ -315,6 +315,8 @@ export default {
       if (!this.fieldForm.id) {
         this.fieldForm.type = this.fieldForm.deType
         this.fieldForm.deExtractType = this.fieldForm.deType
+        this.fieldForm.tableId = this.param.id
+        this.fieldForm.columnIndex = this.tableFields.dimensionList.length + this.tableFields.quotaList.length
       }
       post('/dataset/field/save', this.fieldForm).then(response => {
         this.closeCalcField()

From 1ceee0f4453031ffc0dec4f215d4155d31771b74 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 15:06:40 +0800
Subject: [PATCH 08/17] =?UTF-8?q?feat:=20=E5=87=BD=E6=95=B0=E5=BA=93flyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V18__area_mapping.sql  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V18__area_mapping.sql b/backend/src/main/resources/db/migration/V18__area_mapping.sql
index 93d2e96315..021b665706 100644
--- a/backend/src/main/resources/db/migration/V18__area_mapping.sql
+++ b/backend/src/main/resources/db/migration/V18__area_mapping.sql
@@ -3074,16 +3074,6 @@ INSERT INTO `dataset_table_function` VALUES (105, 'ABS', 'ABS(value)', 'oracle',
 INSERT INTO `dataset_table_function` VALUES (106, 'CEIL', 'CEIL(value)', 'oracle', 2, '返回大于等于value的最小整数');
 INSERT INTO `dataset_table_function` VALUES (107, 'FLOOR', 'FLOOR(value)', 'oracle', 2, '返回小于等于value的最大整数');
 INSERT INTO `dataset_table_function` VALUES (108, 'ROUND', 'ROUND(value,n)', 'oracle', 2, '对value进行四舍五入，保存小数点右侧的n位。如果n省略的话，相当于n=0的情况');
-INSERT INTO `dataset_table_function` VALUES (109, 'SIN', 'SIN(x)', 'oracle', 2, '返回x的正弦，其中x为给定的弧度值');
-INSERT INTO `dataset_table_function` VALUES (110, 'ASIN', 'ASIN(x)', 'oracle', 2, '返回x的反正弦值');
-INSERT INTO `dataset_table_function` VALUES (111, 'COS', 'COS(x)', 'oracle', 2, '返回x的余弦，其中x为给定的弧度值');
-INSERT INTO `dataset_table_function` VALUES (112, 'ACOS', 'ACOS(x)', 'oracle', 2, '返回x的反余弦值');
-INSERT INTO `dataset_table_function` VALUES (113, 'TAN', 'TAN(x)', 'oracle', 2, '返回x的正切，其中x为给定的弧度值');
-INSERT INTO `dataset_table_function` VALUES (114, 'ATAN', 'ATAN(x)', 'oracle', 2, '返回x的反正切值');
-INSERT INTO `dataset_table_function` VALUES (115, 'COT', 'COT(x)', 'oracle', 2, '返回给定弧度值x的余切');
-INSERT INTO `dataset_table_function` VALUES (116, 'CASE', 'CASE expr WHEN v1 THEN r1 [WHEN v2 THEN v2] [ELSE rn] END', 'oracle', 5, '如果expr等于某个vn，则返回对应位置THEN后面的结果，如果与所有值都不想等，则返回ELSE后面的rn');
-INSERT INTO `dataset_table_function` VALUES (117, 'IF', 'IF(expr,v1,v2)', 'oracle', 5, '如果expr是TRUE则返回v1，否则返回v2');
-INSERT INTO `dataset_table_function` VALUES (118, 'IFNULL', 'IFNULL(v1,v2)', 'oracle', 5, '如果v1不为NULL，则返回v1，否则返回v2');
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;

From 52990c968437aef4689c7cf99fd9a2c5f1992848 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Aug 2021 15:49:04 +0800
Subject: [PATCH 09/17] =?UTF-8?q?refactor:=E6=9B=B4=E6=8D=A2=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E8=A7=86=E5=9B=BE=E8=AE=BE=E7=BD=AE=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue               | 10 ++++++----
 .../canvas/components/Editor/ComponentWrapper.vue      |  6 +++---
 .../components/canvas/components/Editor/EditBar.vue    |  7 ++++++-
 .../src/components/canvas/components/Editor/index.vue  |  7 +++++++
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index d45a63efff..06a1c9c08a 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -19,9 +19,7 @@
     @mouseenter="enter"
     @mouseleave="leave"
   >
-    <setting-menu style="right:5px;position: absolute;z-index: 2">
-      <i slot="icon" class="icon iconfont icon-shezhi" />
-    </setting-menu>
+    <edit-bar v-if="active" :active-model="'edit'" @showViewDetails="showViewDetails" />
     <div
       v-for="(handlei, indexi) in actualHandles"
       :key="indexi"
@@ -46,11 +44,12 @@ let eventsFor = events.mouse
 import eventBus from '@/components/canvas/utils/eventBus'
 import { mapState } from 'vuex'
 import SettingMenu from '@/components/canvas/components/Editor/SettingMenu'
+import EditBar from '@/components/canvas/components/Editor/EditBar'
 
 export default {
   replace: true,
   name: 'VueDragResizeRotate',
-  components: { SettingMenu },
+  components: { EditBar },
   props: {
     className: {
       type: String,
@@ -1540,6 +1539,9 @@ export default {
       removeEvent(document.documentElement, 'mouseup', this.handleUp)
       removeEvent(document.documentElement, 'touchend touchcancel', this.deselect)
       removeEvent(window, 'resize', this.checkParentSize)
+    },
+    showViewDetails() {
+      this.$emit('showViewDetails')
     }
   }
 
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 7b39cf585a..c5eca3650e 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -18,9 +18,9 @@
     />
 
     <component
-      ref="wrapperChild"
       :is="config.component"
       v-else
+      ref="wrapperChild"
       :out-style="config.style"
       :style="getComponentStyleDefault(config.style)"
       :prop-value="config.propValue"
@@ -112,8 +112,8 @@ export default {
       e.stopPropagation()
       this.$store.commit('setCurComponent', { component: this.config, index: this.index })
     },
-    showViewDetails(){
-      this.$refs.wrapperChild.openChartDetailsDialog();
+    showViewDetails() {
+      this.$refs.wrapperChild.openChartDetailsDialog()
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 872b0cfc6b..7e768c3f4f 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -1,15 +1,20 @@
 <template>
   <div class="bar-main">
+    <setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;">
+      <i slot="icon" class="icon iconfont icon-shezhi" />
+    </setting-menu>
     <i v-if="curComponent.type==='view'" class="icon iconfont icon-fangda" @click.stop="showViewDetails" />
-    <i v-if="activeModel==='edit'" class="icon iconfont icon-shezhi" @click.stop="showViewDetails" />
+    <!--    <el-checkbox />-->
   </div>
 </template>
 
 <script>
 import { mapState } from 'vuex'
 import eventBus from '@/components/canvas/utils/eventBus'
+import SettingMenu from '@/components/canvas/components/Editor/SettingMenu'
 
 export default {
+  components: { SettingMenu },
 
   props: {
     active: {
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index e3ba326800..e54dc297ff 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -30,11 +30,13 @@
       :snap-tolerance="2"
       :change-style="customStyle"
       @refLineParams="getRefLineParams"
+      @showViewDetails="showViewDetails(index)"
     >
       <component
         :is="item.component"
         v-if="item.type==='v-text'"
         :id="'component' + item.id"
+        ref="wrapperChild"
         class="component"
         :style="getComponentStyleDefault(item.style)"
         :prop-value="item.propValue"
@@ -69,6 +71,7 @@
         :is="item.component"
         v-else-if="item.type==='other'"
         :id="'component' + item.id"
+        ref="wrapperChild"
         class="component"
         :style="getComponentStyle(item.style)"
         :prop-value="item.propValue"
@@ -80,6 +83,7 @@
         :is="item.component"
         v-else
         :id="'component' + item.id"
+        ref="wrapperChild"
         class="component"
         :style="getComponentStyleDefault(item.style)"
         :prop-value="item.propValue"
@@ -603,6 +607,9 @@ export default {
     },
     exportExcel() {
       this.$refs['userViewDialog'].exportExcel()
+    },
+    showViewDetails(index) {
+      this.$refs.wrapperChild[index].openChartDetailsDialog()
     }
   }
 }

From 1aa5b483fb7936c35bdb51f77a911b695bd104e5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 3 Aug 2021 16:05:05 +0800
Subject: [PATCH 10/17] =?UTF-8?q?perf:=20rest=E8=AF=B7=E6=B1=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=B8=BAjson=E6=96=87=E4=BB=B6=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/config/WebMvcConfig.java | 20 +++++++++++++++++++
 frontend/src/api/map/map.js                   | 10 +++++++++-
 .../views/chart/components/ChartComponent.vue |  9 ++++++---
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 backend/src/main/java/io/dataease/config/WebMvcConfig.java

diff --git a/backend/src/main/java/io/dataease/config/WebMvcConfig.java b/backend/src/main/java/io/dataease/config/WebMvcConfig.java
new file mode 100644
index 0000000000..5653245ee1
--- /dev/null
+++ b/backend/src/main/java/io/dataease/config/WebMvcConfig.java
@@ -0,0 +1,20 @@
+package io.dataease.config;
+
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Value("${geo.rootpath:file:/opt/dataease/data/feature/full/}")
+    private String geoPath;
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+
+        registry.addResourceHandler("/geo/**").addResourceLocations(geoPath);
+    }
+}
diff --git a/frontend/src/api/map/map.js b/frontend/src/api/map/map.js
index 73463c11b9..cdd49c376b 100644
--- a/frontend/src/api/map/map.js
+++ b/frontend/src/api/map/map.js
@@ -8,9 +8,17 @@ export const areaMapping = () => {
   })
 }
 
+// export function geoJson(areaCode) {
+//   return request({
+//     url: '/api/map/resourceFull/' + areaCode,
+//     method: 'get',
+//     loading: true
+//   })
+// }
+
 export function geoJson(areaCode) {
   return request({
-    url: '/api/map/resourceFull/' + areaCode,
+    url: '/geo/' + areaCode + '_full.json',
     method: 'get',
     loading: true
   })
diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index 7a0e986a46..6127982ef3 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -113,13 +113,16 @@ export default {
         }
 
         geoJson(customAttr.areaCode).then(res => {
-          this.initMapChart(res.data, chart)
+          // this.initMapChart(res.data, chart)
+          this.initMapChart(res, chart)
 
           this.$store.dispatch('map/setGeo', {
             key: customAttr.areaCode,
-            value: res.data
+            value: res
+            // value: res.data
           })
-          this.currentGeoJson = res.data
+          // this.currentGeoJson = res.data
+          this.currentGeoJson = res
         })
         return
       }

From 5a0fcc52c954f624d511feba1543a9f053b80170 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 16:12:15 +0800
Subject: [PATCH 11/17] =?UTF-8?q?refactor:=20=E5=A0=86=E5=8F=A0=E5=9B=BE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/chart/ChartViewService.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 5edfc6160d..40405655c2 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -494,7 +494,12 @@ public class ChartViewService {
                                 }
                             }
                             if (StringUtils.equals(a.toString(), x.get(i))) {
-                                ss.getData().set(i, new BigDecimal(row[xAxis.size() + extStack.size()]));
+                                if (row.length > xAxis.size() + extStack.size()) {
+                                    String s = row[xAxis.size() + extStack.size()];
+                                    if (StringUtils.isNotEmpty(s)) {
+                                        ss.getData().set(i, new BigDecimal(s));
+                                    }
+                                }
                                 break;
                             }
                         }

From dc0131ee050a929aa5f451192df7ff02cedcb234 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 16:50:43 +0800
Subject: [PATCH 12/17] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue    | 2 +-
 frontend/src/views/chart/view/ChartEdit.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 3f0e5c76e7..7f0588f3b0 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -257,13 +257,13 @@
 
     <!--添加视图-选择数据集-->
     <el-dialog
+      v-if="selectTableFlag"
       v-dialogDrag
       :title="$t('chart.add_chart')"
       :visible="selectTableFlag"
       :show-close="false"
       width="70%"
       class="dialog-css"
-      :destroy-on-close="true"
     >
       <el-row style="width: 800px;">
         <el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item">
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index c9911a4189..82dd8f15fe 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -489,13 +489,13 @@
 
     <!--视图更换数据集-->
     <el-dialog
+      v-if="selectTableFlag"
       v-dialogDrag
       :title="changeDsTitle"
       :visible="selectTableFlag"
       :show-close="false"
       width="70%"
       class="dialog-css"
-      :destroy-on-close="true"
     >
       <table-selector @getTable="getTable" />
       <p style="margin-top: 10px;color:#F56C6C;font-size: 12px;">{{ $t('chart.change_ds_tip') }}</p>
@@ -507,10 +507,10 @@
 
     <!--编辑视图使用的数据集的字段-->
     <el-dialog
+      v-if="editDsField"
       :visible="editDsField"
       :show-close="false"
       class="dialog-css"
-      :destroy-on-close="true"
       :fullscreen="true"
     >
       <field-edit :param="table" />

From cabb2665450c59e1067abdbc6d80536dd16fe57a Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 17:12:48 +0800
Subject: [PATCH 13/17] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E9=9B=86tr?=
 =?UTF-8?q?ee=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/common/DatasetGroupSelectorTree.vue    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
index 18e859b0fe..3664bce2b2 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
@@ -68,7 +68,6 @@
 
 <script>
 import { isKettleRunning, post } from '@/api/dataset/dataset'
-import { authModel } from '@/api/system/sysAuth'
 import { hasDataPermission } from '@/utils/permission'
 
 export default {
@@ -403,11 +402,14 @@ export default {
 
     searchTree(val) {
       const queryCondition = {
-        withExtend: 'parent',
-        modelType: 'dataset',
+        // withExtend: 'parent',
+        // modelType: 'dataset',
         name: val
       }
-      authModel(queryCondition).then(res => {
+      // authModel(queryCondition).then(res => {
+      //   this.data = this.buildTree(res.data)
+      // })
+      post('/dataset/table/search', queryCondition).then(res => {
         this.data = this.buildTree(res.data)
       })
     },
@@ -420,8 +422,8 @@ export default {
       const roots = []
       arrs.forEach(el => {
         // 判断根节点 ###
-        el.type = el.modelInnerType
-        el.isLeaf = el.leaf
+        // el.type = el.modelInnerType
+        // el.isLeaf = el.leaf
         if (el[this.treeProps.parentId] === null || el[this.treeProps.parentId] === 0 || el[this.treeProps.parentId] === '0') {
           roots.push(el)
           return

From 8bee21e36ac2cfedad5b9621123c1a8d20fd2c31 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 17:33:05 +0800
Subject: [PATCH 14/17] =?UTF-8?q?refactor:=20=E5=A0=86=E5=8F=A0=E9=A1=B9?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E6=8C=87=E6=A0=87=E6=8B=96=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 82dd8f15fe..c82559cf15 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1352,7 +1352,7 @@ export default {
       return resultNode
     },
     addStack(e) {
-      this.dragCheckType(this.dimensionData, 'd')
+      this.dragCheckType(this.view.extStack, 'd')
       if (this.view.extStack && this.view.extStack.length > 1) {
         this.view.extStack = [this.view.extStack[0]]
       }

From f909427422f6447363bfae4d72f564e537a01f1d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Aug 2021 18:37:24 +0800
Subject: [PATCH 15/17] =?UTF-8?q?feat:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue      |  5 +-
 .../components/Editor/ComponentWrapper.vue    |  2 +-
 .../canvas/components/Editor/EditBar.vue      | 48 ++++++++++++++++---
 .../canvas/components/Editor/Preview.vue      |  1 +
 .../canvas/components/Editor/index.vue        |  6 ++-
 .../components/canvas/components/Toolbar.vue  | 25 +++++++++-
 frontend/src/views/panel/edit/index.vue       |  6 ++-
 7 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 06a1c9c08a..f04a6e6211 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -19,7 +19,7 @@
     @mouseenter="enter"
     @mouseleave="leave"
   >
-    <edit-bar v-if="active" :active-model="'edit'" @showViewDetails="showViewDetails" />
+    <edit-bar v-if="active||linkageSettingStatus" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" />
     <div
       v-for="(handlei, indexi) in actualHandles"
       :key="indexi"
@@ -463,7 +463,8 @@ export default {
       'curComponent',
       'editor',
       'curCanvasScale',
-      'canvasStyleData'
+      'canvasStyleData',
+      'linkageSettingStatus'
     ])
   },
   watch: {
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index c5eca3650e..4b6da3a6ea 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -6,7 +6,7 @@
     @click="handleClick"
     @mousedown="elementMouseDown"
   >
-    <edit-bar v-if="config === curComponent" @showViewDetails="showViewDetails" />
+    <edit-bar v-if="config === curComponent" :element="config" @showViewDetails="showViewDetails" />
     <de-out-widget
       v-if="config.type==='custom'"
       :id="'component' + config.id"
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 7e768c3f4f..a86257ffa6 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -1,22 +1,34 @@
 <template>
   <div class="bar-main">
-    <setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;">
-      <i slot="icon" class="icon iconfont icon-shezhi" />
-    </setting-menu>
-    <i v-if="curComponent.type==='view'" class="icon iconfont icon-fangda" @click.stop="showViewDetails" />
-    <!--    <el-checkbox />-->
+    <div v-if="linkageSettingStatus" style="margin-right: 0px;width: 18px">
+      <el-checkbox v-model="linkageActiveStatus" />
+      <i v-if="linkageActiveStatus" class="icon iconfont icon-edit" @click.stop="linkageEdit" />
+    </div>
+    <div v-else>
+      <setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;">
+        <i slot="icon" class="icon iconfont icon-shezhi" />
+      </setting-menu>
+      <i v-if="activeModel==='edit'&&curComponent&&editFilter.includes(curComponent.type)" class="icon iconfont icon-edit" @click.stop="edit" />
+      <i v-if="curComponent.type==='view'" class="icon iconfont icon-fangda" @click.stop="showViewDetails" />
+    </div>
+
   </div>
 </template>
 
 <script>
 import { mapState } from 'vuex'
 import eventBus from '@/components/canvas/utils/eventBus'
+import bus from '@/utils/bus'
 import SettingMenu from '@/components/canvas/components/Editor/SettingMenu'
 
 export default {
   components: { SettingMenu },
 
   props: {
+    element: {
+      type: Object,
+      required: true
+    },
     active: {
       type: Boolean,
       required: false,
@@ -32,6 +44,7 @@ export default {
   data() {
     return {
       componentType: null,
+      linkageActiveStatus: false,
       editFilter: [
         'view',
         'custom'
@@ -44,11 +57,34 @@ export default {
     'menuShow',
     'curComponent',
     'componentData',
-    'canvasStyleData'
+    'canvasStyleData',
+    'linkageSettingStatus'
   ]),
   methods: {
     showViewDetails() {
       this.$emit('showViewDetails')
+    },
+    edit() {
+      // 编辑时临时保存 当前修改的画布
+      this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
+      this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
+      if (this.curComponent.type === 'view') {
+        this.$store.dispatch('chart/setViewId', null)
+        this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
+        bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' }})
+      }
+      if (this.curComponent.type === 'custom') {
+        bus.$emit('component-dialog-edit')
+      }
+
+      // 编辑样式组件
+
+      if (this.curComponent.type === 'v-text' || this.curComponent.type === 'rect-shape') {
+        bus.$emit('component-dialog-style')
+      }
+    },
+    linkageEdit() {
+
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 9b6728fbf5..8e5d3cd9d4 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -153,6 +153,7 @@ export default {
       this.searchCount++
     }, refreshTime)
     eventBus.$on('openChartDetailsDialog', this.openChartDetailsDialog)
+    this.$store.commit('setLinkageSettingStatus', false)
   },
   beforeDestroy() {
     clearInterval(this.timer)
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index e54dc297ff..91fb7c8a73 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -8,7 +8,7 @@
     @mousedown="handleMouseDown"
   >
     <!-- 网格线 -->
-    <Grid v-if="canvasStyleData.auxiliaryMatrix" :matrix-style="matrixStyle" />
+    <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />
     <!--页面组件列表展示-->
     <de-drag
       v-for="(item, index) in componentData"
@@ -29,6 +29,7 @@
       :snap="true"
       :snap-tolerance="2"
       :change-style="customStyle"
+      :draggable="!linkageSettingStatus"
       @refLineParams="getRefLineParams"
       @showViewDetails="showViewDetails(index)"
     >
@@ -249,7 +250,8 @@ export default {
       'componentData',
       'curComponent',
       'canvasStyleData',
-      'editor'
+      'editor',
+      'linkageSettingStatus'
     ])
   },
   watch: {
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 8d8bb5569a..c63c4544b6 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -1,6 +1,17 @@
 <template>
   <div>
-    <div class="toolbar">
+    <!--    linkageActiveStatus:{{ linkageActiveStatus }}-->
+    <div v-if="linkageSettingStatus" class="toolbar">
+      <span style="float: right;">
+        <el-button size="mini" @click="saveLinkage">
+          {{ $t('commons.confirm') }}
+        </el-button>
+        <el-button size="mini" @click="cancelLinkage">
+          {{ $t('commons.cancel') }}
+        </el-button>
+      </span>
+    </div>
+    <div v-else class="toolbar">
 
       <div class="canvas-config" style="margin-right: 10px">
         <el-switch v-model="canvasStyleData.auxiliaryMatrix" :width="35" name="auxiliaryMatrix" />
@@ -125,7 +136,8 @@ export default {
     'curComponent',
     'changeTimes',
     'snapshotIndex',
-    'lastSaveSnapshotIndex'
+    'lastSaveSnapshotIndex',
+    'linkageSettingStatus'
   ]),
 
   created() {
@@ -302,6 +314,15 @@ export default {
     },
     closeNotSave() {
       this.close()
+    },
+    saveLinkage() {
+      this.cancelLinkageSettingStatus()
+    },
+    cancelLinkage() {
+      this.cancelLinkageSettingStatus()
+    },
+    cancelLinkageSettingStatus() {
+      this.$store.commit('setLinkageSettingStatus', false)
     }
   }
 }
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index d02c121d19..3fb4e2ee29 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -21,7 +21,7 @@
     <de-container>
       <!--左侧导航栏-->
       <de-aside-container class="ms-aside-container">
-        <div style="width: 60px; left: 0px; top: 0px; bottom: 0px;  position: absolute">
+        <div v-if="!linkageSettingStatus" style="width: 60px; left: 0px; top: 0px; bottom: 0px;  position: absolute">
           <div style="width: 60px;height: 100%;overflow: hidden auto;position: relative;margin: 0px auto; font-size: 14px">
             <!-- 视图图表 start -->
             <div class="button-div-class" style=" width: 24px;height: 24px;text-align: center;line-height: 1;position: relative;margin: 16px auto 0px;">
@@ -290,7 +290,8 @@ export default {
       'isClickComponent',
       'canvasStyleData',
       'curComponentIndex',
-      'componentData'
+      'componentData',
+      'linkageSettingStatus'
     ])
   },
 
@@ -322,6 +323,7 @@ export default {
     listenGlobalKeyDown()
 
     this.$store.commit('setCurComponent', { component: null, index: null })
+    this.$store.commit('setLinkageSettingStatus', false)
   },
   mounted() {
     // this.insertToBody()

From 94be9ecb251c3c95d138c5ceec7f3ae5eb3eef0a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Aug 2021 18:45:42 +0800
Subject: [PATCH 16/17] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/Editor/EditBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index a86257ffa6..5019550b73 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="bar-main">
-    <div v-if="linkageSettingStatus" style="margin-right: 0px;width: 18px">
+    <div v-if="linkageSettingStatus" style="margin-right: -1px;width: 18px">
       <el-checkbox v-model="linkageActiveStatus" />
       <i v-if="linkageActiveStatus" class="icon iconfont icon-edit" @click.stop="linkageEdit" />
     </div>

From ae520246bd074afc1d7c08dc87c4221aa446cc4a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Aug 2021 18:50:42 +0800
Subject: [PATCH 17/17] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=85=A5=E5=8F=A3=E9=BC=A0=E6=A0=87=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E5=8E=BB=E6=8E=89=E9=A2=9C=E8=89=B2=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue | 38 ++++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index f04a6e6211..3af079217f 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -1631,26 +1631,26 @@ export default {
   user-select: none;
 }
 
-.mouseOn >>> .icon-shezhi{
-  z-index: 2;
-  display:block!important;
-}
-.vdr > i{
-  right: 5px;
-  color: gray;
-  position: absolute;
-}
+/*.mouseOn >>> .icon-shezhi{*/
+/*  z-index: 2;*/
+/*  display:block!important;*/
+/*}*/
+/*.vdr > i{*/
+/*  right: 5px;*/
+/*  color: gray;*/
+/*  position: absolute;*/
+/*}*/
 
-.vdr >>> i:hover {
-  color: red;
-}
+/*.vdr >>> i:hover {*/
+/*  color: red;*/
+/*}*/
 
-.vdr:hover >>> i {
-  z-index: 2;
-  display:block;
-}
+/*.vdr:hover >>> i {*/
+/*  z-index: 2;*/
+/*  display:block;*/
+/*}*/
 
-.vdr>>>.icon-shezhi {
-  display:none
-}
+/*.vdr>>>.icon-shezhi {*/
+/*  display:none*/
+/*}*/
 </style>