From b372b06dc08d94731223cef2a741fe7a7a6a09bb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 一月 2025 13:55:59 +0800
Subject: [PATCH] 2025-01-09
---
src/mob/colorsketch/index.jsx | 2
src/assets/css/viewstyle.scss | 23 +++++--
src/menu/components/chart/antv-G6/index.jsx | 2
src/views/appcheck/index.jsx | 2
src/tabviews/custom/components/chart/antv-G6/index.jsx | 2
src/menu/components/share/sourcecomponent/index.jsx | 18 +++++
src/assets/css/table.scss | 40 ++++++------
src/mob/components/topbar/normal-navbar/options.jsx | 2
src/tabviews/custom/components/chart/antv-X6/index.jsx | 2
src/tabviews/zshare/mutilform/mkColor/index.jsx | 2
src/views/appmanage/index.jsx | 2
src/menu/components/share/sourcecomponent/index.scss | 20 +++++-
src/views/appmanage/submutilform/index.jsx | 2
src/utils/option.js | 20 +++---
14 files changed, 86 insertions(+), 53 deletions(-)
diff --git a/src/assets/css/table.scss b/src/assets/css/table.scss
index 4ba1965..ff79fc5 100644
--- a/src/assets/css/table.scss
+++ b/src/assets/css/table.scss
@@ -316,34 +316,34 @@
// geekblue
.background.geekblue-1 {
- @include tableBackground(#f0f5ff);
+ @include tableBackground(#f0f6ff);
}
.background.geekblue-2 {
- @include tableBackground(#d6e4ff);
+ @include tableBackground(#dee9ff);
}
.background.geekblue-3 {
- @include tableBackground(#adc6ff);
+ @include tableBackground(#b5ccff);
}
.background.geekblue-4 {
- @include tableBackground(#85a5ff);
+ @include tableBackground(#8cadff);
}
.background.geekblue-5 {
- @include tableBackground(#597ef7);
+ @include tableBackground(#638aff);
}
.background.geekblue-6 {
- @include tableBackground(#2f54eb, #ffffff);
+ @include tableBackground(#3860f4, #ffffff);
}
.background.geekblue-7 {
- @include tableBackground(#1d39c4, #ffffff);
+ @include tableBackground(#2544cf, #ffffff);
}
.background.geekblue-8 {
- @include tableBackground(#10239e, #ffffff);
+ @include tableBackground(#162ca8, #ffffff);
}
.background.geekblue-9 {
- @include tableBackground(#061178, #ffffff);
+ @include tableBackground(#0a1882, #ffffff);
}
.background.geekblue-10 {
- @include tableBackground(#030852, #ffffff);
+ @include tableBackground(#060e5c, #ffffff);
}
// purple
@@ -740,34 +740,34 @@
// geekblue
.font.geekblue-1 {
- color: #f0f5ff;
+ color: #f0f6ff;
}
.font.geekblue-2 {
- color: #d6e4ff;
+ color: #dee9ff;
}
.font.geekblue-3 {
- color: #adc6ff;
+ color: #b5ccff;
}
.font.geekblue-4 {
- color: #85a5ff;
+ color: #8cadff;
}
.font.geekblue-5 {
- color: #597ef7;
+ color: #638aff;
}
.font.geekblue-6 {
- color: #2f54eb;
+ color: #3860f4;
}
.font.geekblue-7 {
- color: #1d39c4;
+ color: #2544cf;
}
.font.geekblue-8 {
- color: #10239e;
+ color: #162ca8;
}
.font.geekblue-9 {
- color: #061178;
+ color: #0a1882;
}
.font.geekblue-10 {
- color: #030852;
+ color: #060e5c;
}
// purple
diff --git a/src/assets/css/viewstyle.scss b/src/assets/css/viewstyle.scss
index ceedbf9..2c30c62 100644
--- a/src/assets/css/viewstyle.scss
+++ b/src/assets/css/viewstyle.scss
@@ -406,14 +406,23 @@
@include viewstyle(#e6fffb, #b5f5ec, #87e8de, #5cdbd3, #36cfc9, #13c2c2);
}
+// body[class*='mk-blue-purple-'] {
+// --mk-sys-color: #2f54eb;
+// --mk-sys-color1: #f0f5ff;
+// --mk-sys-color2: #d6e4ff;
+// --mk-sys-color3: #adc6ff;
+// --mk-sys-color4: #85a5ff;
+// --mk-sys-color5: #597ef7;
+// @include viewstyle(#f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb);
+// }
body[class*='mk-blue-purple-'] {
- --mk-sys-color: #2f54eb;
- --mk-sys-color1: #f0f5ff;
- --mk-sys-color2: #d6e4ff;
- --mk-sys-color3: #adc6ff;
- --mk-sys-color4: #85a5ff;
- --mk-sys-color5: #597ef7;
- @include viewstyle(#f0f5ff, #d6e4ff, #adc6ff, #85a5ff, #597ef7, #2f54eb);
+ --mk-sys-color: #3860f4;
+ --mk-sys-color1: #f0f6ff;
+ --mk-sys-color2: #dee9ff;
+ --mk-sys-color3: #b5ccff;
+ --mk-sys-color4: #8cadff;
+ --mk-sys-color5: #638aff;
+ @include viewstyle(#f0f6ff, #dee9ff, #b5ccff, #8cadff, #638aff, #3860f4);
}
body[class*='mk-purple-'] {
diff --git a/src/menu/components/chart/antv-G6/index.jsx b/src/menu/components/chart/antv-G6/index.jsx
index 658e69c..1578066 100644
--- a/src/menu/components/chart/antv-G6/index.jsx
+++ b/src/menu/components/chart/antv-G6/index.jsx
@@ -55,7 +55,7 @@
yellow_green: '#a0d911',
green: '#52c41a',
cyan: '#13c2c2',
- blue_purple: '#2f54eb',
+ blue_purple: '#3860f4',
purple: '#722ed1',
magenta: '#eb2f96',
grass_green: '#aeb303',
diff --git a/src/menu/components/share/sourcecomponent/index.jsx b/src/menu/components/share/sourcecomponent/index.jsx
index c8f515b..f14a7bb 100644
--- a/src/menu/components/share/sourcecomponent/index.jsx
+++ b/src/menu/components/share/sourcecomponent/index.jsx
@@ -1,8 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Radio, Modal } from 'antd'
-import { PaperClipOutlined, DeleteOutlined } from '@ant-design/icons'
+import { Radio, Modal, message } from 'antd'
+import { PaperClipOutlined, DeleteOutlined, CopyOutlined } from '@ant-design/icons'
import InputForm from './inputform'
import './index.scss'
@@ -45,6 +45,18 @@
this.props.onChange('')
}
+ copyUrl = () => {
+ const { url } = this.state
+
+ let oInput = document.createElement('input')
+ oInput.value = url
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }
+
handleChange = (key) => {
this.setState({visible: key})
}
@@ -75,11 +87,13 @@
{url && type === 'video' ? <div className="mk-source-item-info">
<PaperClipOutlined />
<a target="_blank" rel="noopener noreferrer" href={url.replace(/@mywebsite@\//ig, window.GLOB.baseurl)}>{name}</a>
+ <CopyOutlined title="澶嶅埗閾炬帴" onClick={this.copyUrl}/>
<DeleteOutlined title="鍒犻櫎鏂囦欢" onClick={this.deleteUrl}/>
</div> : null}
{url && type !== 'video' && url !== '@icon@' ? <div className="mk-source-item-info picture">
<img src={url.replace(/@mywebsite@\//ig, window.GLOB.baseurl)} alt="" />
<a target="_blank" rel="noopener noreferrer" href={url.replace(/@mywebsite@\//ig, window.GLOB.baseurl)}>{name}</a>
+ <CopyOutlined title="澶嶅埗閾炬帴" onClick={this.copyUrl}/>
<DeleteOutlined title="鍒犻櫎鏂囦欢" onClick={this.deleteUrl}/>
</div> : null}
{url && type !== 'video' && url === '@icon@' ? <div className="mk-source-item-info avatar">
diff --git a/src/menu/components/share/sourcecomponent/index.scss b/src/menu/components/share/sourcecomponent/index.scss
index 156af96..e1707cf 100644
--- a/src/menu/components/share/sourcecomponent/index.scss
+++ b/src/menu/components/share/sourcecomponent/index.scss
@@ -18,11 +18,21 @@
cursor: pointer;
display: none;
}
+ .anticon-copy {
+ position: absolute;
+ top: 3px;
+ right: 30px;
+ padding-right: 0px;
+ color: #26C281;
+ cursor: pointer;
+ display: none;
+ }
a {
display: inline-block;
- width: 100%;
+ min-width: 60%;
+ max-width: calc(100% - 80px);
padding-left: 22px;
- padding-right: 14px;
+ padding-right: 0px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@@ -50,20 +60,20 @@
height: 32px;
line-height: 32px;
}
- .anticon-delete {
+ .anticon-delete, .anticon-copy {
top: 8px;
}
}
.mk-source-item-info.avatar {
display: flex;
top: 0px;
- .anticon-delete {
+ .anticon-delete, .anticon-copy {
top: 8px;
}
}
.mk-source-item-info:hover {
background-color: #e6f7ff;
- .anticon-delete {
+ .anticon-delete, .anticon-copy {
display: inline-block;
}
}
diff --git a/src/mob/colorsketch/index.jsx b/src/mob/colorsketch/index.jsx
index 2260cdd..9b8dcb1 100644
--- a/src/mob/colorsketch/index.jsx
+++ b/src/mob/colorsketch/index.jsx
@@ -8,7 +8,7 @@
import './index.scss'
const presetColors = [
- '#1890ff', '#f5222d', '#fa541c', '#fa8c16', '#faad14', '#fadb14', '#a0d911', '#52c41a', '#13c2c2', '#2f54eb', '#722ed1',
+ '#1890ff', '#f5222d', '#fa541c', '#fa8c16', '#faad14', '#fadb14', '#a0d911', '#52c41a', '#13c2c2', '#3860f4', '#722ed1',
'#eb2f96', '#aeb303', '#c32539', '#1d3661', '#ffd591', '#ffe58f', '#fffb8f', '#eaff8f', '#b7eb8f', '#87e8de', '#91d5ff',
'#adc6ff', '#EBE9E9', '#d9d9d9', 'rgba(0, 0, 0, 0.65)', 'rgba(0, 0, 0, 0.85)', '#000000', '#ffffff', 'transparent'
]
diff --git a/src/mob/components/topbar/normal-navbar/options.jsx b/src/mob/components/topbar/normal-navbar/options.jsx
index 43cc169..a66aa8b 100644
--- a/src/mob/components/topbar/normal-navbar/options.jsx
+++ b/src/mob/components/topbar/normal-navbar/options.jsx
@@ -67,7 +67,7 @@
label: '鏍囬',
initval: wrap.title || '',
// tooltip: '浣跨敤鎼滅储妗嗘椂锛屾爣棰樼敤浜庢悳绱㈡潯浠堕殣钘忔椂锛堝綋鍚敤榛戝悕鍗曪紝鐧诲綍鐢ㄦ埛鏃犳潈闄愭椂锛夋樉绀恒�傛敞锛欯username浠ｈ〃鐢ㄦ埛鍚嶏紝@fullname浠ｈ〃濮撳悕銆�',
- tooltip: '娉細@username浠ｈ〃鐢ㄦ埛鍚嶏紝@fullname浠ｈ〃濮撳悕銆�',
+ tooltip: '娉細@username浠ｈ〃鐢ㄦ埛鍚嶏紝@fullname浠ｈ〃濮撳悕锛孈appname浠ｈ〃搴旂敤鍚嶃��',
required: false
},
{
diff --git a/src/tabviews/custom/components/chart/antv-G6/index.jsx b/src/tabviews/custom/components/chart/antv-G6/index.jsx
index 5fc57b9..8c166e7 100644
--- a/src/tabviews/custom/components/chart/antv-G6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-G6/index.jsx
@@ -23,7 +23,7 @@
yellow_green: '#a0d911',
green: '#52c41a',
cyan: '#13c2c2',
- blue_purple: '#2f54eb',
+ blue_purple: '#3860f4',
purple: '#722ed1',
magenta: '#eb2f96',
grass_green: '#aeb303',
diff --git a/src/tabviews/custom/components/chart/antv-X6/index.jsx b/src/tabviews/custom/components/chart/antv-X6/index.jsx
index 96770b5..a1df8cf 100644
--- a/src/tabviews/custom/components/chart/antv-X6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/index.jsx
@@ -344,7 +344,7 @@
yellow_green: '#a0d911',
green: '#52c41a',
cyan: '#13c2c2',
- blue_purple: '#2f54eb',
+ blue_purple: '#3860f4',
purple: '#722ed1',
magenta: '#eb2f96',
grass_green: '#aeb303',
diff --git a/src/tabviews/zshare/mutilform/mkColor/index.jsx b/src/tabviews/zshare/mutilform/mkColor/index.jsx
index e101e12..30f3cba 100644
--- a/src/tabviews/zshare/mutilform/mkColor/index.jsx
+++ b/src/tabviews/zshare/mutilform/mkColor/index.jsx
@@ -6,7 +6,7 @@
import './index.scss'
const presetColors = [
- '#f5222d', '#fa541c', '#fa8c16', '#faad14', '#fadb14', '#a0d911', '#52c41a', '#13c2c2', '#1890ff', '#2f54eb', '#722ed1',
+ '#f5222d', '#fa541c', '#fa8c16', '#faad14', '#fadb14', '#a0d911', '#52c41a', '#13c2c2', '#1890ff', '#3860f4', '#722ed1',
'#eb2f96', '#595959', '#ffa39e', '#ffbb96', '#ffd591', '#ffe58f', '#fffb8f', '#eaff8f', '#b7eb8f', '#87e8de', '#91d5ff',
'#adc6ff', '#d3adf7', '#ffadd2', '#d9d9d9', '#434343', '#000000', '#ffffff', 'transparent'
]
diff --git a/src/utils/option.js b/src/utils/option.js
index 858aa90..e025897 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -502,16 +502,16 @@
'blue-8': '#0050b3',
'blue-9': '#003a8c',
'blue-10': '#002766',
- 'geekblue-1': '#f0f5ff',
- 'geekblue-2': '#d6e4ff',
- 'geekblue-3': '#adc6ff',
- 'geekblue-4': '#85a5ff',
- 'geekblue-5': '#597ef7',
- 'geekblue-6': '#2f54eb',
- 'geekblue-7': '#1d39c4',
- 'geekblue-8': '#10239e',
- 'geekblue-9': '#061178',
- 'geekblue-10': '#030852',
+ 'geekblue-1': '#f0f6ff',
+ 'geekblue-2': '#dee9ff',
+ 'geekblue-3': '#b5ccff',
+ 'geekblue-4': '#8cadff',
+ 'geekblue-5': '#638aff',
+ 'geekblue-6': '#3860f4',
+ 'geekblue-7': '#2544cf',
+ 'geekblue-8': '#162ca8',
+ 'geekblue-9': '#0a1882',
+ 'geekblue-10': '#060e5c',
'purple-1': '#f9f0ff',
'purple-2': '#efdbff',
'purple-3': '#d3adf7',
diff --git a/src/views/appcheck/index.jsx b/src/views/appcheck/index.jsx
index 5e669d2..2e999fe 100644
--- a/src/views/appcheck/index.jsx
+++ b/src/views/appcheck/index.jsx
@@ -22,7 +22,7 @@
bg_black_style_yellow_green: {name: '榛勭豢鑹�', color: '#a0d911'},
bg_black_style_green: {name: '缁胯壊', color: '#52c41a'},
bg_black_style_cyan: {name: '闈掕壊', color: '#13c2c2'},
- bg_black_style_blue_purple: {name: '钃濈传鑹�', color: '#2f54eb'},
+ bg_black_style_blue_purple: {name: '钃濈传鑹�', color: '#3860f4'},
bg_black_style_purple: {name: '绱壊', color: '#722ed1'},
bg_black_style_magenta: {name: '娲嬬孩鑹�', color: '#eb2f96'},
bg_black_style_grass_green: {name: '鑽夌豢鑹�', color: '#aeb303'},
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index 76ce934..ea9e714 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -32,7 +32,7 @@
bg_black_style_yellow_green: {name: '榛勭豢鑹�', color: '#a0d911'},
bg_black_style_green: {name: '缁胯壊', color: '#52c41a'},
bg_black_style_cyan: {name: '闈掕壊', color: '#13c2c2'},
- bg_black_style_blue_purple: {name: '钃濈传鑹�', color: '#2f54eb'},
+ bg_black_style_blue_purple: {name: '钃濈传鑹�', color: '#3860f4'},
bg_black_style_purple: {name: '绱壊', color: '#722ed1'},
bg_black_style_magenta: {name: '娲嬬孩鑹�', color: '#eb2f96'},
bg_black_style_grass_green: {name: '鑽夌豢鑹�', color: '#aeb303'},
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index 369b47f..14976ea 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -194,7 +194,7 @@
<Select.Option value="bg_black_style_yellow_green"><span className="color-block" style={{background: '#a0d911'}}></span>榛勭豢鑹诧紙#a0d911锛�</Select.Option>
<Select.Option value="bg_black_style_green"><span className="color-block" style={{background: '#52c41a'}}></span>缁胯壊锛�#52c41a锛�</Select.Option>
<Select.Option value="bg_black_style_cyan"><span className="color-block" style={{background: '#13c2c2'}}></span>闈掕壊锛�#13c2c2锛�</Select.Option>
- <Select.Option value="bg_black_style_blue_purple"><span className="color-block" style={{background: '#2f54eb'}}></span>钃濈传鑹诧紙#2f54eb锛�</Select.Option>
+ <Select.Option value="bg_black_style_blue_purple"><span className="color-block" style={{background: '#3860f4'}}></span>钃濈传鑹诧紙#3860f4锛�</Select.Option>
<Select.Option value="bg_black_style_purple"><span className="color-block" style={{background: '#722ed1'}}></span>绱壊锛�#722ed1锛�</Select.Option>
<Select.Option value="bg_black_style_magenta"><span className="color-block" style={{background: '#eb2f96'}}></span>娲嬬孩鑹诧紙#eb2f96锛�</Select.Option>
<Select.Option value="bg_black_style_grass_green"><span className="color-block" style={{background: '#aeb303'}}></span>鑽夌豢鑹诧紙#aeb303锛�</Select.Option>
--
Gitblit v1.8.0