From f5f61c68fffee558eaa9139580c4d7d0a0dd8b0e Mon Sep 17 00:00:00 2001
From: K <704496037@qq.com>
Date: Tue, 19 Mar 2024 00:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
src/views/FileEditor.vue | 8 ++++----
src/views/FilePreview.vue | 7 +++++--
src/views/SubEditor.vue | 8 ++++----
src/views/editCode/cmView.vue | 26 +++++++++++++-------------
src/views/editCode/editScript.vue | 2 +-
src/views/editor/components/Script.vue | 2 +-
7 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/package.json b/package.json
index 80cae136a..bb88be795 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sub-store-front-end",
- "version": "2.14.180",
+ "version": "2.14.181",
"private": true,
"scripts": {
"dev": "vite --host",
diff --git a/src/views/FileEditor.vue b/src/views/FileEditor.vue
index 8d1564dd4..26add4a0b 100644
--- a/src/views/FileEditor.vue
+++ b/src/views/FileEditor.vue
@@ -108,7 +108,7 @@
type="text"
/> -->
-
+
@@ -255,7 +255,7 @@ provide("form", form);
const ignoreList = ["Quick Setting Operator"];
watch(
- () => cmStore.CmCode,
+ () => cmStore.EditCode['FileEditer'],
(newCode) => {
form.content = newCode;
}
@@ -265,7 +265,7 @@ watchEffect(() => {
if (isInit.value) return;
if (configName === "UNTITLED") {
const fc = "// " + t(`filePage.content.placeholder`) + "\n"
- cmStore.setCmCode(fc)
+ cmStore.setEditCode('FileEditer', fc)
// 标记 加载完成
isInit.value = true;
return;
@@ -284,7 +284,7 @@ watchEffect(() => {
form.ua = sourceData.ua;
form.mergeSources = sourceData.mergeSources;
form.content = sourceData.content;
- cmStore.setCmCode(sourceData.content);
+ cmStore.setEditCode('FileEditer', sourceData.content);
form.ignoreFailedRemoteFile = sourceData.ignoreFailedRemoteFile;
const newProcess = JSON.parse(JSON.stringify(sourceData.process));
form.process = newProcess;
diff --git a/src/views/FilePreview.vue b/src/views/FilePreview.vue
index 5b32d4ae6..2aa556a13 100644
--- a/src/views/FilePreview.vue
+++ b/src/views/FilePreview.vue
@@ -21,7 +21,7 @@
-
+
-
+
@@ -424,7 +424,7 @@ provide("form", form);
const ignoreList = ["Quick Setting Operator"];
watch(
- () => cmStore.CmCode,
+ () => cmStore.EditCode['SubEditer'],
(newCode) => {
form.content = newCode;
}
@@ -443,7 +443,7 @@ watchEffect(() => {
form.url = "";
form.content = "";
form.ua = "";
- cmStore.setCmCode("");
+ cmStore.setEditCode('SubEditer', "");
break;
}
// 标记 加载完成
@@ -474,7 +474,7 @@ watchEffect(() => {
form.source = sourceData.source;
form.url = sourceData.url;
form.content = sourceData.content;
- cmStore.setCmCode(sourceData.content);
+ cmStore.setEditCode('SubEditer', sourceData.content);
form.ua = sourceData.ua;
break;
}
diff --git a/src/views/editCode/cmView.vue b/src/views/editCode/cmView.vue
index c2a6be323..98437529d 100644
--- a/src/views/editCode/cmView.vue
+++ b/src/views/editCode/cmView.vue
@@ -80,8 +80,8 @@ const { theme } = storeToRefs(settingsStore);
const isDarkModeEnabled = ref(true);
const Length = ref("");
-const props = defineProps(["isReadOnly"]);
-
+const props = defineProps(["isReadOnly", "id"]);
+console.log(props.id);
const cmStore = useCodeStore();
const viewRef = ref(null);
@@ -116,7 +116,7 @@ const CreateView = () => {
const docContent = update.state.doc.toString();
docUpdate = true;
console.log("更新文档 - CodeValue");
- cmStore.setCmCode(docContent);
+ cmStore.setEditCode([props.id], docContent);
Length.value = formatLength(docContent.length);
docUpdate = false;
}),
@@ -126,13 +126,13 @@ const CreateView = () => {
openText: "▾",
}),
],
- doc: cmStore.CmCode,
+ doc: cmStore.EditCode[props.id],
}),
parent: viewRef.value,
});
watch(
- () => cmStore.CmCode,
+ () => cmStore.EditCode[props.id],
(newValue) => {
if (!docUpdate && newValue !== view.state.doc.toString()) {
console.log("Code更新到文档");
@@ -171,13 +171,12 @@ function formatLength(length) {
}
}
const getjsjson = (res) => {
- Length.value = formatLength(res.length);
+ Length.value = formatLength(res?.length);
try {
const jsRegex =
/(?:function|var|let|const|if|else|return|try|catch|finally|typeof|delete|async|await)\b/;
if (jsRegex.test(res.slice(0, 4000))) {
setHJ();
-
console.log("---setHJ");
return true;
} else {
@@ -227,7 +226,7 @@ watchEffect(() => {
onMounted(() => {
CreateView();
let lg = localStorage.getItem("highlightJS");
- const x = getjsjson(cmStore.CmCode);
+ const x = getjsjson(cmStore.EditCode[props.id]);
if (!x) {
if (lg == 1 || lg == null) {
setHJ();
@@ -291,9 +290,10 @@ const redoCode = () => redo(view);
async function formatCode() {
try {
- cmStore.setCmCode(
+ cmStore.setEditCode(
+ [props.id],
beautify
- .js_beautify(cmStore.CmCode, {
+ .js_beautify(cmStore.EditCode[props.id], {
indent_size: 2,
})
.replace(/^\s*[\r\n]/gm, "\n")
@@ -304,7 +304,7 @@ async function formatCode() {
}
const copyText = async () => {
- const x = await toClipboard(cmStore.CmCode);
+ const x = await toClipboard(cmStore.EditCode[props.id]);
if (x) {
showNotify({
type: "success",
@@ -314,7 +314,7 @@ const copyText = async () => {
};
const delAllCode = () => {
- cmStore.setCmCode("");
+ cmStore.setEditCode([props.id], "");
showNotify({
type: "success",
title: "已清空",
@@ -325,7 +325,7 @@ const pasteNav = async () => {
try {
const clipboardText = await navigator.clipboard.readText();
if (clipboardText?.length > 0) {
- cmStore.setCmCode(clipboardText);
+ cmStore.setEditCode([props.id], clipboardText);
showNotify({
type: "success",
title: "已粘贴字数: " + clipboardText.length,
diff --git a/src/views/editCode/editScript.vue b/src/views/editCode/editScript.vue
index c53fa5b13..4f75f1f29 100644
--- a/src/views/editCode/editScript.vue
+++ b/src/views/editCode/editScript.vue
@@ -1,5 +1,5 @@
-
+
{
});
const pushEditCode = () => {
- cmStore.setCmCode(value.code ? value.code : placeholders);
+ cmStore.setEditCode(id,value.code ? value.code : placeholders);
router.push(`/edit/Script/${id}`);
};