王嘉豪
GitHub
commit
84364d532b
@ -28,6 +28,8 @@ public interface ExtChartViewMapper {
|
||||
|
||||
void chartCopyWithPanel(@Param("copyId") String copyId);
|
||||
|
||||
void chartFiledCopyWithPanel(@Param("copyId") String copyId);
|
||||
|
||||
void deleteCircleView(@Param("pid") String pid);
|
||||
|
||||
void deleteCircleGroup(@Param("pid") String pid);
|
||||
|
||||
@ -592,4 +592,51 @@
|
||||
<select id="chartOptions" resultType="io.dataease.dto.chart.ViewOption">
|
||||
select id, title as name from chart_view where scene_id = #{panelId}
|
||||
</select>
|
||||
|
||||
<insert id='chartFiledCopyWithPanel'>
|
||||
INSERT INTO chart_view_field (
|
||||
id,
|
||||
table_id,
|
||||
chart_id,
|
||||
`name`,
|
||||
dataease_name,
|
||||
group_type,
|
||||
`type`,
|
||||
`size`,
|
||||
de_type,
|
||||
de_type_format,
|
||||
de_extract_type,
|
||||
ext_field,
|
||||
`checked`,
|
||||
column_index,
|
||||
last_sync_time
|
||||
) SELECT
|
||||
uuid() AS id,
|
||||
chart_view_field.table_id,
|
||||
chart_view_field.pv_copy.chart_view_id AS chart_id,
|
||||
chart_view_field.`name`,
|
||||
chart_view_field.dataease_name,
|
||||
chart_view_field.group_type,
|
||||
chart_view_field.`type`,
|
||||
chart_view_field.`size`,
|
||||
chart_view_field.de_type,
|
||||
chart_view_field.de_type_format,
|
||||
chart_view_field.de_extract_type,
|
||||
chart_view_field.ext_field,
|
||||
chart_view_field.`checked`,
|
||||
chart_view_field.column_index,
|
||||
chart_view_field.last_sync_time
|
||||
FROM
|
||||
(
|
||||
SELECT
|
||||
panel_id,
|
||||
copy_from_view,
|
||||
chart_view_id
|
||||
FROM
|
||||
panel_view
|
||||
WHERE
|
||||
copy_id = #{copyId}
|
||||
) pv_copy
|
||||
INNER JOIN chart_view_field ON chart_view_field.chart_id = pv_copy.copy_from_view
|
||||
</insert>
|
||||
</mapper>
|
||||
|
||||
@ -352,6 +352,8 @@ public class PanelGroupService {
|
||||
extPanelViewMapper.copyFromPanel(newPanelId, sourcePanelId, copyId);
|
||||
//TODO 复制视图 chart_view
|
||||
extChartViewMapper.chartCopyWithPanel(copyId);
|
||||
//TODO 复制视图字段 chart_view_field
|
||||
extChartViewMapper.chartFiledCopyWithPanel(copyId);
|
||||
//TODO 替换panel_data viewId 数据
|
||||
List<PanelView> panelViewList = panelViewService.findPanelViews(copyId);
|
||||
//TODO 复制模板缓存数据
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
INSERT INTO `sys_menu` VALUES (700, 1, 2, 1, '系统配置', 'sys-settings', 'system/settings/index', 12, 'sys-tools', 'system-settings', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
|
||||
INSERT INTO `sys_menu` VALUES (710, 700, 0, 1, '外观配置', 'sys-appearance', 'system/settings/AppearanceSetting', 2, 'sys-tools', 'appearance', b'0', b'0', b'0', 'appearance:read', NULL, NULL, NULL, NULL);
|
||||
|
||||
INSERT INTO `sys_menu` VALUES (730, 1, 0, 1, '数据同步表单', 'sys-task-ds-form', 'system/task/form', 11, NULL, '/task-ds-form', b'1', b'0', b'1', NULL, NULL, NULL, NULL, NULL);
|
||||
|
||||
UPDATE `sys_menu` set pid = 700, menu_sort = 1 where menu_id = 6 and `name` = 'system-param';
|
||||
@ -72,3 +72,10 @@ UPDATE `sys_theme` set `origin_id` = 1 where `id` = 1;
|
||||
UPDATE `sys_theme` set `origin_id` = 2 where `id` = 2;
|
||||
UPDATE `sys_theme` set `origin_id` = 1 where origin_id is null;
|
||||
COMMIT;
|
||||
|
||||
|
||||
UPDATE `panel_subject`
|
||||
SET
|
||||
`details` = '{\"width\":1600,\"height\":900,\"scale\":100,\"scaleWidth\":100,\"scaleHeight\":100,\"selfAdaption\":true,\"auxiliaryMatrix\":true,\"openCommonStyle\":true,\"panel\":{\"themeColor\":\"dark\",\"color\":\"#030B2E\",\"imageUrl\":{},\"backgroundType\":\"color\",\"gap\":\"yes\",\"resultMode\":\"all\",\"resultCount\":1000},\"aidedDesign\":{\"showGrid\":false,\"matrixBase\":4},\"refreshViewLoading\":true,\"refreshUnit\":\"minute\",\"refreshTime\":5,\"themeId\":\"c9d63e10-2827-11ed-afd9-69d86fea45a0\",\"chartInfo\":{\"chartTitle\":{\"show\":true,\"fontSize\":\"18\",\"color\":\"#FFFFFF\",\"hPosition\":\"left\",\"vPosition\":\"top\",\"isItalic\":false,\"isBolder\":true,\"remarkShow\":false,\"remark\":\"\",\"remarkBackgroundColor\":\"#ffffffff\",\"fontFamily\":\"Microsoft YaHei\",\"letterSpace\":\"0\",\"fontShadow\":false},\"chartColor\":{\"value\":\"default\",\"colors\":[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\"],\"alpha\":100,\"tableHeaderBgColor\":\"#4E81BB\",\"tableItemBgColor\":\"#131E42\",\"tableFontColor\":\"#ffffff\",\"tableStripe\":true,\"dimensionColor\":\"#ffffff\",\"quotaColor\":\"#4E81BB\",\"tableBorderColor\":\"#CCCCCC\",\"seriesColors\":[],\"areaBorderColor\":\"#EBEEF5\"},\"chartCommonStyle\":{\"backgroundColorSelect\":true,\"color\":\"#131E42\",\"alpha\":100,\"borderRadius\":5,\"innerPadding\":0},\"filterStyle\":{\"horizontal\":\"left\",\"vertical\":\"top\",\"color\":\"#FFFFFF\",\"brColor\":\"#4E4B4B\",\"wordColor\":\"#FFFFFF\",\"innerBgColor\":\"#131E42\"},\"tabStyle\":{\"headFontColor\":\"#FFFFFF\",\"headFontActiveColor\":\"#FFFFFF\",\"headBorderColor\":\"\",\"headBorderActiveColor\":\"\"}}}'
|
||||
WHERE
|
||||
`id` = 'system_2';
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
\u4E2A\u4EBA\u4FE1\u606F=Personal Information
|
||||
\u4EEA\u8868\u677F=Dashboard
|
||||
\u6A21\u677F\u5E02\u573A=Template Market
|
||||
\u4FEE\u6539\u5BC6\u7801=Change Password
|
||||
\u521B\u5EFA\u7528\u6237=Create User
|
||||
\u521B\u5EFA\u7EC4\u7EC7=Create Organization
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
\u4E2A\u4EBA\u4FE1\u606F=\u4E2A\u4EBA\u4FE1\u606F
|
||||
\u4EEA\u8868\u677F=\u4EEA\u8868\u677F
|
||||
\u6A21\u677F\u5E02\u573A=\u6A21\u677F\u5E02\u573A
|
||||
\u4FEE\u6539\u5BC6\u7801=\u4FEE\u6539\u5BC6\u7801
|
||||
\u521B\u5EFA\u7528\u6237=\u521B\u5EFA\u7528\u6237
|
||||
\u521B\u5EFA\u7EC4\u7EC7=\u521B\u5EFA\u7EC4\u7EC7
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
\u4E2A\u4EBA\u4FE1\u606F=\u500B\u4EBA\u4FE1\u606F
|
||||
\u4EEA\u8868\u677F=\u5100\u8868\u677F
|
||||
\u6A21\u677F\u5E02\u573A=\u6A21\u677F\u5E02\u5834
|
||||
\u4FEE\u6539\u5BC6\u7801=\u4FEE\u6539\u5BC6\u78BC
|
||||
\u521B\u5EFA\u7528\u6237=\u5275\u5EFA\u7528\u6236
|
||||
\u521B\u5EFA\u7EC4\u7EC7=\u5275\u5EFA\u7D44\u7E54
|
||||
|
||||
@ -112,6 +112,8 @@ export default {
|
||||
this.canEdit = false
|
||||
this.reShow()
|
||||
this.myValue = this.assignment(this.element.propValue.textValue)
|
||||
const ed = tinymce.editors[this.tinymceId]
|
||||
ed.setContent(this.myValue)
|
||||
}
|
||||
},
|
||||
myValue(newValue) {
|
||||
|
||||
@ -607,7 +607,7 @@ export default {
|
||||
clear_filter: 'Empty condition',
|
||||
recover_pwd: 'Restore to the original password?',
|
||||
filter_method: 'Filter criteria',
|
||||
filter: 'screen',
|
||||
filter: 'Screen',
|
||||
list: 'List item',
|
||||
list_info: 'Please select the information to be displayed in the list',
|
||||
sure_delete: 'Are you sure to delete this user?'
|
||||
@ -716,8 +716,8 @@ export default {
|
||||
search_by_name: 'Search by name',
|
||||
special_characters_are_not_supported: 'Format error (special characters are not supported and cannot start and end with \'-\')',
|
||||
select: 'Select organization',
|
||||
member: 'member',
|
||||
organization: 'organization',
|
||||
member: 'Member',
|
||||
organization: 'Organization',
|
||||
add_user: 'Add user',
|
||||
sure_move_user: 'Are you sure to remove this user from the organization?',
|
||||
move_success: 'Removed successfully',
|
||||
@ -735,10 +735,10 @@ export default {
|
||||
edite_organization: 'Edit organization'
|
||||
},
|
||||
system_parameter_setting: {
|
||||
mailbox_service_settings: 'Mail Settings',
|
||||
mailbox_service_settings: 'Mail Setting',
|
||||
test_connection: 'Test connection',
|
||||
SMTP_host: 'SMTP Host',
|
||||
basic_setting: 'Basic setting',
|
||||
basic_setting: 'Basic Setting',
|
||||
front_time_out: 'Request timeOut(unit: second, Attention: Refresh browser takes effect after saving)',
|
||||
msg_time_out: 'Message retention time(unit: day)',
|
||||
login_type: 'Default login type',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user