zydx-plus 1.30.160 → 1.30.162

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zydx-plus",
-  "version": "1.30.160",
+  "version": "1.30.162",
   "description": "Vue.js",
   "main": "src/index.js",
   "files": [

package/src/components/biz_header/src/button_name.js

@@ -1132,7 +1132,6 @@ let buttonNames = {
                 }
             }[this.actionId];
             if (this.isTeacherReview) {
-                console.log(actionInfo.buttonList[this.tabType].lowLevel)
                 delete actionInfo.buttonList[this.tabType].lowLevel.studentReview;
             } else {
                 delete actionInfo.buttonList[this.tabType].lowLevel.teacherReview;
@@ -2192,6 +2191,7 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '实践要求',
+                                guideIndex: '指导意见',
                                 resourceIndex: '实践项目',
                                 review: '实践点评',
                                 analyse: '实践分析',
@@ -2216,6 +2216,7 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '实验要求',
+                                guideIndex: '指导意见',
                                 resourceIndex: '实验项目',
                                 review: '实验点评',
                                 analyse: '实验分析',
@@ -2240,6 +2241,7 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '项目要求',
+                                guideIndex: '指导意见',
                                 resourceIndex: '项目主题',
                                 review: '项目点评',
                                 analyse: '项目分析',
@@ -2264,6 +2266,7 @@ let buttonNames = {
                             headLevel: {
                                 default: "demand",
                                 demand: '创新要求',
+                                guideIndex: '指导意见',
                                 resourceIndex: '创新任务',
                                 review: '创新点评',
                                 analyse: '创新分析',

package/src/components/dragPopup/src/dragPopup.vue

@@ -15,9 +15,9 @@
            <div class="drag-cont-slot">
                <slot name="content"></slot>
            </div>
-           <i class="down" v-if="dragStatus" @mousedown="footDown($event,'d')" @mouseup="footUp"></i>
-           <i class="in" v-if="dragStatus" @mousedown="footDown($event,'in')" @mouseup="footUp"></i>
-           <i class="right" v-if="dragStatus" @mousedown="footDown($event,'r')" @mouseup="footUp"></i>
+           <i class="drag-down" v-if="dragStatus" @mousedown="footDown($event,'d')" @mouseup="footUp"></i>
+           <i class="drag-in" v-if="dragStatus" @mousedown="footDown($event,'in')" @mouseup="footUp"></i>
+           <i class="drag-right" v-if="dragStatus" @mousedown="footDown($event,'r')" @mouseup="footUp"></i>
        </div>
        <div class="down-text" v-if="dragStatus">
            <div class="down-text-cont">
@@ -98,7 +98,7 @@ export default {
     },
     computed: {
         position() {
-            return `top:${this.y}px;left:${this.x}px;width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
+            return `transform: translate(${this.x}px, ${this.y}px);width:${this.footRightOffset}px;height:${this.footDownOffset}px;`;
         },
     },
     emits: ['dragStatus','close'],
@@ -201,7 +201,7 @@ export default {
     padding: 0 10px;
     text-align: right;
 }
-.down{
+.drag-down{
     position: absolute;
     bottom: -50px;
     right: 20px;
@@ -212,7 +212,7 @@ export default {
     cursor: ns-resize;
     user-select: none;
 }
-.in{
+.drag-in{
     position: absolute;
     bottom: -40px;
     right: -20px;
@@ -223,7 +223,7 @@ export default {
     cursor: nwse-resize;
     user-select: none;
 }
-.right{
+.drag-right{
     position: absolute;
     bottom: 0;
     right: -20px;
@@ -272,6 +272,8 @@ export default {
 }
 .drag-pop {
     position: fixed;
+    top: 0;
+    left: 0;
     box-shadow: 0 0 3px 2px #ccc;
     background-color: #fff;
     border-radius: 3px;

package/src/components/editor/src/editor.vue

@@ -5,7 +5,7 @@
         <button class="def-but" v-if="butShow" @click="confirm">完成</button>
     </div>
     <div class="read-only" v-if="readOnly">
-        <div class="read-only-page" :style="{width: !page? '100%': '794px',height: !page? 'auto': '1123px','box-shadow': !page? 'none': '0 0 10px rgba(0, 0, 0, 0.1)', 'padding': !page? '10px':'60px'}" v-for="(item,index) in htmlArr" >
+        <div class="read-only-page" :style="{height: !page? 'auto': '1123px','box-shadow': !page? 'none': '0 0 10px rgba(0, 0, 0, 0.1)', 'padding': !page? '10px':'60px'}" v-for="(item,index) in htmlArr" >
             <div class="read-only-p" v-html="item"></div>
             <div v-if="page" class="read-only-a">{{ index + 1 }}/{{ htmlArr.length }}</div>
         </div>
@@ -88,7 +88,7 @@ export default defineComponent({
                     setTimeout(() => {
                         this.editableShow = true
                         this.readOnlyPage()
-                    },10)
+                    },50)
                 }
             },
             deep: true,
@@ -218,6 +218,7 @@ export default defineComponent({
     text-align: right;
 }
 .read-only-page{
+    width: 794px;
     margin: 0 auto 20px auto;
     background-color: #fff;
     box-sizing: border-box;

package/src/components/editor2/src/editor.vue

@@ -75,7 +75,6 @@
     </div>
 </template>
 <script>
-
 import { html2json, json2html } from 'html2json'
 import { Editor, EditorContent } from '@tiptap/vue-3'
 import StarterKit from '@tiptap/starter-kit'
@@ -84,6 +83,7 @@ import TextAlign from '@tiptap/extension-text-align'
 import Placeholder from '@tiptap/extension-placeholder'
 import Color from '@tiptap/extension-color'
 import textStyle from '@tiptap/extension-text-style'
+import { sid } from "./sign-id";
 export default {
     name: 'zydx-xiao-editor',
     components: {
@@ -206,6 +206,7 @@ export default {
         }
     },
     mounted() {
+        let _this = this
         this.uploadAttData = (this.data.enclosure === undefined)? [] : this.enclosureAction(this.data.enclosure)
         this.heightStyle = (this.height === '100%')? {height: '100%'} : {'min-height': this.height}
         const height = this.height.split('px')[0] - 44
@@ -214,6 +215,7 @@ export default {
             content: json2html({node: "root",child: (this.data.html === undefined)? [] : this.data.html}),
             editable: this.readOnly,
             extensions: [
+                sid,
                 StarterKit,
                 textStyle,
                 Color.configure({
@@ -237,7 +239,18 @@ export default {
                     html: html2json(editor.getHTML()).child,
                     enclosure: this.uploadAttData
                 })
-            },
+            }
+        })
+        document.addEventListener('keydown', function (e) {
+            if (e.keyCode === 8 || e.keyCode === 46) {
+                const sid = _this.editor.state.selection.$anchor.parent.attrs.sid
+                if(sid === 'prohibit') {
+                    _this.editor.setEditable(false);
+                    setTimeout(() => {
+                        _this.editor.setEditable(true);
+                    }, 0);
+                }
+            }
         })
     },
     methods: {
@@ -341,7 +354,6 @@ export default {
         insertContent(v) {
             for(let i=0; i< v.length; i++) {
                 let html = json2html(v[i])
-                console.log(html)
                 this.editor.chain().focus().insertContentAt(this.selection(),html).run()
             }
         },

package/src/components/editor2/src/sign-id.js

@@ -0,0 +1,33 @@
+import { Extension } from '@tiptap/core'
+
+export const sid = Extension.create({
+    name: 'sid',
+
+    addOptions() {
+        return {
+            types: ['heading', 'paragraph'],
+        }
+    },
+
+    addGlobalAttributes() {
+        return [
+            {
+                types: this.options.types,
+                attributes: {
+                    sid: {
+                        default: null,
+                        parseHTML: element => element.getAttribute('data-sid'),
+                        renderHTML: attributes => {
+                            if (!attributes.sid) {
+                                return {}
+                            }
+                            return {
+                                'data-sid': attributes.sid,
+                            }
+                        },
+                    },
+                },
+            },
+        ]
+    }
+})

package/src/index.js

@@ -71,7 +71,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.30.160',
+    version: '1.30.162',
     install,
     Calendar,
     Message,