zydx-plus 1.35.539 → 1.35.541

package/src/components/data_table/src/table_row.vue

@@ -46,7 +46,7 @@ export default defineComponent({
                 </td>
               )
               : (
-                <td class="table_cell" style={`min-width:${width}px; max-width:${width}px;`} rowspan={rowSpan} colspan={colSpan} data-col-key={key}>
+                <td class="table_cell" style={`min-width:${width}px; max-width:${width}px;color: ${row[key]=='已使用'?'rgba(111, 61, 146, 1)':''}`} rowspan={rowSpan} colspan={colSpan} data-col-key={key}>
                   {row[key]}
                 </td>
               )

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

@@ -1,7 +1,11 @@
 <template>
   <div class="drag-pop" :class="{trans: transAll, 'drag-pop-shadow': !fixedStart}" :style="position" :id="id" @click.stop="dragTap">
     <div v-show="!fixedStart" class="drag-head" :style="{'background-color':titleColor}" @click="selectedDrag">
-      <span :id="'draggable' + id" :style="{'text-align': title === ''? 'center':'left'}" v-html="title"></span>
+      <span class="title" :id="'draggable' + id">
+        <slot name="title">
+          <div v-html="title" style="width: 100%" :style="{'text-align': title === ''? 'center':'left'}"></div>
+        </slot>
+      </span>
       <div class="drag-i">
         <i class="share" v-if="share" @click.stop="shareTap"></i>
         <i class="minimize-cir" v-if="minimizeCir" @click.stop="minimizeTap"></i>
@@ -149,7 +153,7 @@ export default {
       handler: function (val) {
         this.footRightOffset = val
         if (this.isInitShowBottomRight) {
-          this.x = window.innerWidth - val
+          this.x = window.innerWidth - val -3
         }
       },
       immediate: true
@@ -158,7 +162,7 @@ export default {
       handler: function (val) {
         this.footDownOffset = val
         if (this.isInitShowBottomRight) {
-          this.y = window.innerHeight - val
+          this.y = window.innerHeight - val -3
           console.log('this.y', this.y)
         }
       },
@@ -306,15 +310,19 @@ export default {
     init() {
       const that = this
       if(this.fixedStart) {
-        const wid = document.getElementById('app').offsetWidth
-        this.x = this.left + (wid-this.initWidth)/2
-        this.y = this.top - document.documentElement.scrollTop
+        if(!this.isInitShowBottomRight) {
+          const wid = document.getElementById('app').offsetWidth
+          this.x = this.left + (wid-this.initWidth)/2
+          this.y = this.top - document.documentElement.scrollTop
+        }
       } else {
         this.clientWidth = document.documentElement.clientWidth;
         this.clientHeight = document.documentElement.clientHeight;
-        this.x = this.clientWidth / 2 - this.footRightOffset / 2;
-        this.y = this.clientHeight / 2 - this.footDownOffset / 2;
-        this.y=isNaN(this.y)?100:this.y
+        if(!this.isInitShowBottomRight) {
+          this.x = this.clientWidth / 2 - this.footRightOffset / 2;
+          this.y = this.clientHeight / 2 - this.footDownOffset / 2;
+          this.y=isNaN(this.y)?100:this.y
+        }
       }
       setTimeout(() => {
         this.draggableState = interact(`#draggable${that.id}`)
@@ -631,4 +639,14 @@ export default {
   z-index: 5;
   background-color: rgba(255,255,255,0);
 }
+.drag-head > .title {
+  display: inline-block;
+  margin-right: 15px;
+  flex: 1;
+  cursor: move;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 16px;
+}
 </style>

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

@@ -318,15 +318,19 @@ export default {
     init() {
       let that = this
       if(this.fixedStart) {
-        const wid = document.getElementById('app').offsetWidth
-        this.x = this.left + (wid-this.initWidth)/2
-        this.y = this.top - document.documentElement.scrollTop
+        if(!this.isInitShowBottomRight) {
+          const wid = document.getElementById('app').offsetWidth
+          this.x = this.left + (wid-this.initWidth)/2
+          this.y = this.top - document.documentElement.scrollTop
+        }
       } else {
         this.clientWidth = document.documentElement.clientWidth;
         this.clientHeight = document.documentElement.clientHeight;
-        this.x = this.clientWidth / 2 - this.footRightOffset / 2;
-        this.y = this.clientHeight / 2 - this.footDownOffset / 2;
-        this.y=isNaN(this.y)?100:this.y
+        if(!this.isInitShowBottomRight) {
+          this.x = this.clientWidth / 2 - this.footRightOffset / 2;
+          this.y = this.clientHeight / 2 - this.footDownOffset / 2;
+          this.y=isNaN(this.y)?100:this.y
+        }
       }
       setTimeout(() => {
         this.draggableState = interact(`#draggable${that.id}`)