2025-01-09

king

2025-01-09 b372b06dc08d94731223cef2a741fe7a7a6a09bb

2025-01-09

 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

 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-'] {

 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',

 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">

 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;
    }
  }

 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'
]

 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
    },
    {

 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',

 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',

 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'
]

 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',

 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'},

 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'},

 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>