zydx-plus 1.33.422 → 1.33.424

package/package.json

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

package/src/components/buttonGroup/src/buttonGroup.vue

@@ -90,7 +90,7 @@ export default defineComponent({
           let style = {color:this.active_state[idx] ? this.activeColor:disabled?'#717171': '#000000'}
           let btn = h(
             <button
-              class={this.active_state[idx] ?  'z-button z-active theme-text' : 'z-button'}
+              class={this.active_state[idx] ?  'z-button z-active theme-text' : disabled ? 'z-button disabled' : 'z-button'}
               data-id={data_id}
               onClick={() => { onClick(); ignore ? () => null : trackClick(idx) }
               }

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

@@ -908,7 +908,10 @@ export default {
             Authorization: localStorage.getItem("remember") === "1" ? localStorage.getItem('sessionId') : sessionStorage.getItem('sessionId')
           },
           customInsert(res, insertFn) {
-            insertFn('http://192.168.5.213:8888' + res.data)
+              setTimeout(() => {
+                  console.log('uploadImage100');
+                  insertFn('http://192.168.5.213:8888' + res.data)
+              },100)
           },
           onSuccess(file, res) {
             console.log('图片上传成功', file, res)
@@ -2529,13 +2532,16 @@ export default {
           }
           if (v === 'uploadImage') {
             up.customInsert(res, (data) => {
-              const cla = this.randomId()
-              const html = `<p class="imgCont ${cla}"><img src="${data}" alt="" /></p>`
-              this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-              if (this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
-              if (this.selectionClass(cla)) {
-                this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
-              }
+                setTimeout(() => {
+                    console.log('uploadImage100');
+                    const cla = this.randomId()
+                    const html = `<p class="imgCont ${cla}"><img src="${data}" alt="" /></p>`
+                    this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+                    if (this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
+                    if (this.selectionClass(cla)) {
+                        this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
+                    }
+                },100)
             })
           }
           up.onSuccess(file, res) // 上传成功回调

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

@@ -692,7 +692,8 @@ export default {
       })
     },
     upload(e, v) { // 上传文件
-      const file = e.target.files[0]
+        console.log('ssdfasf');
+        const file = e.target.files[0]
       if (this.uploadType) {
         if (v === 'uploadAtt') {
           file.active = true
@@ -724,14 +725,17 @@ export default {
       e.target.value = ''
     },
     imgHtml(data) { // 插入图片
-      const url = this.uploadImage.url + data
-      const cla = this.randomId()
-      const html = `<p class="imgCont ${cla}"><img src="${url}" alt="" width=""/></p>`
-      this.editor.chain().focus().insertContentAt(this.selection(), html).run()
-      if (this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
-      if (this.selectionClass(cla)) {
-        this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
-      }
+      setTimeout(() => {
+        console.log('uploadImage100');
+        const url = this.uploadImage.url + data
+        const cla = this.randomId()
+        const html = `<p class="imgCont ${cla}"><img src="${url}" alt="" width=""/></p>`
+        this.editor.chain().focus().insertContentAt(this.selection(), html).run()
+        if (this.selection() <= 6 && this.selection() > 2) this.selectionClass2(cla)
+        if (this.selectionClass(cla)) {
+            this.editor.chain().focus().insertContentAt(this.selection(), '<p></p>').run()
+        }
+      }, 100)
     },
     // selectImg(cla) {
     //     this.$nextTick(() => {

package/src/components/treeList/src/treeList.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="list-tree">
         <div class="list-cont" v-if="list.length > 0">
-            <div class="list-li"
+            <div :class="{'list-li':true, 'theme-text': active === index}"
                  :style="{'border-bottom': (link)? '1px solid #ccc': '0', 'color': (active === index)? activeColor : '#333'}"
                  @click="listTap(item,index)" v-for="(item,index) in list" :key="index">
                 <div class="list-title">
@@ -11,7 +11,7 @@
                         (angleBrackets) ? '》' : ''
                         }}</span> -->
                     <span :style="{'font-size': column[0].fontSize + 'px', 'font-weight': column[0].fontWeight}" v-html="(index + 1) + '.' + (angleBrackets ? '《' : '') + item[column[0].label] + (angleBrackets ? '》' : '')"></span>
-                    <button v-if="delShow" @click="del(item)">{{ delText }}</button>
+                    <button v-if="delShow" @click="del(item)" v-html="delText"></button>
                 </div>
                 <div class="list-cont" v-if="open">
                     <div class="list-li-cont">
@@ -117,7 +117,8 @@ export default {
     white-space: nowrap;
     text-overflow: ellipsis;
     height: 30px;
-    font-size: 16px;
+    font-size: 14px;
+    font-weight: bold;
 }
 
 .list-title > button {

package/src/index.js

@@ -83,7 +83,7 @@ function install(app) {
 }
 
 export default {
-    version: '1.33.422',
+    version: '1.33.424',
     install,
     Calendar,
     Message,