From 66c2e4eaaa1f66d992ccfa7acd3112bf9d559e58 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 17 Aug 2022 13:52:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=A8=A1=E7=89=88=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/AsyncComponent/index.vue | 1 - .../components/business/DeLayoutContent.vue | 3 +- frontend/src/components/deCustomCm/deBtn.vue | 355 +++++++++++ frontend/src/components/msgCfm/index.js | 40 ++ frontend/src/lang/en.js | 77 ++- frontend/src/lang/tw.js | 77 ++- frontend/src/lang/zh.js | 85 ++- frontend/src/main.js | 3 + frontend/src/styles/index.scss | 205 ++++++- .../template/component/TemplateImport.vue | 263 +++++---- .../panel/template/component/TemplateItem.vue | 193 +++--- .../panel/template/component/TemplateList.vue | 324 +++++++---- frontend/src/views/panel/template/index.vue | 438 +++++++++----- .../views/system/SysParam/BasicSetting.vue | 343 ++++++----- .../system/SysParam/ClusterModeSetting.vue | 549 +++++++++++------- .../views/system/SysParam/EmailSetting.vue | 388 ++++++++----- .../views/system/SysParam/KettleSetting.vue | 426 +++++++++----- .../SysParam/MapSetting/MapSettingLeft.vue | 4 +- .../SysParam/MapSetting/MapSettingRight.vue | 4 +- .../system/SysParam/SimpleModeSetting.vue | 6 +- frontend/src/views/system/SysParam/index.vue | 224 ++++--- .../src/views/system/SysParam/operater.vue | 36 ++ frontend/src/views/system/plugin/dynamic.vue | 8 +- .../system/settings/AppearanceSetting.vue | 72 ++- frontend/src/views/system/user/index.vue | 1 + 25 files changed, 2910 insertions(+), 1215 deletions(-) create mode 100644 frontend/src/components/deCustomCm/deBtn.vue create mode 100644 frontend/src/components/msgCfm/index.js create mode 100644 frontend/src/views/system/SysParam/operater.vue diff --git a/frontend/src/components/AsyncComponent/index.vue b/frontend/src/components/AsyncComponent/index.vue index e3cd7d212c..485e46a61e 100644 --- a/frontend/src/components/AsyncComponent/index.vue +++ b/frontend/src/components/AsyncComponent/index.vue @@ -49,7 +49,6 @@ export default { } else { res = await window.SyncComponentCache[this.url] } - if (res) { const Fn = Function const dynamicCode = res.data || res diff --git a/frontend/src/components/business/DeLayoutContent.vue b/frontend/src/components/business/DeLayoutContent.vue index e38271e634..ddd0a8bfff 100644 --- a/frontend/src/components/business/DeLayoutContent.vue +++ b/frontend/src/components/business/DeLayoutContent.vue @@ -34,7 +34,7 @@ export default { return backPath || backName || backTo }, needInnerPadding() { - return ['system-dept', 'system-dept-form', 'system-auth'].includes(this.$route.name) + return ['system-dept', 'system-dept-form', 'system-auth', 'sys-appearance', 'system-param', 'system-template'].includes(this.$route.name) } } } @@ -77,6 +77,7 @@ export default { .layout-inner-padding { padding: 0; margin-top: 16px; + overflow: hidden; } } diff --git a/frontend/src/components/deCustomCm/deBtn.vue b/frontend/src/components/deCustomCm/deBtn.vue new file mode 100644 index 0000000000..3a19b42e73 --- /dev/null +++ b/frontend/src/components/deCustomCm/deBtn.vue @@ -0,0 +1,355 @@ + + + \ No newline at end of file diff --git a/frontend/src/components/msgCfm/index.js b/frontend/src/components/msgCfm/index.js new file mode 100644 index 0000000000..b4bd469128 --- /dev/null +++ b/frontend/src/components/msgCfm/index.js @@ -0,0 +1,40 @@ + +export default { + methods: { + openMessageSuccess(text, type) { + const h = this.$createElement; + const iconClass = `el-icon-${ type || 'success'}`; + const customClass = `de-message-${ type || 'success'} de-message`; + this.$message({ + message: h("p", null, [h("span", null, this.$t(text))]), + iconClass, + customClass, + }); + }, + handlerConfirm(options) { + let { title, content, type = 'danger', cb, confirmButtonText = this.$t('commons.delete'), showCancelButton = true, cancelButtonText = this.$t("commons.cancel") } = options; + let text = content ? `${ this.$t(title) }
${ this.$t(content) }` : this.$t(title); + const dangerouslyUseHTMLString = Boolean(content); + let customClass = `de-confirm de-confirm-fail ${ dangerouslyUseHTMLString && 'de-use-html'}` + let confirmButtonClass = `de-confirm-${type}-btn de-confirm-btn` + this.$confirm( + text, + "", + { + confirmButtonText, + cancelButtonText, + showCancelButton, + cancelButtonClass: "de-confirm-btn de-confirm-plain-cancel", + dangerouslyUseHTMLString, + confirmButtonClass, + customClass, + iconClass: "el-icon-warning", + } + ) + .then(() => { + cb(); + }) + .catch(() => {}); + }, + }, +}; diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 4a2c80ece0..e6338d1984 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -716,7 +716,82 @@ export default { engine_mode_setting: 'Engine Setting', kettle_setting: 'Kettle Setting', cas_selected_warn: 'Selecting CAS will cause you to login again', - cas_reset: 'CAS switches back to the default login mode to access API:' + cas_reset: 'CAS switches back to the default login mode to access API:', + main_color: 'Main color', + success_color: 'Success color', + warning_color: 'Warning color:', + wrong_color: 'Wrong color', + main_text_color: 'Main text color', + secondary_font_color: 'Secondary font color', + prompt_font_color: 'Prompt font color', + disable_font_color: 'Disable font color', + component_stroke_color: 'Component stroke color', + card_stroke_color: 'Card stroke color', + basic_white: 'Basic white', + page_background_color: 'Page background color', + disable_background_color: 'Input box: disable background color', + basic_black: 'Basic black', + label_color: 'Label color:', + system_theme: 'System theme', + custom_theme: 'Custom theme', + color_settings: 'Color settings', + add_theme: 'Add theme', + subject_based: 'Subject based', + the_subject_name: 'Please enter the subject name', + name_already_exists: 'The subject name already exists', + successfully_and_apply: 'Save successfully and apply', + sure_to_exit: 'The information you filled in has not been saved. Are you sure to exit?', + copy_theme: 'Copy theme', + advanced_configuration: 'Advanced configuration', + no_custom_theme: 'No custom theme', + recommended_size: 'Recommended size:', + support: 'support', + no_more_than: 'Size no more than', + request_timeout: 'Request timeout', + message_retention_time: 'Message retention time', + test_mail_recipient: 'Used only as a test mail recipient', + to_enable_tsl: 'If the SMTP port is 587, you usually need to enable TSL', + to_enable_ssl: 'If the SMTP port is 465, you usually need to enable SSL', + added_successfully: 'Added successfully', + text_link_etc: 'Applicable scenarios: call to action, selected status, information highlight, general prompt information, text link, etc', + prompt_and_icon: 'Applicable scenario: success status prompt and Icon', + prompt_and_icon_danger: 'Applicable scenario: warning status prompt and Icon', + icon_danger_button: 'Applicable scenario: error status prompt and icon, danger button', + first_level_icon: 'Applicable scenario: first level title, first level text, important information display, first level Icon', + copy_secondary_icon: 'Applicable scenario: secondary title, secondary copy, secondary Icon', + radio_checkbox_unchecked: 'Applicable scenario: input box guide, auxiliary copy, prompt copy, three-level icon, radio, checkbox unchecked', + button_background_color: 'Applicable scenario: disable copy, disable icon, disable button background color', + background_header_background: 'Applicable scenario: page background, header background', + scenario_component_stroking: 'Applicable scenario: component stroking', + main_background: 'Main background', + content_background: 'Content background', + select_font: 'Select font', + no_font_selected: 'No font selected', + head_background: 'Head background', + head_font: 'Head font', + menu_floating_background: 'Menu floating background', + menu_selection_background: 'Menu selection background', + left_menu_background: 'Left menu background', + left_menu_font: 'Left menu font', + table_background: 'Table background', + table_font: 'Table font', + table_borders: 'Table borders', + subject_name: 'Subject name', + template_name: 'Template name', + search_keywords: 'Search keywords:', + delete_this_topic: 'Are you sure to delete this topic?', + network_error: 'network error', + to_overwrite_them: 'There are templates with the same name in the current classification. Do you want to overwrite them?', + import_succeeded: 'Import succeeded', + name_already_exists_type: 'Classification name already exists', + rename_succeeded: 'Rename succeeded', + the_same_category: 'The template name already exists under the same category', + delete_this_template: 'Are you sure to delete this template?', + also_be_deleted: 'After deletion, all templates in this category will also be deleted.', + delete_this_category: 'Are you sure to delete this category?', + edit_template: 'Edit template', + edit_classification: 'Edit classification', + classification_name: 'Classification Name:' }, chart: { view_reset: 'View Reset', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 937408af50..173d69bf77 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -717,7 +717,82 @@ export default { engine_mode_setting: '引擎設置', kettle_setting: 'Kettle 設置', cas_selected_warn: '選擇CAS方式保存後會註銷當前回話，重新登錄', - cas_reset: 'CAS切換回默認登錄方式訪問API：' + cas_reset: 'CAS切換回默認登錄方式訪問API：', + main_color: '主色', + success_color: '成功顏色', + warning_color: '警示顏色', + wrong_color: '錯誤顏色', + main_text_color: '主要文字顏色', + secondary_font_color: '二級字體顏色', + prompt_font_color: '提示字體顏色', + disable_font_color: '禁用字體顏色', + component_stroke_color: '組件描邊顏色', + card_stroke_color: '卡片描邊顏色', + basic_white: '基礎白色', + page_background_color: '頁面背景色', + disable_background_color: '輸入框禁用背景色', + basic_black: '基礎黑色', + label_color: '標籤顏色', + system_theme: '系統主題', + custom_theme: '自定義主題', + color_settings: '配色設定', + add_theme: '添加主題', + subject_based: '基於主題', + the_subject_name: '請輸入主題名稱', + name_already_exists: '主題名稱已存在', + successfully_and_apply: '保存成功並應用', + sure_to_exit: '你填寫的資訊未保存，確認退出嗎？', + copy_theme: '複製主題', + advanced_configuration: '高級配寘', + no_custom_theme: '暫無自定義主題', + recommended_size: '建議尺寸', + support: '支持', + no_more_than: '大小不超過', + request_timeout: '請求超時時間', + message_retention_time: '消息保留時間', + test_mail_recipient: '僅用來作為測試郵件收件人', + to_enable_tsl: '如果SMTP埠是587，通常需要啟用TSL', + to_enable_ssl: '如果SMTP埠是465，通常需要啟用SSL', + added_successfully: '添加成功', + text_link_etc: '適用場景：行動號召、選中態、資訊高亮、常規提示資訊、文字連結等', + prompt_and_icon: '適用場景：成功狀態提示及圖標', + prompt_and_icon_danger: '適用場景：警示狀態提示及圖標', + icon_danger_button: '適用場景：錯誤狀態提示及圖標、危險按鈕', + first_level_icon: '適用場景：一級標題、一級正文、重要資訊展示、一級圖標', + copy_secondary_icon: '適用場景：二級標題、二級文案、二級圖標', + radio_checkbox_unchecked: '適用場景：輸入框引導語、輔助文案、提示文案、三級圖標、radio、checkbox未選中態', + button_background_color: '適用場景：禁用文案、禁用圖標、禁用按鈕背景色', + background_header_background: '適用場景：頁面背景、表頭背景', + scenario_component_stroking: '適用場景：組件描邊', + main_background: '主背景', + content_background: '內容背景', + select_font: '選中字體', + no_font_selected: '未選中字體', + head_background: '頭部背景', + head_font: '頭部字體', + menu_floating_background: '選單懸浮背景', + menu_selection_background: '選單選中背景', + left_menu_background: '左側選單背景', + left_menu_font: '左側選單字體', + table_background: '表格背景', + table_font: '表格字體', + table_borders: '表格邊框', + subject_name: '主題名稱', + template_name: '模版名稱', + search_keywords: '蒐索關鍵字', + delete_this_topic: '確定删除該主題嗎？', + network_error: '網絡錯誤', + to_overwrite_them: '當前分類存在相同名稱模版，是否覆蓋？', + import_succeeded: '導入成功', + name_already_exists_type: '分類名稱已存在', + rename_succeeded: '重命名成功', + the_same_category: '同一分類下，該模版名稱已存在', + delete_this_template: '確定删除該模版嗎？', + also_be_deleted: '删除後，該分類中所有的模版也將被删除。', + delete_this_category: '確定删除該分類嗎？', + edit_template: '編輯模版', + edit_classification: '編輯分類', + classification_name: '分類名稱' }, chart: { view_reset: '視圖重置', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 0669a1c323..887112bc01 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -693,7 +693,7 @@ export default { edite_organization: '编辑组织' }, system_parameter_setting: { - mailbox_service_settings: '邮件设置', + mailbox_service_settings: '邮件设置', test_connection: '测试连接', SMTP_host: 'SMTP主机', basic_setting: '基础设置', @@ -718,7 +718,82 @@ export default { engine_mode_setting: '引擎设置', kettle_setting: 'Kettle 设置', cas_selected_warn: '选择CAS方式保存后会注销当前回话，重新登录', - cas_reset: 'CAS切换回默认登录方式访问API：' + cas_reset: 'CAS切换回默认登录方式访问API：', + main_color: '主色', + success_color: '成功颜色', + warning_color: '警示颜色', + wrong_color: '错误颜色', + main_text_color: '主要文字颜色', + secondary_font_color: '二级字体颜色', + prompt_font_color: '提示字体颜色', + disable_font_color: '禁用字体颜色', + component_stroke_color: '组件描边颜色', + card_stroke_color: '卡片描边颜色', + basic_white: '基础白色', + page_background_color: '页面背景色', + disable_background_color: '输入框禁用背景色', + basic_black: '基础黑色', + label_color: '标签颜色', + system_theme: '系统主题', + custom_theme: '自定义主题', + color_settings: '配色设置', + add_theme: '添加主题', + subject_based: '基于主题', + the_subject_name: '请输入主题名称', + name_already_exists: '主题名称已存在', + successfully_and_apply: '保存成功并应用', + sure_to_exit: '你填写的信息未保存，确认退出吗？', + copy_theme: '复制主题', + advanced_configuration: '高级配置', + no_custom_theme: '暂无自定义主题', + recommended_size: '建议尺寸 ', + support: '支持', + no_more_than: '大小不超过', + request_timeout: '请求超时时间', + message_retention_time: '消息保留时间', + test_mail_recipient: '仅用来作为测试邮件收件人', + to_enable_tsl: '如果SMTP端口是587，通常需要启用TSL', + to_enable_ssl: '如果SMTP端口是465，通常需要启用SSL', + added_successfully: '添加成功', + text_link_etc: '适用场景：行动号召、选中态、信息高亮、常规提示信息、文字链接等', + prompt_and_icon: '适用场景：成功状态提示及图标', + prompt_and_icon_danger: '适用场景：警示状态提示及图标', + icon_danger_button: '适用场景：错误状态提示及图标、危险按钮', + first_level_icon: '适用场景：一级标题、一级正文、重要信息展示、一级图标', + copy_secondary_icon: '适用场景：二级标题、二级文案、二级图标', + radio_checkbox_unchecked: '适用场景：输入框引导语、辅助文案、提示文案、三级图标、radio、checkbox未选中态', + button_background_color: '适用场景：禁用文案、禁用图标、禁用按钮背景色', + scenario_component_stroking: '适用场景：组件描边', + background_header_background: '适用场景：页面背景、表头背景', + main_background: '主背景', + content_background: '内容背景', + select_font: '选中字体', + no_font_selected: '未选中字体', + head_background: '头部背景', + head_font: '头部字体', + menu_floating_background: '菜单悬浮背景', + menu_selection_background: '菜单选中背景', + left_menu_background: '左侧菜单背景', + left_menu_font: '左侧菜单字体', + table_background: '表格背景', + table_font: '表格字体', + table_borders: '表格边框', + subject_name: '主题名称', + template_name: '模版名称', + search_keywords: '搜索关键词', + delete_this_topic: '确定删除该主题吗？', + network_error: '网络错误', + to_overwrite_them: '当前分类存在相同名称模版，是否覆盖？', + import_succeeded: '导入成功', + name_already_exists_type: '分类名称已存在', + rename_succeeded: '重命名成功', + the_same_category: '同一分类下，该模版名称已存在', + delete_this_template: '确定删除该模版吗？', + also_be_deleted: '删除后，该分类中所有的模版也将被删除。', + delete_this_category: '确定删除该分类吗？', + edit_template: '编辑模版', + edit_classification: '编辑分类', + classification_name: '分类名称' }, chart: { view_reset: '视图重置', @@ -1900,14 +1975,14 @@ export default { un_install_error: '卸载失败，请联系管理员' }, display: { - logo: '头部系统logo', - loginLogo: '登录页面头部logo', + logo: '头部系统LOGO', + loginLogo: '登录页面头部LOGO', loginImage: '登录页面右侧图片', loginTitle: '登录页面标题', title: '系统名称', advice_size: '建议图片大小', theme: '主题颜色', - + favicon: '网站图标', topMenuColor: '头部背景', topMenuActiveColor: '头部选中背景', diff --git a/frontend/src/main.js b/frontend/src/main.js index 7a8a248651..13658d299c 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -26,6 +26,7 @@ import DeViewSelect from '@/components/DeViewSelect' import RemarkEditor from '@/views/chart/components/component-style/dialog/RemarkEditor' import TitleRemark from '@/views/chart/view/TitleRemark' import '@/components/canvas/custom-component' // 注册自定义组件 +import deBtn from '@/components/deCustomCm/deBtn.vue' import '@/utils/DateUtil' import draggable from 'vuedraggable' @@ -92,6 +93,8 @@ Vue.component('DeComplexSelect', DeComplexSelect) Vue.component('DeViewSelect', DeViewSelect) Vue.component('RemarkEditor', RemarkEditor) Vue.component('TitleRemark', TitleRemark) +Vue.component('deBtn', deBtn) + Vue.config.productionTip = false import vueToPdf from 'vue-to-pdf' diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index b4741d71da..1f25ac6bb1 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -854,7 +854,7 @@ div:focus { display: none !important; } -.el-checkbox__input.is-checked + .el-checkbox__label { +.el-checkbox__input.is-checked:not(.is-disabled) + .el-checkbox__label { color: #1F2329 !important; } @@ -867,6 +867,20 @@ div:focus { background-color: rgba(31, 35, 41, 0.15) !important; } +.de-tabs { + .el-tabs__header { + margin: 0 0 12px !important; + } + + .el-tabs__item { + height: 24px !important; + line-height: 24px !important; + margin-bottom: 9px !important; + padding: 0 12px !important; + font-size: 16px !important; + } +} + .el-tabs__item:not(.is-active) { font-weight: 400 !important; } @@ -915,19 +929,19 @@ div:focus { margin-right: 8.67px; } } -.de-message-fail { - border: 1px solid #f54a45 !important; - background: #fef1f1 !important; +.de-message-error { + border: 1px solid var(--deDanger, #f54a45) !important; + background: var(--deWhitemsgDeDanger, #fef1f1) !important; i { - color: #f54a45; + color: var(--deDanger, #f54a45); } } .de-message-success { - border: 1px solid #34c724 !important; - background: #f0fbef !important; + border: 1px solid var(--deSuccess, #34c724) !important; + background: var(--deWhitemsgDeSuccess, #f0fbef) !important; i { - color: #34c724; + color: var(--deSuccess, #34c724); } } @@ -975,3 +989,178 @@ div:focus { border: none !important; } } + + +.de-form-item { + .el-form-item__label { + width: 100% !important; + text-align: left; + margin-bottom: 8px; + height: 22px; + line-height: 22px !important; + position: relative; + } + + .el-form-item.is-required:not(.is-no-asterisk) + > .el-form-item__label:before { + display: none; + } + + .el-form-item.is-required:not(.is-no-asterisk) + > .el-form-item__label::after { + content: "*"; + color: #f54a45; + margin-left: 2px; + } + .el-form-item__content { + margin-left: 0 !important; + } + + .el-form-item { + margin-bottom: 28px !important; + } + + .tips-not-absolute { + z-index: 10; + position: relative; + } +} + +.de-dialog-form { + .el-dialog__body { + padding: 0 24px 24px 24px; + } + + .el-dialog__header { + padding: 24px; + } + + .el-dialog__footer { + padding-top: 0; + } +} + +.de-confirm { + border: none; + .el-message-box__header { + display: none; + } + + .el-message-box__content { + padding: 24px; + } + + .el-message-box__container { + display: flex; + align-items: center; + } + .el-message-box__status { + height: 22px; + width: 22px; + font-size: 22px !important; + margin-right: 17px; + } + + .el-message-box__message { + //styleName: 中文/桌面端/四级标题 16 24 Medium; + font-family: PingFang SC; + font-size: 16px; + font-weight: 500; + line-height: 24px; + letter-spacing: 0px; + text-align: left; + color: #1f2329; + } + + .el-message-box__btns { + padding: 0; + } + + .de-confirm-btn { + height: 32px; + width: 80px; + border-radius: 4px; + font-family: PingFang SC; + font-size: 14px; + font-weight: 400; + line-height: 22px; + text-align: center; + padding: 0; + } +} + +.de-confirm-fail { + padding: 0 24px 24px 0 !important; + .el-message-box__status { + color: #ff8800 !important; + } +} + +.de-use-html { + min-width: 420px; + width: auto !important; + + .el-message-box__container { + position: relative; + + .use-html { + //styleName: 中文/桌面端/正文 14 22 Regular; + font-family: PingFang SC; + font-size: 14px; + font-weight: 400; + line-height: 22px; + letter-spacing: 0px; + text-align: left; + color: #1f2329; + display: inline-block; + margin-top: 8px; + } + } + + .el-message-box__status { + position: absolute; + top: 1px; + transform: translateY(0); + } +} + +.de-confirm-primary-btn { + background: var(--deSuccess, #3370ff) !important; + border: none !important; + color: #ffffff !important; + + &:hover { + background: var(--deSuccessHover, #3370ff) !important; + } + + &:active { + background: var(--deSuccessActive, #3370ff) !important; + } +} + +.de-confirm-plain-cancel { + background: #ffffff !important; + border: 1px solid #bbbfc4 !important; + color: #1f2329 !important; +} + +.de-confirm-danger-btn { + background: var(--deDanger, #f54a45) !important; + border: none !important; + color: #ffffff !important; + &:hover { + background: var(--deDangerHover, #f54a45) !important; + } + + &:active { + background: var(--deDangerActive, #f54a45) !important; + } +} + +.el-switch__label.is-active { + color: var(--deTextPrimary, #1F2329) !important; +} + +.el-radio__input.is-checked:not(.is-disabled)+.el-radio__label { + color: var(--deTextPrimary, #1F2329) !important; +} \ No newline at end of file diff --git a/frontend/src/views/panel/template/component/TemplateImport.vue b/frontend/src/views/panel/template/component/TemplateImport.vue index 0b2dae2a86..878c3ab472 100644 --- a/frontend/src/views/panel/template/component/TemplateImport.vue +++ b/frontend/src/views/panel/template/component/TemplateImport.vue @@ -1,169 +1,222 @@ diff --git a/frontend/src/views/panel/template/component/TemplateItem.vue b/frontend/src/views/panel/template/component/TemplateItem.vue index 3a37bc7f13..05891e3f43 100644 --- a/frontend/src/views/panel/template/component/TemplateItem.vue +++ b/frontend/src/views/panel/template/component/TemplateItem.vue @@ -1,114 +1,127 @@ - diff --git a/frontend/src/views/panel/template/component/TemplateList.vue b/frontend/src/views/panel/template/component/TemplateList.vue index 11f50ced1e..45142edf22 100644 --- a/frontend/src/views/panel/template/component/TemplateList.vue +++ b/frontend/src/views/panel/template/component/TemplateList.vue @@ -1,163 +1,235 @@ - diff --git a/frontend/src/views/panel/template/index.vue b/frontend/src/views/panel/template/index.vue index 116a0d923a..69861d18f1 100644 --- a/frontend/src/views/panel/template/index.vue +++ b/frontend/src/views/panel/template/index.vue @@ -1,25 +1,27 @@ + + + \ No newline at end of file diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue index 5d345d9167..ecf07106c0 100644 --- a/frontend/src/views/system/SysParam/BasicSetting.vue +++ b/frontend/src/views/system/SysParam/BasicSetting.vue @@ -1,95 +1,87 @@ - diff --git a/frontend/src/views/system/SysParam/ClusterModeSetting.vue b/frontend/src/views/system/SysParam/ClusterModeSetting.vue index 9e0d067251..f87c81dc49 100644 --- a/frontend/src/views/system/SysParam/ClusterModeSetting.vue +++ b/frontend/src/views/system/SysParam/ClusterModeSetting.vue @@ -1,138 +1,210 @@ + + \ No newline at end of file diff --git a/frontend/src/views/system/SysParam/EmailSetting.vue b/frontend/src/views/system/SysParam/EmailSetting.vue index 722ce2c6be..75147b9384 100644 --- a/frontend/src/views/system/SysParam/EmailSetting.vue +++ b/frontend/src/views/system/SysParam/EmailSetting.vue @@ -1,111 +1,150 @@