leiting-bim 2.1.127 → 2.1.128

package/plugins/cesium-vue/dist/components/marker-manage.js

@@ -1,6 +1,6 @@
 import { w as we } from "../create-DynflqE1.js";
-import { h as L, markRaw as M, render as S, defineComponent as xe, inject as Se, onMounted as Ie, watch as Z, onUnmounted as De, renderSlot as Oe, unref as Ee } from "vue";
-import { M as I, H as J, a as H } from "../HtmlOverlayLabelPool-DgCFnmr3.js";
+import { h as L, markRaw as M, render as S, defineComponent as xe, inject as Se, onMounted as De, watch as Z, onUnmounted as Ie, renderSlot as Oe, unref as Ee } from "vue";
+import { M as D, H as J, a as H } from "../HtmlOverlayLabelPool-DgCFnmr3.js";
 import { CxCardCarousel as Q } from "./card-carousel.js";
 import { CxMarkerBubble as Ge } from "./marker-bubble.js";
 import { CxMarkerDefault as ee } from "./marker-default.js";
@@ -18,7 +18,7 @@ const qe = {
   themeConfig: { type: Object }
   // Optional override
 };
-var D = /* @__PURE__ */ ((r) => (r.左建选中模型 = "MODEL_LEFT_CLICK", r.标记左键点击 = "TAG_LEFT_CLICK", r.标记移入 = "TAG_MOUSEENTER", r.标记移出 = "TAG_MOUSELEAVE", r.模型位置保存 = "SAVE_REGION", r.模型加载完成 = "MODEL_READY", r))(D || {});
+var I = /* @__PURE__ */ ((r) => (r.左建选中模型 = "MODEL_LEFT_CLICK", r.标记左键点击 = "TAG_LEFT_CLICK", r.标记移入 = "TAG_MOUSEENTER", r.标记移出 = "TAG_MOUSELEAVE", r.模型位置保存 = "SAVE_REGION", r.模型加载完成 = "MODEL_READY", r))(I || {});
 class je {
   Cesium;
   viewer;
@@ -683,7 +683,7 @@ function St(r, e, t) {
     a[i] = r[i + e];
   return a;
 }
-function It(r) {
+function Dt(r) {
   return function(e, t, i) {
     for (var o = -1, a = Object(e), n = i(e), s = n.length; s--; ) {
       var h = n[++o];
@@ -693,7 +693,7 @@ function It(r) {
     return e;
   };
 }
-var Dt = It();
+var It = Dt();
 function F(r, e, t) {
   (t !== void 0 && !le(r[e], t) || t === void 0 && !(e in r)) && He(r, e, t);
 }
@@ -721,7 +721,7 @@ function Gt(r, e, t, i, o, a, n) {
   d && (n.set(h, l), o(l, h, i, a, n), n.delete(h)), F(r, t, l);
 }
 function be(r, e, t, i, o) {
-  r !== e && Dt(e, function(a, n) {
+  r !== e && It(e, function(a, n) {
     if (o || (o = new Ye()), V(a))
       Gt(r, e, n, t, be, i, o);
     else {
@@ -805,7 +805,7 @@ function Vt(r, e) {
       vec2 st = materialInput.st;
       float time = fract(mod(float(czm_frameNumber * 33.0) , float(${a.duration})) / float(${a.duration}));
       ${a.freely === "vertical" ? `vec4 colorImage = texture(image, vec2(fract(float(${a.count}) *st.t ${a.direction} time), fract(st.s)));` : `vec4 colorImage = texture(image, vec2(fract(float(${a.count}) *st.s ${a.direction} time), fract(st.t)));`}
-      ${a.isCustomColor ? "material.diffuse = color.rgb;" : "material.diffuse = colorImage.rgb;"}
+      material.diffuse = color.rgb;
        material.alpha = colorImage.a;
       return material;
       }`;
@@ -822,8 +822,7 @@ function Vt(r, e) {
         count: e.count,
         freely: e.freely || "",
         direction: e.direction,
-        duration: e.duration || 100,
-        isCustomColor: e.isCustomColor
+        duration: e.duration || 100
       })
     },
     translucent() {
@@ -865,10 +864,10 @@ function _e(r, e) {
     return a.freely == "vertical" ? n += "vec4 colorImage = texture(image, vec2(fract(float(" + a.count + ")*st.t " + a.direction + ` time), fract(st.s)));
  ` : n += "vec4 colorImage = texture(image, vec2(fract(float(" + a.count + ")*st.s " + a.direction + ` time), fract(st.t)));
  `, n += `vec4 fragColor;
-            fragColor.rgb = (colorImage.rgb) / 1.0;
+            fragColor.rgb = (color.rgb) / 1.0;
             fragColor = czm_gammaCorrect(fragColor);
- `, n += ` material.diffuse = colorImage.rgb;
-            material.alpha = colorImage.a;
+ `, n += ` material.diffuse = color.rgb;
+            material.alpha = colorImage.a * color.a;
             material.emission = fragColor.rgb;
             
             return material;
@@ -879,7 +878,7 @@ function _e(r, e) {
     fabric: {
       type: t,
       uniforms: {
-        color: new r.Color(1, 0, 0, 0.5),
+        color: e.color || new r.Color(1, 1, 1, 1),
         image: e.image,
         time: 0
       },
@@ -1091,7 +1090,7 @@ class Xt {
   aggregator;
   cardPool;
   constructor(e, t, i, o, a, n) {
-    this.id = e, this.Cesium = t, this.viewer = i, this.materialManager = o, this.aggregator = a, this.cardPool = n, this.aggregator.labelPool.eventBus.addListener(I.Click, {
+    this.id = e, this.Cesium = t, this.viewer = i, this.materialManager = o, this.aggregator = a, this.cardPool = n, this.aggregator.labelPool.eventBus.addListener(D.Click, {
       name: "BufferedHierarchicalAggregator_maker_click",
       fn: (h, c) => {
         this.cardPool.showByIds([h.data.id]);
@@ -1513,7 +1512,7 @@ function Qt({
     } else if (e.data?.wallType == "DynamicImgMaterial") {
       let i = _e(r, {
         image: e.img,
-        // color: new Cesium.Color.fromCssColorString(options?.options?.color),
+        color: new r.Color.fromCssColorString(e?.options?.color),
         duration: 5e3,
         freely: e.data?.freely || "vertical",
         direction: "+",
@@ -1834,15 +1833,15 @@ class ei extends jt {
   //标记监听事件
   initTagListener(e, t) {
     let { viewer: i, tagListeningOptions: o } = t;
-    e.addListener(I.Click, {
+    e.addListener(D.Click, {
       name: "marker:click",
       fn: (a) => {
-        t.runListener?.(D.标记左键点击, a.data), ge(a.data?.onClick) && a.data?.onClick(a.data), a.data?.cameraPoint && a.data?.billboard[0]?.isFlyToCameraPoint && i?.camera?.flyTo({
+        t.runListener?.(I.标记左键点击, a.data), ge(a.data?.onClick) && a.data?.onClick(a.data), a.data?.cameraPoint && a.data?.billboard[0]?.isFlyToCameraPoint && i?.camera?.flyTo({
           duration: 1,
           ...a.data?.cameraPoint
         });
       }
-    }), e.addListener(I.MouseEnter, {
+    }), e.addListener(D.MouseEnter, {
       name: "marker:mouseenter",
       fn: (a) => {
         let n = this.opt.Cesium, s = { x: 0, y: 0 };
@@ -1854,9 +1853,9 @@ class ei extends jt {
         } catch (h) {
           console.log(h);
         }
-        t.runListener?.(D.标记移入, a.data, s);
+        t.runListener?.(I.标记移入, a.data, s);
       }
-    }), e.addListener(I.MouseLeave, {
+    }), e.addListener(D.MouseLeave, {
       name: "marker:mouseleave",
       fn: (a) => {
         let n = this.opt.Cesium, s = { x: 0, y: 0 };
@@ -1868,7 +1867,7 @@ class ei extends jt {
         } catch (h) {
           console.log(h);
         }
-        t.runListener?.(D.标记移出, a.data, s);
+        t.runListener?.(I.标记移出, a.data, s);
       }
     }), o?.forEach((a) => {
       e.addListener(a.key, a.ListenerItem, a.overwrite);
@@ -1925,7 +1924,7 @@ const ti = /* @__PURE__ */ xe({
       const l = Ee(a), d = l?.getCesium?.(), g = l?.getViewer?.();
       d && g ? s({ Cesium: d, viewer: g, methods: l }) : i.Cesium && i.viewer && s({ methods: l });
     }
-    return Ie(() => {
+    return De(() => {
       c();
     }), Z(
       () => [i.Cesium, i.viewer],
@@ -1938,7 +1937,7 @@ const ti = /* @__PURE__ */ xe({
         c();
       },
       { deep: !1 }
-    ), De(() => {
+    ), Ie(() => {
     }), (l, d) => Oe(l.$slots, "default");
   }
 }), di = we(ti);
@@ -1946,7 +1945,7 @@ export {
   di as CxMarkerManage,
   ei as MarkerManage,
   jt as MarkerManagerCore,
-  D as ReportListenerKey,
+  I as ReportListenerKey,
   di as default,
   qe as markerManageProps
 };