diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index d044462a5..a779c9a53 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -966,6 +966,15 @@ "resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.4.tgz", "integrity": "sha512-q68CMfgGnlwrV6BFupIGNSitHbuFhGzA+uTBztFKAQuGCF/Xy0mi33jwEPQaHtnb89cLFlsc7AIxk/2gdtXrvw==" }, + "node_modules/@types/jquery": { + "version": "3.5.29", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz", + "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==", + "dev": true, + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.14", "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.14.tgz", @@ -1027,6 +1036,12 @@ "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", + "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + "dev": true + }, "node_modules/@types/spark-md5": { "version": "3.0.4", "resolved": "https://registry.npmmirror.com/@types/spark-md5/-/spark-md5-3.0.4.tgz", @@ -5265,6 +5280,11 @@ "jiti": "bin/jiti.js" } }, + "node_modules/jquery": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + }, "node_modules/js-base64": { "version": "2.6.4", "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", diff --git a/package-lock.json b/package-lock.json index 1d1bca102..386bcb660 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "echarts": "^5.4.3", "element-plus": "^2.3.4", "font-awesome": "^4.7.0", + "jquery": "^3.7.1", "js-beautify": "^1.14.8", "js-md5": "^0.7.3", "mapv-three": "^1.0.18", @@ -46,6 +47,7 @@ "@commitlint/cli": "^17.6.3", "@commitlint/config-conventional": "^17.6.3", "@iconify-json/ep": "^1.1.10", + "@types/jquery": "^3.5.29", "@types/md5": "^2.3.2", "@types/nprogress": "^0.2.0", "@types/path-browserify": "^1.0.0", @@ -1363,6 +1365,15 @@ "resolved": "https://registry.npmmirror.com/@types/event-emitter/-/event-emitter-0.3.4.tgz", "integrity": "sha512-q68CMfgGnlwrV6BFupIGNSitHbuFhGzA+uTBztFKAQuGCF/Xy0mi33jwEPQaHtnb89cLFlsc7AIxk/2gdtXrvw==" }, + "node_modules/@types/jquery": { + "version": "3.5.29", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz", + "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==", + "dev": true, + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/json-schema": { "version": "7.0.14", "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.14.tgz", @@ -1424,6 +1435,12 @@ "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", + "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==", + "dev": true + }, "node_modules/@types/spark-md5": { "version": "3.0.4", "resolved": "https://registry.npmmirror.com/@types/spark-md5/-/spark-md5-3.0.4.tgz", @@ -5675,6 +5692,11 @@ "jiti": "bin/jiti.js" } }, + "node_modules/jquery": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + }, "node_modules/js-base64": { "version": "2.6.4", "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", diff --git a/package.json b/package.json index d2856036f..d25cd9ece 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "echarts": "^5.4.3", "element-plus": "^2.3.4", "font-awesome": "^4.7.0", + "jquery": "^3.7.1", "js-beautify": "^1.14.8", "js-md5": "^0.7.3", "mapv-three": "^1.0.18", @@ -77,6 +78,7 @@ "@commitlint/cli": "^17.6.3", "@commitlint/config-conventional": "^17.6.3", "@iconify-json/ep": "^1.1.10", + "@types/jquery": "^3.5.29", "@types/md5": "^2.3.2", "@types/nprogress": "^0.2.0", "@types/path-browserify": "^1.0.0", diff --git a/src/widget/associatedforms/associatedFormsTinyace.vue b/src/widget/associatedforms/associatedFormsTinyace.vue index 2521c43a1..40764b91f 100644 --- a/src/widget/associatedforms/associatedFormsTinyace.vue +++ b/src/widget/associatedforms/associatedFormsTinyace.vue @@ -5,7 +5,6 @@ import tinymce from "tinymce/tinymce"; import "tinymce/models/dom"; // 特别注意 tinymce 6.0.0 版本之后必须引入，否则不显示 import "tinymce/themes/silver/theme"; import Editor from "@tinymce/tinymce-vue"; // 引入组件 - import { v4 as uuidv4 } from "uuid"; let onlyNumber = uuidv4().replaceAll('-','').toString(); //获取唯一编码 @@ -26,6 +25,7 @@ const tinymceInit = { forced_root_block:'', newline_behavior:"", content_css: "/tinymce/skins/content/default/content.css", //以css文件方式自定义可编辑区域的css样式，css文件需自己创建并引入 + auto_focus : true, } const props = defineProps({ aftText:{ @@ -79,10 +79,7 @@ const tinymceReInit = ()=>{ let str:string = props.aftTextCopy } const focusEditor = ()=>{ - console.log("1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111") - console.log("111111111111111111111111"+onlyNumber) - console.log(document.getElementById(onlyNumber)) - document.getElementById(onlyNumber)?.focus() + tinymce.EditorManager.get(onlyNumber)?.focus(true) } @@ -99,7 +96,7 @@ defineExpose({