costy-plus 1.1.4-0 → 1.1.6-0

package/dist/es/src/CommonWaveForm/method.js

@@ -15,7 +15,7 @@ import Q from "../../node_modules/.pnpm/vue-class-component@7.2.6_vue@2.6.14/nod
 import "../../node_modules/.pnpm/vue-property-decorator@9.1.2_vue-class-component@7.2.6_vue@2.6.14/node_modules/vue-property-decorator/lib/decorators/Emit.js";
 import { Prop as w } from "../../node_modules/.pnpm/vue-property-decorator@9.1.2_vue-class-component@7.2.6_vue@2.6.14/node_modules/vue-property-decorator/lib/decorators/Prop.js";
 import { flattenDeep as U, max as Z, min as J } from "lodash";
-import { throttling as V, getStepForSpeed as H, getPrintLengthToPx as ee, getSens as x, getDataLenTimes as O, getPointIdxForPx as M, getActualY as L, calcMs as te, calcBpm as ie } from "@costy-plus/utils";
+import { throttling as V, getStepForSpeed as M, getPrintLengthToPx as ee, getSens as x, getDataLenTimes as O, getPointIdxForPx as H, getActualY as L, calcMs as te, calcBpm as ie } from "@costy-plus/utils";
 import * as se from "zrender";
 import { Group as y, Polyline as R, Line as z, Text as W, Polygon as ae, util as oe } from "zrender";
 var ne = Object.defineProperty, le = Object.getOwnPropertyDescriptor, c = (e, t, i, s) => {
@@ -106,18 +106,18 @@ let u = class extends q {
   initSlidingWindowInfo() {
     const e = this.publicStep || 0, t = Math.ceil(this.splitPoint / e);
     if (this.slidingWindowInfo = {
-      points: this.slidingWindowInfo.points <= t || this.leadModel.isSingleMode ? t : this.slidingWindowInfo.points,
+      points: this.slidingWindowInfo.points !== t || this.leadModel.isSingleMode ? t : this.slidingWindowInfo.points,
       startInd: this.slidingWindowInfo.startInd || 0,
-      endInd: this.slidingWindowInfo.endInd <= t || this.leadModel.isSingleMode ? t : this.slidingWindowInfo.endInd
+      endInd: this.slidingWindowInfo.endInd !== t || this.leadModel.isSingleMode ? t : this.slidingWindowInfo.endInd
     }, this.scrollConfig.isShow && !this.leadModel.isSingleMode) {
-      const s = H(this.leadModel.publicSpeed, this.gridConfig.cellMg, this.leadModel.publicSampleRate), a = this.dataTotalLength * s;
+      const s = M(this.leadModel.publicSpeed, this.gridConfig.cellMg, this.leadModel.publicSampleRate), a = this.dataTotalLength * s;
       this.vuescrollWH.width = this.canvasContainer.width + (a || 0) - this.splitPoint;
     }
     const i = Math.ceil((this.drawArea.width - this.leadHeadConfig.leadHedeWidth) / e);
     this.addSlidingWindowInfo = {
-      points: this.addSlidingWindowInfo.points <= i || this.leadModel.isSingleMode ? i : this.addSlidingWindowInfo.points,
+      points: this.addSlidingWindowInfo.points !== i || this.leadModel.isSingleMode ? i : this.addSlidingWindowInfo.points,
       startInd: this.addSlidingWindowInfo.startInd || 0,
-      endInd: this.addSlidingWindowInfo.endInd <= i || this.leadModel.isSingleMode ? i : this.addSlidingWindowInfo.endInd
+      endInd: this.addSlidingWindowInfo.endInd !== i || this.leadModel.isSingleMode ? i : this.addSlidingWindowInfo.endInd
     };
   }
   calcHighestAndLowestPoint() {
@@ -161,7 +161,7 @@ let u = class extends q {
       const i = ee(((t = this.waveConfigs[0]) == null ? void 0 : t.sampleRate) || 0) + this.leadHeadConfig.leadHedeWidth;
       i <= e && (e = i);
     } else if (this.leadModel.isContinuous) {
-      const i = H(this.leadModel.publicSpeed, this.gridConfig.cellMg, this.leadModel.publicSampleRate), s = this.dataTotalLength * i;
+      const i = M(this.leadModel.publicSpeed, this.gridConfig.cellMg, this.leadModel.publicSampleRate), s = this.dataTotalLength * i;
       !this.leadModel.isSingleMode && (s || 0) < e - this.leadHeadConfig.leadHedeWidth && (e = (s || 0) + this.leadHeadConfig.leadHedeWidth);
     }
     this.drawArea = {
@@ -181,7 +181,7 @@ let u = class extends q {
     }, this.currentHeardBeat = {
       heardBeat: null,
       ele: null
-    }, this.leadNameList = this.leadNames.map((i, s) => s) || [], this.totalRows = this.leadModel.line + this.leadModel.add || 1, this.highestAndLowestPoint = this.calcHighestAndLowestPoint(), this.leadModel.isSingleMode ? (this.splitBlockHeight = Math.abs(this.highestAndLowestPoint.maxPoints) + Math.abs(this.highestAndLowestPoint.minPoints) + 22, this.splitBlockHeight > this.drawArea.height && (this.splitBlockHeight = this.drawArea.height / 6)) : this.splitBlockHeight = this.drawArea.height / this.totalRows, this.publicStep = H(this.leadModel.publicSpeed, this.gridConfig.cellMg, this.leadModel.publicSampleRate), this.rulerStep = (this.publicStep || 1) * (this.leadModel.publicSampleRate || 1) / (this.gridConfig.cellMg * 2 + 2);
+    }, this.leadNameList = this.leadNames.map((i, s) => s) || [], this.totalRows = this.leadModel.line + this.leadModel.add || 1, this.highestAndLowestPoint = this.calcHighestAndLowestPoint(), this.leadModel.isSingleMode ? (this.splitBlockHeight = Math.abs(this.highestAndLowestPoint.maxPoints) + Math.abs(this.highestAndLowestPoint.minPoints) + 22, this.splitBlockHeight > this.drawArea.height && (this.splitBlockHeight = this.drawArea.height / 6)) : this.splitBlockHeight = this.drawArea.height / this.totalRows, this.publicStep = M(this.leadModel.publicSpeed, this.gridConfig.cellMg, this.leadModel.publicSampleRate), this.rulerStep = (this.publicStep || 1) * (this.leadModel.publicSampleRate || 1) / (this.gridConfig.cellMg * 2 + 2);
   }
   initWaveFormPeer() {
     var i;
@@ -289,7 +289,7 @@ let u = class extends q {
     (o = this.splitLineGroup) == null || o.removeAll(), (n = this.sceneIns) == null || n.remove(this.splitLineGroup);
     const e = (this.drawArea.width - this.leadHeadConfig.leadHedeWidth) / (this.leadModel.column || 1);
     if (this.splitPoint = e, this.leadModel.isSingleMode) {
-      const r = H(
+      const r = M(
         this.waveConfigs[this.singleModeConfig.defaultSelect].speed,
         this.gridConfig.cellMg,
         this.waveConfigs[this.singleModeConfig.defaultSelect].sampleRate
@@ -306,8 +306,6 @@ let u = class extends q {
         for (let f = 1; f <= this.leadModel.line; f++) {
           if (!(this.waveConfigs || [])[f - 1 + i])
             break e;
-          if ((this.waveConfigs || [])[f - 1 + i].isShowLeadHead)
-            continue e;
           if ((this.waveConfigs || [])[f - 1 + i].posX !== void 0 && (t = (this.waveConfigs || [])[f - 1 + i].posX), s = (this.waveConfigs || [])[f - 1 + i].leadIdx, s === void 0)
             break;
           a = x((this.waveConfigs || [])[f - 1 + i].gain, this.gridConfig.cellMg), (this.waveConfigs || [])[f - 1 + i].gainName === "\u80F8\u5BFC\u51CF\u534A" && /^V\w+/.test(this.leadNames[s]) ? (d = this.splitLineGroup) == null || d.add(
@@ -373,11 +371,11 @@ let u = class extends q {
       return;
     const t = this.dataTotalTimes / 1e3;
     let i = this.leadHeadConfig.leadHedeWidth, s = 0, a = t;
-    const o = H(this.rulerConfig.speed, this.gridConfig.cellMg, this.rulerConfig.sampleRate);
+    const o = M(this.rulerConfig.speed, this.gridConfig.cellMg, this.rulerConfig.sampleRate);
     if (this.leadModel.isContinuous)
       a = t * 5;
     else if (!this.leadModel.add && o) {
-      const l = M(this.splitPoint, o), r = O(l, this.rulerConfig.sampleRate || 0) / 1e3;
+      const l = H(this.splitPoint * (this.leadModel.column || 1), o), r = O(l, this.rulerConfig.sampleRate || 0) / 1e3;
       a = e + r;
     }
     for (let l = e; l <= a; l = +(l + 0.1).toFixed(1))
@@ -414,7 +412,7 @@ let u = class extends q {
     let e = 0, t = 0;
     const i = this.waveLists[this.singleModeConfig.defaultSelect] || [];
     let s = this.slidingWindowInfo.startInd || 0, a = this.slidingWindowInfo.endInd || 0;
-    const o = H(
+    const o = M(
       this.waveConfigs[this.singleModeConfig.defaultSelect].speed,
       this.gridConfig.cellMg,
       this.waveConfigs[this.singleModeConfig.defaultSelect].sampleRate
@@ -498,7 +496,7 @@ let u = class extends q {
       fontFamily: this.fontFamily
     };
     let n = 0, d = 0;
-    const h = H(
+    const h = M(
       this.waveConfigs[this.heartFight.showIdxPai].speed,
       this.gridConfig.cellMg,
       this.waveConfigs[this.heartFight.showIdxPai].sampleRate
@@ -668,7 +666,7 @@ let u = class extends q {
     const e = [];
     let t = this.leadHeadConfig.leadHedeWidth, i = 0, s = 0, a = [], o = 0, n = 0;
     for (let d = 0; d < this.leadModel.add; d++)
-      s = this.longLeadConfig.leadIdxs[d], this.waveConfigs[s] && (t = this.waveConfigs[s].addPosX || t, o = H(this.waveConfigs[s].speed, this.gridConfig.cellMg, this.waveConfigs[s].sampleRate), n = x(this.waveConfigs[s].gain, this.gridConfig.cellMg), i = this.waveConfigs[s].addPosY || (d + this.leadModel.line + 1) * this.splitBlockHeight, a = this.waveLists[s] || [], d === 0 && (this.loopArrowY.add = i), e.push({
+      s = this.longLeadConfig.leadIdxs[d], this.waveConfigs[s] && (t = this.waveConfigs[s].addPosX || t, o = M(this.waveConfigs[s].speed, this.gridConfig.cellMg, this.waveConfigs[s].sampleRate), n = x(this.waveConfigs[s].gain, this.gridConfig.cellMg), i = this.waveConfigs[s].addPosY || (d + this.leadModel.line + 1) * this.splitBlockHeight, a = this.waveLists[s] || [], d === 0 && (this.loopArrowY.add = i), e.push({
         pos: [t, i],
         startInd: this.addSlidingWindowInfo.startInd || 0,
         endInd: this.addSlidingWindowInfo.endInd || 0,
@@ -713,7 +711,7 @@ let u = class extends q {
     for (let l = 0; l < this.leadModel.column; l++) {
       e = l * this.splitPoint + this.leadHeadConfig.leadHedeWidth, t = 0, this.leadModel.isContinuous && l > 0 && (n = d, d = n + (this.slidingWindowInfo.points || 0));
       for (let r = 1; r <= this.leadModel.line && (t = r * this.splitBlockHeight, !(i > (this.waveLists || []).length - 1)); r++)
-        e = this.waveConfigs[i].posX || e, t = this.waveConfigs[i].posY || t, a = H(this.waveConfigs[i].speed, this.gridConfig.cellMg, this.waveConfigs[i].sampleRate), o = x(this.waveConfigs[i].gain, this.gridConfig.cellMg), s = this.waveLists[i] || [], this.waveConfigs[i] && (r === 1 && (this.loopArrowY.rowAndCol = t), h.push({
+        e = this.waveConfigs[i].posX || e, t = this.waveConfigs[i].posY || t, a = M(this.waveConfigs[i].speed, this.gridConfig.cellMg, this.waveConfigs[i].sampleRate), o = x(this.waveConfigs[i].gain, this.gridConfig.cellMg), s = this.waveLists[i] || [], this.waveConfigs[i] && (r === 1 && (this.loopArrowY.rowAndCol = t), h.push({
           pos: [e, t],
           startInd: n,
           endInd: d,
@@ -805,7 +803,7 @@ let u = class extends q {
     e.event.preventDefault(), e.event.stopPropagation(), console.log("onContextmenu", e);
     const i = e.target.name.split("_"), s = +i[1];
     let a = 0, o = 0, n = 0, d = 0, h = 0;
-    t === "single" ? (a = e.offsetX - this.singleWaveDataCopy[s].pos[0], o = this.singleWaveDataCopy[s].startInd, n = M(a, this.singleWaveDataCopy[s].step || 1), d = this.singleWaveDataCopy[s].sens, h = this.singleWaveDataCopy[s].step) : t === "rowAndCol" ? (a = e.offsetX - this.waveDataCopy[s].pos[0], o = this.waveDataCopy[s].startInd || 0, n = M(a, this.waveDataCopy[s].step || 1), d = this.waveDataCopy[s].sens, h = this.waveDataCopy[s].step) : t === "add" && (a = e.offsetX - this.addWaveDataCopy[s].pos[0], o = this.addWaveDataCopy[s].startInd || 0, n = M(a, this.addWaveDataCopy[s].step || 1), d = this.addWaveDataCopy[s].sens, h = this.addWaveDataCopy[s].step), n += o, this.$emit("notifyOnContextmenu", {
+    t === "single" ? (a = e.offsetX - this.singleWaveDataCopy[s].pos[0], o = this.singleWaveDataCopy[s].startInd, n = H(a, this.singleWaveDataCopy[s].step || 1), d = this.singleWaveDataCopy[s].sens, h = this.singleWaveDataCopy[s].step) : t === "rowAndCol" ? (a = e.offsetX - this.waveDataCopy[s].pos[0], o = this.waveDataCopy[s].startInd || 0, n = H(a, this.waveDataCopy[s].step || 1), d = this.waveDataCopy[s].sens, h = this.waveDataCopy[s].step) : t === "add" && (a = e.offsetX - this.addWaveDataCopy[s].pos[0], o = this.addWaveDataCopy[s].startInd || 0, n = H(a, this.addWaveDataCopy[s].step || 1), d = this.addWaveDataCopy[s].sens, h = this.addWaveDataCopy[s].step), n += o, this.$emit("notifyOnContextmenu", {
       sens: d,
       step: h,
       activeLeadIdx: +i[0],
@@ -823,7 +821,7 @@ let u = class extends q {
       this.activeLeadIdx = +a[0];
       const o = +a[1];
       let n = 0, d = 0, h = 0, l = 0, r = 0;
-      t === "single" ? (n = e.offsetX - this.singleWaveDataCopy[o].pos[0], d = this.singleWaveDataCopy[o].startInd, h = M(n, this.singleWaveDataCopy[o].step || 1), l = this.singleWaveDataCopy[o].sens, r = this.singleWaveDataCopy[o].step) : t === "rowAndCol" ? (n = e.offsetX - this.waveDataCopy[o].pos[0], d = this.waveDataCopy[o].startInd || 0, h = M(n, this.waveDataCopy[o].step || 1), l = this.waveDataCopy[o].sens, r = this.waveDataCopy[o].step) : t === "add" && (n = e.offsetX - this.addWaveDataCopy[o].pos[0], d = this.addWaveDataCopy[o].startInd || 0, h = M(n, this.addWaveDataCopy[o].step || 1), l = this.addWaveDataCopy[o].sens, r = this.addWaveDataCopy[o].step), h += d, this.$emit("notifyActiveEnlargr", {
+      t === "single" ? (n = e.offsetX - this.singleWaveDataCopy[o].pos[0], d = this.singleWaveDataCopy[o].startInd, h = H(n, this.singleWaveDataCopy[o].step || 1), l = this.singleWaveDataCopy[o].sens, r = this.singleWaveDataCopy[o].step) : t === "rowAndCol" ? (n = e.offsetX - this.waveDataCopy[o].pos[0], d = this.waveDataCopy[o].startInd || 0, h = H(n, this.waveDataCopy[o].step || 1), l = this.waveDataCopy[o].sens, r = this.waveDataCopy[o].step) : t === "add" && (n = e.offsetX - this.addWaveDataCopy[o].pos[0], d = this.addWaveDataCopy[o].startInd || 0, h = H(n, this.addWaveDataCopy[o].step || 1), l = this.addWaveDataCopy[o].sens, r = this.addWaveDataCopy[o].step), h += d, this.$emit("notifyActiveEnlargr", {
         sens: l,
         step: r,
         activeLeadIdx: this.activeLeadIdx,
@@ -839,7 +837,7 @@ let u = class extends q {
     t.type === "horizontal" && (t.scrollLeft = t.scrollLeft || 0, this.scrollCommon(t.scrollLeft));
   }
   scrollCommon(e) {
-    const t = M(e, this.publicStep || 1);
+    const t = H(e, this.publicStep || 1);
     this.scrollWaveFrom(t), this.scrollRuler(t), this.scrollArrow(t), this.$emit("notifyScrollPointIdx", {
       slidIdxs: t,
       scrollLeft: e