From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 15:53:32 +0800
Subject: [PATCH] 2022-12-09
---
src/menu/picturecontroller/index.jsx | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/menu/picturecontroller/index.jsx b/src/menu/picturecontroller/index.jsx
index acf10d8..e51d89f 100644
--- a/src/menu/picturecontroller/index.jsx
+++ b/src/menu/picturecontroller/index.jsx
@@ -1,15 +1,18 @@
import React, {Component} from 'react'
-import { Modal, Button, Row, Col, Input, message, Tabs, Empty, Pagination, notification } from 'antd'
+import { Modal, Button, Row, Col, Input, message, Tabs, Empty, Pagination, notification, Typography } from 'antd'
import { PlusOutlined, CopyOutlined, EditOutlined, DeleteOutlined, PictureOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils from '@/utils/utils.js'
import asyncComponent from '@/utils/asyncComponent'
+import { minkeIconSystem } from '@/utils/option.js'
+import MkIcon from '@/components/mk-icon'
import './index.scss'
const { Search } = Input
const { confirm } = Modal
const { TabPane } = Tabs
+const { Paragraph } = Typography
const EditForm = asyncComponent(() => import('./editform'))
const Video = asyncComponent(() => import('./video'))
@@ -30,6 +33,7 @@
colorlist: [],
piclist: [],
vidlist: [],
+ iconlist: [...minkeIconSystem.direction, ...minkeIconSystem.edit, ...minkeIconSystem.normal, ...minkeIconSystem.data, ...minkeIconSystem.hint],
picIndex: 1,
vidIndex: 1,
}
@@ -38,6 +42,15 @@
let pictures = sessionStorage.getItem('app_pictures')
let videos = sessionStorage.getItem('app_videos')
let colorlist = sessionStorage.getItem('app_colors')
+
+ if (!pictures) {
+ notification.warning({
+ top: 92,
+ message: '鏈幏鍙栧埌璧勬簮淇℃伅锛岃绋嶅悗鎴栧埛鏂伴噸璇曘��',
+ duration: 5
+ })
+ return
+ }
try {
pictures = JSON.parse(pictures)
@@ -232,14 +245,13 @@
}
render() {
- const { visible, editvisible, card, filpictures, filvideos, piclist, vidlist, imageKey, videoKey, pageSize, picIndex, vidIndex, colorlist } = this.state
+ const { visible, editvisible, card, filpictures, filvideos, piclist, vidlist, imageKey, videoKey, pageSize, picIndex, vidIndex, colorlist, iconlist } = this.state
return (
<div style={{display: 'inline-block'}}>
<Button className="mk-border-purple" onClick={this.trigger}><PictureOutlined /> 璧勬簮绠＄悊</Button>
<Modal
- title="绮樿创"
- wrapClassName="picture-control-model"
+ wrapClassName="mk-pop-modal picture-control-model"
visible={visible}
width={1200}
maskClosable={false}
@@ -268,7 +280,7 @@
<Col span={4} key={item.id}>
<div className="image-video-box">
<div className="image-video-box-body">
- <Image url={item.linkurl} />
+ <Image url={item.linkurl.replace(/@mywebsite@\//ig, window.GLOB.baseurl)} />
</div>
<div className="image-video-control">
<CopyOutlined onClick={() => this.copySource(item)}/>
@@ -340,6 +352,16 @@
{!colorlist.length ? <Empty description={null}/> : null}
</Row>
</TabPane>
+ <TabPane tab="鍥炬爣搴�" key="icon">
+ <Row gutter={16}>
+ {iconlist.map(item => (
+ <Col className="icon-wrap" span={4} key={item}>
+ <MkIcon type={item} />
+ <Paragraph copyable={{ text: item }}>{item}</Paragraph>
+ </Col>
+ ))}
+ </Row>
+ </TabPane>
</Tabs>
</Modal>
<Modal
--
Gitblit v1.8.0