@zykjcommon/questions 0.0.38 → 0.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zykjcommon/questions",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "main": "src/components/questions/entry.js",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -9,7 +9,8 @@
     "pre": "vue-cli-service build --mode test",
     "buildTest": "vue-cli-service build --mode buildTest",
     "lint": "vue-cli-service lint",
-    "build:lib": "vue-cli-service build --target lib src/components/questions/buildEntry.js --name zykjcommon-questions"
+    "build:lib": "vue-cli-service build --target lib src/components/questions/buildEntry.js --name zykjcommon-questions",
+    "publishLib": "node tasks/setPublishPackageJson.js && npm publish && node tasks/setOriPackageJson.js"
   },
   "dependencies": {
     "alife-logger": "^1.8.30",
@@ -20,15 +21,9 @@
     "md5": "^2.2.1",
     "mitt": "^3.0.0",
     "mobile-detect": "^1.4.5",
-    "video.js": "^7.6.0",
-    "vue": "^3.0.0",
-    "vue-router": "^4.0.0-0",
-    "vuex": "^4.0.0-0",
-    "vuex-composition-helpers": "^2.0.1"
+    "video.js": "^7.6.0"
   },
   "devDependencies": {
-    "@zykjcommon/questions": "^0.0.27",
-    "element-plus": "^2.0.2",
     "@types/node": "^18.11.9",
     "@vue/cli-plugin-babel": "^5.0.1",
     "@vue/cli-plugin-router": "~4.5.0",
@@ -36,6 +31,8 @@
     "@vue/cli-plugin-vuex": "~4.5.0",
     "@vue/cli-service": "^5.0.1",
     "@vue/compiler-sfc": "^3.0.0",
+    "@zykjcommon/questions": "^0.0.39",
+    "element-plus": "^2.0.2",
     "file-loader": "^6.2.0",
     "image-webpack-loader": "^8.1.0",
     "postcss": "^8.4.6",
@@ -54,10 +51,14 @@
     "unplugin-vue-components": "^0.17.18",
     "url-loader": "^4.1.1",
     "webpack": "^5.88.1",
-    "yargs": "^16.2.0"
+    "yargs": "^16.2.0",
+    "vue": "^3.0.0",
+    "vue-router": "^4.0.0-0",
+    "vuex": "^4.0.0-0",
+    "vuex-composition-helpers": "^2.0.1"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   }
-}
+}

package/src/assets/scss/questions/zykjcommon-questions.scss

@@ -372,7 +372,7 @@ $greenItemFontSize:0.14em;
       /*background-size: 100% 100%;*/
     }
     .main-block{
-      margin:0.38em auto 0;
+      margin:0.38em auto 0.1rem;
       width: 1.1em;
       height: 1.1em;
       background: #76d2ff;
@@ -389,13 +389,16 @@ $greenItemFontSize:0.14em;
       padding: 0 0.28em 0.15em 0.35em;
       flex: 1;
       .main-append{
-        /*height: 2.72em;*/
-        height: 2.9em;
+        height: 2.77em;
         overflow: auto;
         display: flex;
         flex-wrap: wrap;
         justify-content: space-between;
         align-content: start;
+        &.noScrollBar::-webkit-scrollbar {
+          width: 0;
+          height: 0;
+        }
       }
     }
     .append-item{
@@ -404,10 +407,11 @@ $greenItemFontSize:0.14em;
       width: 1.3em;
       height: 1.3em;
       margin-right: 0.1em;
+      margin-bottom: 0.1em;
       flex-shrink: 0;
       cursor: move;
       text-align: center;
-      color:rgb(238,252,149);
+      /*color:rgb(238,252,149);*/
       padding:0 0.2em;
       display: flex;
       justify-content: center;
@@ -449,6 +453,10 @@ $greenItemFontSize:0.14em;
         align-items: center;
         overflow-x: auto;
         width: 100%;
+        &.noScrollBar::-webkit-scrollbar {
+          width: 0;
+          height: 0;
+        }
       }
       .prev,.next{
         width: 0.24em;
@@ -488,7 +496,7 @@ $greenItemFontSize:0.14em;
       flex-shrink: 0;
       cursor: move;
       text-align: center;
-      color:rgb(238,252,149);
+      /*color:rgb(238,252,149);*/
       padding:0 0.2em;
       display: flex;
       justify-content: center;
@@ -526,7 +534,7 @@ $greenItemFontSize:0.14em;
     flex-shrink: 0;
     cursor: move;
     text-align: center;
-    color:rgb(238,252,149);
+    /*color:rgb(238,252,149);*/
     padding:0 0.2em;
     display: flex;
     justify-content: center;

package/src/components/questions/Question_Classify.vue

@@ -28,7 +28,7 @@
                :style="item.bgUrlCss"
                v-for="(item,index) in optionList"
                :key="index">
-            <div class="list-item-text">{{item.content}}</div>
+            <div class="list-item-text" v-show="item.content_type!=2">{{item.content}}</div>
           </div>
         </div>
       </div>
@@ -113,6 +113,8 @@ export default {
       dragWay : '',
       flag : false,
       scrollDistance : 3000,//设置一个死的滚动距离，保证能滚到底，目前够用
+      lazyDragTimer:null,
+      dragingStart:false
     };
   },
   watch: {
@@ -182,8 +184,9 @@ export default {
         let optionList = []
         exam_options_data.forEach((item)=>{
           optionList.push({
+            content_type:item.data.content_type,
             content:item.data.option_content,
-            bgUrlCss:`background: url(${item.data.file_url}) no-repeat center;background-size: 100% 100%`,
+            bgUrlCss:`background: url(${item.data.file_url}) no-repeat center;background-size: 100% 100%;color:${item.data.font_color}`,
             idx:item.index
           })
         })
@@ -215,6 +218,7 @@ export default {
       $(document).off(this.mouseup)
       let html = document.getElementsByTagName("html")[0];
       html.style.fontSize = "";
+      document.onselectstart = null
     },
     answeredNotify(){
       let self = this
@@ -256,26 +260,31 @@ export default {
       })
       return specArr
     },
+    //移动端为了解决拖动事件和原生滚动条事件冲突，设置延迟100毫秒拖动（PC端不变）
     bindDragDomEvent(appendItem,way){
       let self = this
-      appendItem.on(this.mousedown,function(e){
+      function dragDomEventFn(e,ctx){
         if(self.moveDiv){
           return
         }
+        env === 'mobile' && self.startLazyDrag()
         self.flag = false
         self.dragWay = way
         console.log(e);
         e.stopPropagation()
         e.preventDefault()
-        self.listItem = $(this)
+        self.listItem = $(ctx)
         self.listItem.addClass('drag')
         self.p1.moveX = self.listItem.offset().left;
         self.p1.moveY = self.listItem.offset().top - 30;
         let idx = self.listItem.attr('idx')
-        self.moveDiv = $(`<div class="question-classify-moveDiv" idx="${idx}" style="${self.listItemBgCss}"><div class="list-item-text">${self.listItem.find('.list-item-text').text()}</div></div>`)
-        self.moveDiv.css({left:`${self.p1.moveX}px`,top:`${self.p1.moveY}px`})
+        let itemBgCss = `${self.listItem.get(0).style.background}`
+        let itemColorCss = `${self.listItem.get(0).style.color}`
+        let textDisplayCss = self.listItem.find('.list-item-text').get(0).style.display
+        console.log(itemBgCss,1234);
+        self.moveDiv = $(`<div class="question-classify-moveDiv" idx="${idx}"><div class="list-item-text" style="${textDisplayCss?'display:'+textDisplayCss:''}">${self.listItem.find('.list-item-text').text()}</div></div>`)
+        self.moveDiv.css({left:`${self.p1.moveX}px`,top:`${self.p1.moveY}px`,background:itemBgCss,color:itemColorCss})
         $(self.$el).append(self.moveDiv)
-        // $('body').append(self.moveDiv)
         $(document).on(self.mousemove,function(e2){
           // e2.preventDefault()
           e2.stopPropagation()
@@ -289,15 +298,26 @@ export default {
           })
 
         })
-
+      }
+      appendItem.on(this.mousedown,function(e){
+        if(env === 'mobile'){
+          self.lazyDragTimer = setTimeout(()=>{
+            dragDomEventFn(e,this)
+          },100)
+        }else{
+          dragDomEventFn(e,this)
+        }
       })
     },
     appendMoveDiv(options){
       let self = this
       self.listItem.remove()
       let idx = self.moveDiv.attr('idx')
-      let appendItem = $(`<div class="${options.appendItemClassName}" idx="${idx}" style="${self.listItemBgCss}"><div class="list-item-text">${self.moveDiv.find('.list-item-text').text()}</div></div>`)
-      appendItem.css({opacity:0})
+      let itemBgCss = `${self.moveDiv.get(0).style.background}`
+      let itemColorCss = `${self.moveDiv.get(0).style.color}`
+      let textDisplayCss = self.moveDiv.find('.list-item-text').get(0).style.display
+      let appendItem = $(`<div class="${options.appendItemClassName}" idx="${idx}"><div class="list-item-text" style="${textDisplayCss?'display:'+textDisplayCss:''}">${self.moveDiv.find('.list-item-text').text()}</div></div>`)
+      appendItem.css({opacity:0,background:itemBgCss,color:itemColorCss})
       options.targetList.append(appendItem)
       options.targetList[options.scrollDirection](self.scrollDistance)
       let appendLeft = appendItem.offset().left
@@ -341,6 +361,7 @@ export default {
       }
       self.bindDragDomEvent($(this.$el).find('.question-classify .list-item'),'go')
       $(document).on(self.mouseup,function(e){
+        env === 'mobile' && self.stopLazyDrag()
         if(self.animationing){
           return
         }
@@ -403,9 +424,48 @@ export default {
           }
         }
       })
+
+      //禁止选中文字，解决拖动过程中文字老是被选中问题
+      document.onselectstart = function(){
+        return false
+      }
+      if(env === 'mobile'){
+        $('.list').scroll(function(e){
+          if(!self.dragingStart){
+            self.stopLazyDrag()
+          }
+        }).addClass('noScrollBar')
+        $('.main-append').scroll(function(e){
+          if(!self.dragingStart){
+            self.stopLazyDrag()
+          }
+        }).addClass('noScrollBar')
+      }
+
+
       self.bindNextPrevEvent('next')
       self.bindNextPrevEvent('prev')
     },
+    startLazyDrag(){
+      this.dragingStart = true
+      $('.list').css({
+        overflow:'hidden'
+      })
+      $('.main-append').css({
+        overflow:'hidden'
+      })
+    },
+    stopLazyDrag(){
+      this.dragingStart = false
+      this.lazyDragTimer && clearTimeout(this.lazyDragTimer)
+      this.lazyDragTimer = null
+      $('.list').css({
+        overflow:'auto'
+      })
+      $('.main-append').css({
+        overflow:'auto'
+      })
+    },
     //回显答案
     setAnswerDo(){
       let self = this
@@ -422,8 +482,15 @@ export default {
             //找到一个删掉一个，要不会有问题
             listItemIds.splice(idx,1)
             let listItemDom = $(this.$el).find('.question-classify .list-item').eq(idx)
+            let itemBgCss = `${listItemDom.get(0).style.background}`
+            let itemColorCss = `${listItemDom.get(0).style.color}`
+            let textDisplayCss = listItemDom.find('.list-item-text').get(0).style.display
             let attrIdx = listItemDom.attr('idx')
-            let appendItem = $(`<div class="append-item" idx="${attrIdx}" style="${self.listItemBgCss}"><div class="list-item-text">${listItemDom.find('.list-item-text').text()}</div></div>`)
+            let appendItem = $(`<div class="append-item" idx="${attrIdx}"><div class="list-item-text" style="${textDisplayCss?'display:'+textDisplayCss:''}">${listItemDom.find('.list-item-text').text()}</div></div>`)
+            appendItem.css({
+              background:itemBgCss,
+              color:itemColorCss
+            })
             self.bindDragDomEvent(appendItem,'back')
             $(this.$el).find('.main-append').eq(index).append(appendItem)
             listItemDom.remove()

package/src/views/exam/FullScreen.vue

@@ -180,40 +180,40 @@ export default defineComponent({
                   },
                   "small_type_option_list": [
                     {
-                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/3629e13ac107f35a57a43f23155c6203u27fvk1q7jvlnc07.png-quality_80",
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/ed57c2b33d9f14deccb5f0e557aac8denvl359dqel2ftdsh.png-quality_80",
                       "content_type": 3,
                       "file_type": 1,
-                      "name": "sss",
-                      "id": 3489,
+                      "name": "微信截图_20230630121121",
+                      "id": 3473,
                       "thumbnail_url": "",
-                      "option_content": "哈哈"
+                      "option_content": "选项1"
                     },
                     {
-                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/3629e13ac107f35a57a43f23155c6203u27fvk1q7jvlnc07.png-quality_80",
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
                       "content_type": 3,
                       "file_type": 1,
-                      "name": "sss",
-                      "id": 3489,
+                      "name": "微信截图_20230307122255",
+                      "id": 3466,
                       "thumbnail_url": "",
-                      "option_content": "呵呵"
+                      "option_content": "选项2"
                     },
                     {
-                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/3629e13ac107f35a57a43f23155c6203u27fvk1q7jvlnc07.png-quality_80",
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/82cc10f675b7c5b81142bdf927f1d962z75x1g88ef85n7fq.png-quality_80",
                       "content_type": 3,
                       "file_type": 1,
-                      "name": "sss",
-                      "id": 3489,
+                      "name": "编组 14备份",
+                      "id": 3481,
                       "thumbnail_url": "",
-                      "option_content": "哈哈"
+                      "option_content": "选项1"
                     },
                     {
-                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/3629e13ac107f35a57a43f23155c6203u27fvk1q7jvlnc07.png-quality_80",
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/ac5e72352acd82a8d17b58977953ec97y57cnn66qddl115d.png-quality_80",
                       "content_type": 3,
                       "file_type": 1,
-                      "name": "sss",
-                      "id": 3489,
+                      "name": "微信截图_20230307122245",
+                      "id": 3467,
                       "thumbnail_url": "",
-                      "option_content": "呵呵"
+                      "option_content": "选项2"
                     }
                   ],
                   "big_type_option_list": [
@@ -270,9 +270,10 @@ export default defineComponent({
                 "exam_options_data": [
                   {
                     "data": {
-                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/3629e13ac107f35a57a43f23155c6203u27fvk1q7jvlnc07.png-quality_80",
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/ed57c2b33d9f14deccb5f0e557aac8denvl359dqel2ftdsh.png-quality_80",
                       "content_type": 3,
                       "file_type": 1,
+                      "font_color": "#F9FF99",
                       "name": "sss",
                       "id": 3489,
                       "thumbnail_url": "",
@@ -282,21 +283,23 @@ export default defineComponent({
                   },
                   {
                     "data": {
-                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/3629e13ac107f35a57a43f23155c6203u27fvk1q7jvlnc07.png-quality_80",
-                      "content_type": 3,
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
+                      "content_type": 2,
                       "file_type": 1,
+                      "font_color": "#F9FF99",
                       "name": "sss",
                       "id": 3489,
                       "thumbnail_url": "",
-                      "option_content": "哈哈"
+                      "option_content": "哈哈2222"
                     },
                     "index": 1
                   },
                   {
                     "data": {
-                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/3629e13ac107f35a57a43f23155c6203u27fvk1q7jvlnc07.png-quality_80",
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/ed57c2b33d9f14deccb5f0e557aac8denvl359dqel2ftdsh.png-quality_80",
                       "content_type": 3,
                       "file_type": 1,
+                      "font_color": "#F9FF99",
                       "name": "sss",
                       "id": 3489,
                       "thumbnail_url": "",
@@ -306,15 +309,94 @@ export default defineComponent({
                   },
                   {
                     "data": {
-                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/3629e13ac107f35a57a43f23155c6203u27fvk1q7jvlnc07.png-quality_80",
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
                       "content_type": 3,
                       "file_type": 1,
+                      "font_color": "#F9FF99",
                       "name": "sss",
                       "id": 3489,
                       "thumbnail_url": "",
                       "option_content": "呵呵"
                     },
                     "index": 4
+                  },
+                  {
+                    "data": {
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
+                      "content_type": 3,
+                      "file_type": 1,
+                      "font_color": "#F9FF99",
+                      "name": "sss",
+                      "id": 3489,
+                      "thumbnail_url": "",
+                      "option_content": "呵呵222"
+                    },
+                    "index": 5
+                  },
+                  {
+                    "data": {
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
+                      "content_type": 3,
+                      "file_type": 1,
+                      "font_color": "#F9FF99",
+                      "name": "sss",
+                      "id": 3489,
+                      "thumbnail_url": "",
+                      "option_content": "呵呵222"
+                    },
+                    "index": 6
+                  },
+                  {
+                    "data": {
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
+                      "content_type": 3,
+                      "file_type": 1,
+                      "font_color": "#F9FF99",
+                      "name": "sss",
+                      "id": 3489,
+                      "thumbnail_url": "",
+                      "option_content": "呵呵222"
+                    },
+                    "index": 7
+                  },
+                  {
+                    "data": {
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
+                      "content_type": 3,
+                      "file_type": 1,
+                      "font_color": "#F9FF99",
+                      "name": "sss",
+                      "id": 3489,
+                      "thumbnail_url": "",
+                      "option_content": "呵呵222"
+                    },
+                    "index": 8
+                  },
+                  {
+                    "data": {
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
+                      "content_type": 3,
+                      "file_type": 1,
+                      "font_color": "#F9FF99",
+                      "name": "sss",
+                      "id": 3489,
+                      "thumbnail_url": "",
+                      "option_content": "呵呵222"
+                    },
+                    "index": 9
+                  },
+                  {
+                    "data": {
+                      "file_url": "https://dev-resource.thedeer.cn/pre/resource-media/image/4c24fc0c43aea33bd9e6cb224dfd3648jhzavaqzp21mvtvt.png-quality_80",
+                      "content_type": 3,
+                      "file_type": 1,
+                      "font_color": "#F9FF99",
+                      "name": "sss",
+                      "id": 3489,
+                      "thumbnail_url": "",
+                      "option_content": "呵呵222"
+                    },
+                    "index": 10
                   }
                 ],
                 "draw_img": null,
@@ -361,7 +443,7 @@ export default defineComponent({
                 {
                   "big_type_index": 2,
                   "small_type_index_list": [
-                    3
+                    // 3
                   ]
                 }
               ],

package/tasks/mixins.js

@@ -0,0 +1,6 @@
+/**
+ * Created by Allen Liu on 2023/8/22.
+ */
+module.exports = {
+  buildLibNeedOpDependenciesKeys:['vue','vue-router','vuex','vuex-composition-helpers']
+}

package/tasks/setOriPackageJson.js

@@ -0,0 +1,22 @@
+/**
+ * Created by Allen Liu on 2023/8/22.
+ */
+let fs = require('fs')
+let path = require('path')
+let minxins = require('./mixins')
+let needOpKeyArr = minxins.buildLibNeedOpDependenciesKeys
+let pblishJsonStr = fs.readFileSync(path.resolve(__dirname,'../package.json'),'utf8')
+let publishJsonStr = getOriJson(pblishJsonStr)
+fs.writeFileSync(path.resolve(__dirname,'../package.json'),publishJsonStr)
+
+
+function getOriJson(jsonStr){
+  let result = ''
+  let json = JSON.parse(jsonStr)
+  needOpKeyArr.forEach((item)=>{
+    json.dependencies[item] = json.devDependencies[item]
+    delete json.devDependencies[item]
+  })
+  result = JSON.stringify(json,null,2)
+  return result
+}

package/tasks/setPublishPackageJson.js

@@ -0,0 +1,21 @@
+/**
+ * Created by Allen Liu on 2023/8/22.
+ */
+let fs = require('fs')
+let path = require('path')
+let minxins = require('./mixins')
+let needOpKeyArr = minxins.buildLibNeedOpDependenciesKeys
+let oriJsonStr = fs.readFileSync(path.resolve(__dirname,'../package.json'),'utf8')
+let publishJsonStr = getPublishJson(oriJsonStr)
+fs.writeFileSync(path.resolve(__dirname,'../package.json'),publishJsonStr)
+
+function getPublishJson(jsonStr){
+  let result = ''
+  let json = JSON.parse(jsonStr)
+  needOpKeyArr.forEach((item)=>{
+    json.devDependencies[item] = json.dependencies[item]
+    delete json.dependencies[item]
+  })
+  result = JSON.stringify(json,null,2)
+  return result
+}