github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into pr@dev_dataset_source

Browse Source
This commit is contained in:
dataeaseShu 2022-09-26 10:10:54 +08:00
commit e40aba37a2
8 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/resources/db/migration/V40__1.15.sql
View File

@ -26,8 +26,6 @@ INSERT INTO `task_instance` (`task_id`) VALUES ('Datasource_check_status');
update sys_menu set menu_sort=10 where menu_id=1;
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 (41, 1, 1, 1, '应用管理', 'system-app-template', 'panel/appTemplate/index', 13, 'sys-param', 'panel/appTemplate/index', 0, 0, 0, NULL, NULL, NULL, NULL, 1620444227389);
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 (203, 0, 0, 1, '应用市场', 'app-template-market', 'panel/appTemplateMarket/index', 6, 'dashboard', '/appTemplateMarket', 0, 0, 0, NULL, NULL, NULL, NULL, 1620444227389);
-- ----------------------------
-- Table structure for panel_app_template
-- ----------------------------

1
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -43,6 +43,7 @@
\u91CD\u7F6E\u5BC6\u7801=Reset Password
\u5173\u4E8E=About Us
\u9996\u9875=Home Page
\u7528\u6237key=User Key
i18n_auth_view=View
i18n_auth_use=Use
i18n_auth_export=Export

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -43,6 +43,7 @@
\u91CD\u7F6E\u5BC6\u7801=\u91CD\u7F6E\u5BC6\u7801
\u5173\u4E8E=\u5173\u4E8E
\u9996\u9875=\u9996\u9875
\u7528\u6237key=\u7528\u6237key
i18n_auth_view=\u67E5\u770B
i18n_auth_use=\u4F7F\u7528
i18n_auth_export=\u5BFC\u51FA

1
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -43,6 +43,7 @@
\u91CD\u7F6E\u5BC6\u7801=\u91CD\u7F6E\u5BC6\u78BC
\u5173\u4E8E=\u95DC\u65BC
\u9996\u9875=\u9996\u9801
\u7528\u6237key=\u7528\u6236key
i18n_auth_view=\u67E5\u770B
i18n_auth_use=\u4F7F\u7528
i18n_auth_export=\u5C0E\u51FA

2
frontend/src/components/canvas/components/TextAttr.vue
View File

@ -218,7 +218,7 @@ export default {
innerOpacity: 0,
mainWidthOffset: 600,
initFontSize: 12,
miniFontSize: 12,
miniFontSize: 0,
maxFontSize: 128,
textAlignOptions: [
{

2
frontend/src/components/canvas/custom-component/DeRichTextView.vue
View File

@ -194,8 +194,8 @@ export default {
if (this.editStatus&&this.canEdit===false) {
this.canEdit = true
this.element['editing'] = true
this.reShow()
this.myValue = this.element.propValue.textValue
this.reShow()
}
},
reShow() {

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

@ -1638,8 +1638,8 @@ export default {
desensitization: 'Desensitization'
},
row_permissions: 'Row Permissions',
column_permissions: '列权限',
row_column_permissions: '行列权限',
column_permissions: 'Column Permissions',
row_column_permissions: 'Row And Column Permissions',
union_data: 'Union Dataset',
add_union_table: 'Add Union Dataset',
edit_union: 'Edit Union Dataset',

6
frontend/src/views/panel/LinkJumpSet/index.vue
View File

@ -362,8 +362,10 @@ export default {
const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
let checkJumpStr
if (chartDetails.type === 'table-pivot') {
checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt
} else {
checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
}else if(chartDetails.type === 'table-info') {
checkJumpStr = chartDetails.xaxis + chartDetails.drillFields
}else {
checkJumpStr = checkAllAxisStr
}
// 获取可关联的仪表板