Enjoy!
-如果您喜欢StackEdit，请在Chrome网络商店上给5颗星打分。
+如果您喜欢StackEdit中文版，请在Gitee仓库上点一下starred，谢谢！
diff --git a/src/components/modals/AccountManagementModal.vue b/src/components/modals/AccountManagementModal.vue index a175b996..293eb112 100644 --- a/src/components/modals/AccountManagementModal.vue +++ b/src/components/modals/AccountManagementModal.vue @@ -77,6 +77,10 @@
@@ -98,6 +102,7 @@ import gitlabHelper from '../../services/providers/helpers/gitlabHelper';
import giteaHelper from '../../services/providers/helpers/giteaHelper';
import wordpressHelper from '../../services/providers/helpers/wordpressHelper';
import zendeskHelper from '../../services/providers/helpers/zendeskHelper';
+import smmsHelper from '../../services/providers/helpers/smmsHelper';
import badgeSvc from '../../services/badgeSvc';
export default {
@@ -176,6 +181,13 @@ export default {
name: token.name,
scopes: ['read', 'hc:write'],
})),
+ ...Object.values(store.getters['data/smmsTokensBySub']).map(token => ({
+ token,
+ providerId: 'smms',
+ userId: token.sub,
+ name: token.name,
+ scopes: ['api'],
+ })),
];
},
},
@@ -245,6 +257,12 @@ export default {
await zendeskHelper.addAccount(subdomain, clientId);
} catch (e) { /* cancel */ }
},
+ async addSmmsAccount() {
+ try {
+ const { proxyUrl, apiSecretToken } = await store.dispatch('modal/open', { type: 'smmsAccount' });
+ await smmsHelper.addAccount(proxyUrl, apiSecretToken);
+ } catch (e) { /* cancel */ }
+ },
},
};
diff --git a/src/components/modals/ImageModal.vue b/src/components/modals/ImageModal.vue
index d03338c1..6097c73e 100644
--- a/src/components/modals/ImageModal.vue
+++ b/src/components/modals/ImageModal.vue
@@ -1,18 +1,30 @@
-
+
-
-
+
+
-
-
+
请为您的图像提供 url 。
-
+ 粘贴/拖拽图片上传中...
+
+
+
+ 图片上传失败，如未添加SM.MS账号请先添加并选择，之后关闭窗口再重试！
+
请为您的图像提供 url 。
+从Google照片打开
- {{token.name}}
+ 添加并选择图床后可实现粘贴/拖拽自动上传图片
+SM.MS图床
+ {{token.name}}
+
@@ -25,7 +37,7 @@
diff --git a/src/data/features.js b/src/data/features.js
index bd8122a5..437493e0 100644
--- a/src/data/features.js
+++ b/src/data/features.js
@@ -259,6 +259,11 @@ export default [
'Zendesk账号',
'将您的Zendesk账号链接到Stackedit。',
),
+ new Feature(
+ 'addSmmsAccount',
+ 'SM.MS账号',
+ '将您的SM.MS账号链接到Stackedit。',
+ ),
new Feature(
'removeAccount',
'移除账号',
diff --git a/src/data/welcomeFile.md b/src/data/welcomeFile.md
index 9356221f..947dae78 100644
--- a/src/data/welcomeFile.md
+++ b/src/data/welcomeFile.md
@@ -2,6 +2,10 @@
你好！我是你在 **StackEdit中文版** 中的第一个 Markdown 文件。如果你想了解 StackEdit中文版，可以阅读此文章。如果你想玩 Markdown，你也可以编辑次文章。另外，您可以通过打开导航栏左角的**文件资源管理器**来创建新文件。
+> **新功能**
+>
+> 已支持直接粘贴/拖拽上传文件，目前仅支持了SM.MS图床(2022.07.01)
+
# 文件
diff --git a/src/icons/CheckCircleUn.vue b/src/icons/CheckCircleUn.vue
new file mode 100644
index 00000000..698c3c3e
--- /dev/null
+++ b/src/icons/CheckCircleUn.vue
@@ -0,0 +1,5 @@
+
+
+
diff --git a/src/icons/Provider.vue b/src/icons/Provider.vue
index efc6938e..70362c09 100644
--- a/src/icons/Provider.vue
+++ b/src/icons/Provider.vue
@@ -98,4 +98,8 @@ export default {
.icon-provider--gitee {
background-image: url(../assets/iconGitee.svg);
}
+
+.icon-provider--smms {
+ background-image: url(../assets/iconSmms.svg);
+}
diff --git a/src/icons/index.js b/src/icons/index.js
index 1ef6dc2e..7f151b42 100644
--- a/src/icons/index.js
+++ b/src/icons/index.js
@@ -50,6 +50,7 @@ import Database from './Database';
import Magnify from './Magnify';
import FormatListChecks from './FormatListChecks';
import CheckCircle from './CheckCircle';
+import CheckCircleUn from './CheckCircleUn';
import ContentCopy from './ContentCopy';
import Key from './Key';
import DotsHorizontal from './DotsHorizontal';
@@ -106,6 +107,7 @@ Vue.component('iconDatabase', Database);
Vue.component('iconMagnify', Magnify);
Vue.component('iconFormatListChecks', FormatListChecks);
Vue.component('iconCheckCircle', CheckCircle);
+Vue.component('iconCheckCircleUn', CheckCircleUn);
Vue.component('iconContentCopy', ContentCopy);
Vue.component('iconKey', Key);
Vue.component('iconDotsHorizontal', DotsHorizontal);
diff --git a/src/libs/pagedown.js b/src/libs/pagedown.js
index 98002f73..76a02c6d 100644
--- a/src/libs/pagedown.js
+++ b/src/libs/pagedown.js
@@ -25,7 +25,7 @@ var defaultsStrings = {
codeexample: "enter code here",
image: "Image ![]()
Ctrl/Cmd+G",
- imagedescription: "enter image description here",
+ imagedescription: "",
imagedialog: "
Insert Image
http://example.com/images/diagram.jpg \"optional title\"
Need free image hosting?
- Ctrl/Cmd+O",
diff --git a/src/services/networkSvc.js b/src/services/networkSvc.js
index 5fbe4c4d..27217394 100644
--- a/src/services/networkSvc.js
+++ b/src/services/networkSvc.js
@@ -247,8 +247,14 @@ export default {
if (sanitizedConfig.body && typeof sanitizedConfig.body === 'object') {
sanitizedConfig.body = JSON.stringify(sanitizedConfig.body);
sanitizedConfig.headers['Content-Type'] = 'application/json';
+ } else if (sanitizedConfig.formData) {
+ const data = new FormData();
+ Object.keys(sanitizedConfig.formData).forEach((key) => {
+ const formVal = sanitizedConfig.formData[key];
+ data.append(key, formVal);
+ });
+ sanitizedConfig.formData = data;
}
-
const attempt = async () => {
try {
return await new Promise((resolve, reject) => {
@@ -315,7 +321,7 @@ export default {
if (sanitizedConfig.blob) {
xhr.responseType = 'blob';
}
- xhr.send(sanitizedConfig.body || null);
+ xhr.send(sanitizedConfig.body || sanitizedConfig.formData || null);
});
} catch (err) {
// Try again later in case of retriable error
diff --git a/src/services/providers/helpers/smmsHelper.js b/src/services/providers/helpers/smmsHelper.js
new file mode 100644
index 00000000..7de6bc87
--- /dev/null
+++ b/src/services/providers/helpers/smmsHelper.js
@@ -0,0 +1,76 @@
+import networkSvc from '../../networkSvc';
+import store from '../../../store';
+import userSvc from '../../userSvc';
+import badgeSvc from '../../badgeSvc';
+
+/**
+ * https://doc.sm.ms/#api-User-Get_Profile
+ */
+const subPrefix = 'sm';
+export default {
+ subPrefix,
+ async getTokenObj(proxyUrl, apiSecretToken) {
+ // Call the user info endpoint
+ try {
+ const { body } = await networkSvc.request({
+ method: 'POST',
+ url: `${proxyUrl}https://sm.ms/api/v2/profile`,
+ headers: {
+ Authorization: apiSecretToken,
+ },
+ });
+ // Check user result
+ if (!body.success) {
+ throw new Error(`SM.MS个人信息获取失败，失败信息：${body.message}`);
+ }
+ userSvc.addUserInfo({
+ id: `${subPrefix}:${body.data.username}`,
+ name: body.data.username,
+ imageUrl: 'https://gravatar.loli.net/avatar/ccc459536d65637c192c00f639569864',
+ });
+ // Build token object including sub
+ const token = {
+ proxyUrl,
+ accessToken: apiSecretToken,
+ name: body.data.username,
+ sub: body.data.username,
+ };
+ // Add token to smms tokens
+ store.dispatch('data/addSmmsToken', token);
+ return token;
+ } catch (err) {
+ console.error(err); // eslint-disable-line no-console
+ store.dispatch('notification/error', err);
+ throw new Error(`SM.MS个人信息获取异常，异常信息：${err.message}`);
+ }
+ },
+ async addAccount(proxyUrl, apiSecretToken) {
+ const token = await this.getTokenObj(proxyUrl, apiSecretToken);
+ badgeSvc.addBadge('addSmmsAccount');
+ return token;
+ },
+ async uploadFile({
+ token,
+ file,
+ }) {
+ const { body } = await networkSvc.request({
+ method: 'POST',
+ url: `${token.proxyUrl}https://sm.ms/api/v2/upload`,
+ headers: {
+ Authorization: token.accessToken,
+ },
+ formData: {
+ smfile: file,
+ },
+ });
+ if (!body.success) {
+ if (body.code === 'image_repeated') {
+ return body.images;
+ }
+ store.dispatch('notification/error', `SM.MS上传图片失败，失败信息：${body.message}`);
+ throw new Error(`SM.MS上传图片失败，失败信息：${body.message}`);
+ }
+ return body.data.url;
+ },
+
+};
diff --git a/src/store/data.js b/src/store/data.js
index c898155e..a1af94c8 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -216,6 +216,7 @@ export default {
giteaTokensBySub: (state, { tokensByType }) => tokensByType.gitea || {},
wordpressTokensBySub: (state, { tokensByType }) => tokensByType.wordpress || {},
zendeskTokensBySub: (state, { tokensByType }) => tokensByType.zendesk || {},
+ smmsTokensBySub: (state, { tokensByType }) => tokensByType.smms || {},
badgeCreations: getter('badgeCreations'),
badgeTree: (state, { badgeCreations }) => features
.map(feature => feature.toBadge(badgeCreations)),
@@ -311,5 +312,6 @@ export default {
addWordpressToken: tokenAdder('wordpress'),
addZendeskToken: tokenAdder('zendesk'),
patchBadgeCreations: patcher('badgeCreations'),
+ addSmmsToken: tokenAdder('smms'),
},
};
diff --git a/src/store/img.js b/src/store/img.js
new file mode 100644
index 00000000..f5ebda1d
--- /dev/null
+++ b/src/store/img.js
@@ -0,0 +1,55 @@
+const localKey = 'img/checkedStorage';
+
+export default {
+ namespaced: true,
+ state: {
+ // 来自粘贴板 或者 拖拽的图片的文件对象
+ currImg: null,
+ // 选择的存储图床信息
+ checkedStorage: {
+ type: null, // 目前存储类型分两种 token 与 tokenRepo
+ provider: null, // 对应是何种账号
+ sub: null, // 对应 token 中的sub
+ },
+ },
+ mutations: {
+ setNewImg: (state, value) => {
+ state.currImg = value;
+ },
+ clearCurrImg: (state) => {
+ state.currImg = null;
+ },
+ changeCheckedStorage: (state, value) => {
+ if (value) {
+ state.checkedStorage = {
+ type: value.type, // 目前存储类型分两种 token 与 tokenRepo
+ provider: value.provider, // 对应是何种账号
+ sub: value.sub, // 对应 token 中的sub
+ };
+ } else {
+ state.checkedStorage = {
+ type: null, // 目前存储类型分两种 token 与 tokenRepo
+ provider: null, // 对应是何种账号
+ sub: null, // 对应 token 中的sub
+ };
+ }
+ },
+ },
+ getters: {
+ getImg: state => state.currImg,
+ getCheckedStorage: state => state.checkedStorage,
+ getCheckedStorageSub: state => state.checkedStorage.sub,
+ },
+ actions: {
+ setImg({ commit }, img) {
+ commit('setNewImg', img);
+ },
+ clearImg({ commit }) {
+ commit('clearCurrImg');
+ },
+ changeCheckedStorage({ commit }, checkedStorage) {
+ commit('changeCheckedStorage', checkedStorage);
+ localStorage.setItem(localKey, JSON.stringify(checkedStorage));
+ },
+ },
+};
diff --git a/src/store/index.js b/src/store/index.js
index 006c730b..104b18a0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -18,6 +18,7 @@ import queue from './queue';
import syncedContent from './syncedContent';
import userInfo from './userInfo';
import workspace from './workspace';
+import img from './img';
import locationTemplate from './locationTemplate';
import emptyPublishLocation from '../data/empties/emptyPublishLocation';
import emptySyncLocation from '../data/empties/emptySyncLocation';
@@ -47,6 +48,7 @@ const store = new Vuex.Store({
syncLocation: locationTemplate(emptySyncLocation),
userInfo,
workspace,
+ img,
},
state: {
light: false,
diff --git a/static/landing/index.html b/static/landing/index.html
index cbd55aae..03c3e669 100644
--- a/static/landing/index.html
+++ b/static/landing/index.html
@@ -9,7 +9,7 @@
+ content="支持直接将码云（Gitee）、GitHub、Gitea等仓库且支持拖拽/粘贴上传图片，并且可以直接在页面编辑同步和管理的Markdown编辑器。">