！

sub-store-org · Mar 18, 2024 · f5f61c6 · f5f61c6
1 parent 1878265
commit f5f61c6
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 26 deletions.
diff --git 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
@@ -108,7 +108,7 @@
             type="text"
           /> -->
           <div style="margin-left: -10px; margin-right: -20px">
-            <cmView :isReadOnly="false" />
+            <cmView :isReadOnly="false" id="FileEditer"/>
           </div>
         </nut-form-item>
         <!-- ua -->
@@ -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
@@ -21,7 +21,7 @@
           <font-awesome-icon icon="fa-solid fa-circle-xmark" />
         </button>
       </header>
-      <cmView :isReadOnly="true" />
+      <cmView :isReadOnly="false" id="filePreview"/>
       <!-- <div class="compare-page-body">
         <div class="block-wrapper">
           <div class="input-wrapper">
@@ -74,7 +74,10 @@ const displayName = computed(() => {
 
 const originalData = previewData.original;
 const processedData = previewData.processed;
-cmStore.setCmCode(processedData)
+// cmStore.setCmCode(processedData)
+cmStore.setEditCode('filePreview',processedData)
+
+ 
 const clickClose = () => {
   emit("closePreview");
 };

diff --git a/src/views/SubEditor.vue b/src/views/SubEditor.vue
@@ -130,7 +130,7 @@
             /> -->
 
             <div style="margin-left: -10px; margin-right: -20px">
-              <cmView :isReadOnly="false"/>
+              <cmView :isReadOnly="false" id="SubEditer"/>
             </div>
           </nut-form-item>
           <!-- ua -->
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 <template>
-  <cmView :isReadOnly="false" />
+  <cmView :isReadOnly="false" :id="id" />
   <div class="bottom-btn-wrapper">
     <nut-button
       @click="routerBack"

diff --git a/src/views/editor/components/Script.vue b/src/views/editor/components/Script.vue
@@ -215,7 +215,7 @@ watch(value, () => {
 });
 
 const pushEditCode = () => {
-  cmStore.setCmCode(value.code ? value.code : placeholders);
+  cmStore.setEditCode(id,value.code ? value.code : placeholders);
   router.push(`/edit/Script/${id}`);
 };
 </script>