zydx-plus 1.30.146 → 1.30.148

package/package.json

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

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

@@ -1999,6 +1999,30 @@ let buttonNames = {
                         }
                     }
                 },
+                resource_Interrogation: {
+                    actionName: '诘问资源',
+                        buttonList: {
+                        0: {
+                            headLevel: {
+                                default: "demand",
+                                demand: '回答要求',
+                                resourceIndex: '教学项目',
+                                review: '回答点评',
+                                analyse: '回答分析',
+                                countermeasure: '教学对策'
+                            },
+                            otherLevel: {
+                                default: "singletonClass",
+                                singletonClass: this.getCurrentPrefix(item) + '项目',
+                                allClass: this.getPrefix(item) + '项目'
+                            },
+                            lowLevel: {
+                                default: "singletonClass",
+                                singletonClass: this.getCurrentPrefix(item) + '项目'
+                            }
+                        }
+                    }
+                },
                 resource_lesson020: {
                     actionName: '逻辑思维',
                     buttonList: {
@@ -2425,6 +2449,29 @@ let buttonNames = {
                         }
                     }
                 },
+                lesson_resource_list: {
+                    actionName: '资源列表',
+                    buttonList: {
+                        0: {
+                            headLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: '演示阅读',
+                                btnIndex2: '互动操作',
+                                btnIndex3: '深度拓展'
+                            },
+                            otherLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: '演示阅读',
+                                btnIndex2: '互动操作'
+                            },
+                            lowLevel: {
+                                default: "btnIndex1",
+                                btnIndex1: '演示阅读',
+                                btnIndex2: '互动操作'
+                            }
+                        }
+                    }
+                },
             }[this.actionId];
         },
         // 获取前缀内容

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

@@ -98,6 +98,37 @@ export default defineComponent({
         window.closeMaker = this.closeMaker
     },
     methods: {
+        headerData(data,lens,size,label) {
+            let onePage = ''
+            let numArr = 0
+            let page = 0
+            const len = this.thatLenText(data.children,lens)
+            console.log(len)
+            const num = len.length === 0? 1 : len.length
+            const textAlign = data.textAlign? data.textAlign : 'left'
+            if(label === 1) onePage += `<h1 style="margin: 5px 0;text-align: ${textAlign};">`
+            if(label === 2) onePage += `<h2 style="margin: 5px 0;text-align: ${textAlign};">`
+            if(label === 3) onePage += `<h3 style="margin: 5px 0;text-align: ${textAlign};">`
+            if(label === 4) onePage += `<h4 style="margin: 5px 0;text-align: ${textAlign};">`
+            if(label === 5) onePage += `<h5 style="margin: 5px 0;text-align: ${textAlign};">`
+            for(let j=0; j<data.children.length; j++) {
+                const fontSize = data.children[j].fontSize? data.children[j].fontSize : ''+ size +'px'
+                numArr = parseInt(fontSize) * 1.5
+                const color = data.children[j].color? data.children[j].color : '#000'
+                if(data.children[j].sup) {
+                    onePage += `<span style="display:inline-block;height: ${numArr}px;line-height: ${numArr}px;font-size: ${fontSize};color: ${color}"><sup>${data.children[j].text}</sup></span>`
+                }else {
+                    onePage += `<span style="display:inline-block;height: ${numArr}px;line-height: ${numArr}px;font-size: ${fontSize};color: ${color}">${data.children[j].text}</span>`
+                }
+                page += (numArr + 10)*num
+            }
+            if(label === 1) onePage += `</h1>`
+            if(label === 2) onePage += `</h2>`
+            if(label === 3) onePage += `</h3>`
+            if(label === 4) onePage += `</h4>`
+            if(label === 5) onePage += `</h5>`
+            return {onePages: onePage,pages: page}
+        },
         readOnlyPage() {
             this.htmlArr = []
             let onePage = ''
@@ -110,6 +141,31 @@ export default defineComponent({
                     onePage = ''
                     page = 0
                 }
+                if(data[i].type === 'header1') {
+                    const { onePages,pages } = this.headerData(data[i],38,32,1)
+                    onePage += onePages
+                    page += pages
+                }
+                if(data[i].type === 'header2') {
+                    const { onePages,pages } = this.headerData(data[i],60,23,2)
+                    onePage += onePages
+                    page += pages
+                }
+                if(data[i].type === 'header3') {
+                    const { onePages,pages } = this.headerData(data[i],78,17,3)
+                    onePage += onePages
+                    page += pages
+                }
+                if(data[i].type === 'header4') {
+                    const { onePages,pages } = this.headerData(data[i],92,14,4)
+                    onePage += onePages
+                    page += pages
+                }
+                if(data[i].type === 'header5') {
+                    const { onePages,pages } = this.headerData(data[i],106,12,5)
+                    onePage += onePages
+                    page += pages
+                }
                 if(data[i].type === 'paragraph') {
                     let numArr = 0
                     const len = this.thatLenText(data[i].children,92)
@@ -255,11 +311,6 @@ export default defineComponent({
                         uploadImage: props.uploadImage,
                         uploadAttachment: props.uploadAttachment
                     }
-                    // hoverbarKeys: {
-                    //   attachment: {
-                    //     menuKeys: ['menu4'],
-                    //   },
-                    // },
                 }
             }
         })
@@ -281,7 +332,6 @@ export default defineComponent({
             }
             return -1
         }
-
         return {opts, handle, formData, syncContent}
     }
 })
@@ -321,11 +371,6 @@ export default defineComponent({
     border-right: 1px solid #d9d9d9;
 }
 
-/*工具栏剧中显示*/
-.w-e-toolbar {
-    justify-content: center !important;
-}
-
 /*编辑器样式*/
 .editable {
     width: 100%;
@@ -355,6 +400,25 @@ export default defineComponent({
 :deep(.w-e-text-container p) {
     margin: 5px 0;
 }
+:deep(.w-e-text-container h1) {
+    margin: 5px 0;
+}
+:deep(.w-e-text-container h2) {
+    margin: 5px 0;
+}
+:deep(.w-e-text-container h3) {
+    margin: 5px 0;
+}
+:deep(.w-e-text-container h4) {
+    margin: 5px 0;
+}
+:deep(.w-e-text-container h5) {
+    margin: 5px 0;
+}
+:deep(.w-e-text-container h6) {
+    margin: 5px 0;
+}
+
 
 :deep(.w-e-text-placeholder) {
     top: 6px;

package/src/components/tipBox/index.js

@@ -8,7 +8,7 @@ render(divNode, document.body)
 const container = divNode.el
 
 // 导出函数可通过调用 Confirm() 函数动态创建 XtxConfirm 组件
-const Confirm = ({ type, url ,title,radioArr,submitText, promptContent, middle, cancelShow, inputArr }) => {
+const Confirm = ({ type, url ,title,radioArr,checkboxArr,submitText, promptContent, middle, cancelShow, inputArr }) => {
     // 返回 Promise 对象
     return new Promise((resolve, reject) => {
         // 2. 点击确认按钮，触发resolve同时销毁组件
@@ -30,6 +30,13 @@ const Confirm = ({ type, url ,title,radioArr,submitText, promptContent, middle,
                     }
                 }
             }
+            if(type === 'checkbox') {
+                for(let i=0; i< checkboxArr.length; i++) {
+                    if(checkboxArr[i].checked) {
+                        val.push(checkboxArr[i].value)
+                    }
+                }
+            }
             render(null, container)
             resolve(val)
         }
@@ -39,7 +46,7 @@ const Confirm = ({ type, url ,title,radioArr,submitText, promptContent, middle,
             reject('点击取消')
         }
         // 1. 创建 XtxConfirm 组件
-        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, promptContent,radioArr, middle, cancelShow, inputArr, submit, cancel })
+        const VNode = createVNode(XtxConfirm, { type, url ,title, submitText, promptContent,radioArr,checkboxArr, middle, cancelShow, inputArr, submit, cancel })
         render(VNode, container)
     })
 }

package/src/components/tipBox/src/main.vue

@@ -21,6 +21,17 @@
                                 </label>
                             </div>
                         </div>
+                        <div class="check" v-if="type === 'checkbox'">
+                            <div class="check-cont">
+                                <div class="check-li" v-for="(item,index) in checkboxArr" :key="index">
+                                    <label>
+                                        <input type="checkbox" :value="item.value" :checked="item.checked"
+                                               @change="checkboxTao(index)"/>
+                                        <span>{{ item.label }}</span>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
                         <div class="tip-img" v-if="type === 'input'">
                             <div class="tip-input" v-for="(item,index) in inputArr" :key="index">
                                 <span v-if="item.name"><em v-html="item.name"></em><i v-if="item.required">*</i></span>
@@ -118,6 +129,10 @@ export default {
             type: Array,
             default: []
         },
+        checkboxArr: { // 单选数据
+            type: Array,
+            default: []
+        },
         submitText: { // 确认按钮
             type: String,
             default: '确认'
@@ -135,6 +150,9 @@ export default {
         }
     },
     methods: {
+        checkboxTao(index) {
+            this.checkboxArr[index].checked = !this.checkboxArr[index].checked
+        },
         fileTap(event,index) {
             let file = event.target.files[0]
             this.fileName = file.name

package/src/components/tipBox/src/zydxStyle.css

@@ -1,266 +1,329 @@
 @keyframes linkDown {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-.tip-popupWindowSearch{
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.2);
-  z-index: 2000;
-  display: flex;
-  align-items: center;
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
+}
+
+.tip-popupWindowSearch {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.2);
+    z-index: 2000;
+    display: flex;
+    align-items: center;
 }
+
 .tip-box {
-  width: 480px;
-  padding: 40px 40px;
-  background-color: white;
-  border-radius: 5px;
-  border: 5px rgba(0, 0, 0, .1) solid;
-  margin: 0 auto;
-  box-sizing: border-box;
-  animation: linkDown .3s linear forwards;
-  opacity: 0;
+    width: 480px;
+    padding: 40px 40px;
+    background-color: white;
+    border-radius: 5px;
+    border: 5px rgba(0, 0, 0, .1) solid;
+    margin: 0 auto;
+    box-sizing: border-box;
+    animation: linkDown .3s linear forwards;
+    opacity: 0;
 }
-.tip-boxContent{
-  max-height: 600px;
+
+.tip-boxContent {
+    max-height: 600px;
 }
-.tip-boxContent:hover{
-  cursor:default
+
+.tip-boxContent:hover {
+    cursor: default
 }
 
 .tip-closeBtn {
-  position: absolute;
-  top: 10px;
-  right: 10px;
-  font-size: 28px;
-  color: #767676;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    font-size: 28px;
+    color: #767676;
 }
+
 .tip-title {
-  margin-bottom: 20px;
-  font-size: 18px;
-  font-weight: 700;
-  flex-shrink: 0;
-  display: flex;
-  align-items: flex-end;
-  justify-content: center;
-  flex-wrap: wrap;
-  overflow: hidden;
+    margin-bottom: 20px;
+    font-size: 18px;
+    font-weight: 700;
+    flex-shrink: 0;
+    display: flex;
+    align-items: flex-end;
+    justify-content: center;
+    flex-wrap: wrap;
+    overflow: hidden;
 }
+
 .tip-title1 {
-  font-size: 16px;
-  text-align: left;
+    font-size: 16px;
+    text-align: left;
 }
-.tip-title2{
-  font-size: 16px;
-  text-align: center;
-  line-height: 30px;
+
+.tip-title2 {
+    font-size: 16px;
+    text-align: center;
+    line-height: 30px;
 }
 
 .tip-btnBox {
-margin-top: 20px;
-flex-shrink: 0;
-display: flex;
-justify-content: center;
-align-items: flex-start;
-font-size: 12px;
-}
-
-.tip-btnBox>div {
-  width: 60px;
-  height: 22px;
-  line-height: 22px;
-  margin-right: 10px;
-  border-radius: 3px;
-  border: 1px solid #000000;
-  cursor: pointer;
-  text-align: center;
-}
-.tip-quesTitle{
-  padding-left: 2px;
-  margin-left: -10px!important;
-}
-.tap-p{
-  text-align: center;
-}
-.tip-img{
-  width: 100%;
-  display: inline-block;
-}
-.tip-img>img{
-  width: 100%;
-}
-.tip-input{
-  display: inline-block;
-  padding-bottom: 15px;
-}
-.tip-input:last-child{
-  padding-bottom: 0;
-}
-.tip-input>span{
-  font-size: 16px;
-  font-weight: bold;
-  display: inline-block;
-  line-height: 30px;
-  padding-right: 10px;
-  text-align: right;
-  float: left;
-  position: relative;
-}
-.tip-input>span>em{
-  font-style: normal;
-}
-.tip-input>span>i{
-  color: #dc231d;
-  font-style: normal;
-  position: absolute;
-  top: 0;
-  left: -10px;
-  z-index: 1;
-  font-size: 14px;
-}
-.tip-input input{
-  width: 211px;
-  height: 32px;
-  box-sizing: border-box;
-  font-size: 16px;
-  outline: none;
-  padding-left: 10px;
-  border: 1px solid #ccc;
-  border-radius: 3px;
-  box-shadow: 0 1px 0 1px rgb(0 0 0 / 4%);
-}
-.tip-input>select{
-  width: 210px;
-  height: 30px;
-  box-sizing: border-box;
-  font-size: 16px;
-  outline: none;
-  padding-left: 10px;
-  border: 1px solid #ccc;
-}
-.text{
-  display: inline-block;
-  font-size: 16px;
-  width: 210px;
-  text-align: left;
-}
-.cal{
-  display: inline-block;
-  position: relative;
-}
-.ph-code{
-  position: relative;
-  display: inline-block;
-}
-.ph-code>button{
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 1;
-  margin-left: 5px;
-  font-size: 12px;
-  background-color: transparent;
-  padding: 2px 5px;
-  cursor: pointer;
-  width: 75px;
-  height: 32px;
-  line-height: 30px;
-  border: 0;
-  border-left: 1px solid #ccc;
-}
-.radio-list{
-  padding: 10px 20px;
-  text-align: left;
-  font-size: 16px;
-  position: relative;
-}
-.radio-list span{
-  padding-left: 22px;
-}
-.radio-list input{
-  width: 16px;
-  height: 16px;
-  position: absolute;
-  top: 12px;
-  left: 20px;
-  z-index: 1;
-}
-.number-input{
-  width: 211px;
-  height: 32px;
-  box-sizing: border-box;
-  font-size: 16px;
-  outline: none;
-  border: 1px solid #ccc;
-  border-radius: 3px;
-  box-shadow: 0 1px 0 1px rgb(0 0 0 / 4%);
-  overflow: hidden;
-}
-.number-input>input{
-  border: 0 !important;
-  box-shadow: none !important;
-  height: 30px !important;
-  width: 240px !important;
-}
-.file-cont{
-  display: inline-block;
-  position: relative;
+    margin-top: 20px;
+    flex-shrink: 0;
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    font-size: 12px;
+}
+
+.tip-btnBox > div {
+    width: 60px;
+    height: 22px;
+    line-height: 22px;
+    margin-right: 10px;
+    border-radius: 3px;
+    border: 1px solid #000000;
+    cursor: pointer;
+    text-align: center;
+}
+
+.tip-quesTitle {
+    padding-left: 2px;
+    margin-left: -10px !important;
+}
+
+.tap-p {
+    text-align: center;
+}
+
+.tip-img {
+    width: 100%;
+    display: inline-block;
+}
+
+.tip-img > img {
+    width: 100%;
+}
+
+.tip-input {
+    display: inline-block;
+    padding-bottom: 15px;
+}
+
+.tip-input:last-child {
+    padding-bottom: 0;
+}
+
+.tip-input > span {
+    font-size: 16px;
+    font-weight: bold;
+    display: inline-block;
+    line-height: 30px;
+    padding-right: 10px;
+    text-align: right;
+    float: left;
+    position: relative;
+}
+
+.tip-input > span > em {
+    font-style: normal;
+}
+
+.tip-input > span > i {
+    color: #dc231d;
+    font-style: normal;
+    position: absolute;
+    top: 0;
+    left: -10px;
+    z-index: 1;
+    font-size: 14px;
+}
+
+.tip-input input {
+    width: 211px;
+    height: 32px;
+    box-sizing: border-box;
+    font-size: 16px;
+    outline: none;
+    padding-left: 10px;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    box-shadow: 0 1px 0 1px rgb(0 0 0 / 4%);
+}
+
+.tip-input > select {
+    width: 210px;
+    height: 30px;
+    box-sizing: border-box;
+    font-size: 16px;
+    outline: none;
+    padding-left: 10px;
+    border: 1px solid #ccc;
+}
+
+.text {
+    display: inline-block;
+    font-size: 16px;
+    width: 210px;
+    text-align: left;
 }
+
+.cal {
+    display: inline-block;
+    position: relative;
+}
+
+.ph-code {
+    position: relative;
+    display: inline-block;
+}
+
+.ph-code > button {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 1;
+    margin-left: 5px;
+    font-size: 12px;
+    background-color: transparent;
+    padding: 2px 5px;
+    cursor: pointer;
+    width: 75px;
+    height: 32px;
+    line-height: 30px;
+    border: 0;
+    border-left: 1px solid #ccc;
+}
+
+.radio-list {
+    padding: 10px 20px;
+    text-align: left;
+    font-size: 16px;
+    position: relative;
+}
+
+.radio-list span {
+    padding-left: 22px;
+}
+
+.radio-list input {
+    width: 16px;
+    height: 16px;
+    position: absolute;
+    top: 12px;
+    left: 20px;
+    z-index: 1;
+}
+
+.number-input {
+    width: 211px;
+    height: 32px;
+    box-sizing: border-box;
+    font-size: 16px;
+    outline: none;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    box-shadow: 0 1px 0 1px rgb(0 0 0 / 4%);
+    overflow: hidden;
+}
+
+.number-input > input {
+    border: 0 !important;
+    box-shadow: none !important;
+    height: 30px !important;
+    width: 240px !important;
+}
+
+.file-cont {
+    display: inline-block;
+    position: relative;
+}
+
 .file-cont label {
-  position: absolute;
-  top: 0;
-  right: 0;
-  z-index: 1;
-  padding-top: 6px;
-}
-.file{
-  display: none;
-}
-.file-cont>em{
-  display: inline-block;
-  font-style: normal;
-  width: 211px;
-  height: 32px;
-  box-sizing: border-box;
-  font-size: 16px;
-  outline: none;
-  padding-left: 10px;
-  border-radius: 3px;
-  text-align: left;
-  line-height: 32px;
-  padding-right: 65px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  word-break: break-all;
-}
-.but{
-  margin-left: 5px;
-  font-size: 12px;
-  background-color: transparent;
-  border: 1px solid #000;
-  border-radius: 3px;
-  padding: 2px 5px;
-  cursor: pointer;
-  min-width: 60px;
-  display: inline-block;
-}
-.input-name{
-  display: inline-block;
-  position: relative;
-}
-.input-name b{
-  position: absolute;
-  top: 5px;
-  right: 10px;
-  z-index: 1;
-  font-size: 16px;
-  font-weight: normal;
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 1;
+    padding-top: 6px;
+}
+
+.file {
+    display: none;
+}
+
+.file-cont > em {
+    display: inline-block;
+    font-style: normal;
+    width: 211px;
+    height: 32px;
+    box-sizing: border-box;
+    font-size: 16px;
+    outline: none;
+    padding-left: 10px;
+    border-radius: 3px;
+    text-align: left;
+    line-height: 32px;
+    padding-right: 65px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    word-break: break-all;
+}
+
+.but {
+    margin-left: 5px;
+    font-size: 12px;
+    background-color: transparent;
+    border: 1px solid #000;
+    border-radius: 3px;
+    padding: 2px 5px;
+    cursor: pointer;
+    min-width: 60px;
+    display: inline-block;
+}
+
+.input-name {
+    display: inline-block;
+    position: relative;
+}
+
+.input-name b {
+    position: absolute;
+    top: 5px;
+    right: 10px;
+    z-index: 1;
+    font-size: 16px;
+    font-weight: normal;
+}
+
+.check {
+    text-align: center;
+}
+
+.check-cont {
+    display: inline-block;
+}
+
+.check-li {
+    display: inline-block;
+    margin-right: 15px;
+    position: relative;
+}
+.check-li:last-child{
+    margin-right: 0;
+}
+.check-li span{
+    display: inline-block;
+    padding-left: 20px;
+}
+.check-li input{
+    width: 14px;
+    height: 14px;
+    position: absolute;
+    top: 3px;
+    left: 0;
+    z-index: 1;
 }

package/src/index.js

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