Merge branch 'main' of http://123.132.248.154:10000/gitY/LinYeFangHuo

src/packages/components/Zhichu/Zhichu/ZhiChu_ModalTable/index.vue

@@ -277,7 +277,7 @@
       }
     },
     {
-      immediate: true,
+      immediate: false,
       deep: true,
     },
   );
@@ -309,6 +309,10 @@
         }
       }
     },
+    {
+      immediate: false,
+      deep: true,
+    },
   );
 
   // 水源

src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/config.vue

@@ -32,7 +32,7 @@
           placeholder="宽度"
         />
       </SettingItem>
-      <SettingItem name="图标颜色（小）">
+      <!-- <SettingItem name="图标颜色（小）">
         <n-color-picker
           size="small"
           :modes="['rgb']"
@@ -91,7 +91,7 @@
         >
           恢复默认
         </n-button>
-      </SettingItem>
+      </SettingItem> -->
     </SettingItemBox>
   </CollapseItem>
 </template>

src/packages/components/Zhigan/Zhigan/ZhiGan_LowerLeft/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="ZhiGan_LowerLeft">
     <div class="image">
-      <Icon :dataStyle="option.dataStyle" />
+      <!-- <Icon :dataStyle="option.dataStyle" /> -->
+      <n-image
+        src="/src/assets/images/chart/zhigan/component/LowerLeft.png"
+        :width="option.dataStyle.imageWidth"
+        :height="option.dataStyle.imageHeight"
+      />
     </div>
   </div>
 </template>
@@ -41,6 +46,7 @@
 
 <style lang="scss" scoped>
   .ZhiGan_LowerLeft {
+    position: relative;
     background: v-bind('`${option.dataStyle.backgroud}`');
     width: v-bind('`${w}px`');
     height: v-bind('`${h}px`');
@@ -49,6 +55,5 @@
     position: absolute;
     left: v-bind('`${option.dataStyle.left}px`');
     bottom: v-bind('`${option.dataStyle.bottom}px`');
-    bottom: 0px;
   }
 </style>

src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/config.vue

@@ -40,7 +40,7 @@
           placeholder="宽度"
         />
       </SettingItem>
-      <SettingItem name="图标颜色（小）">
+      <!-- <SettingItem name="图标颜色（小）">
         <n-color-picker
           size="small"
           :modes="['rgb']"
@@ -99,7 +99,7 @@
         >
           恢复默认
         </n-button>
-      </SettingItem>
+      </SettingItem> -->
     </SettingItemBox>
   </CollapseItem>
 </template>

src/packages/components/Zhigan/Zhigan/ZhiGan_LowerRight/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="ZhiGan_LowerRight">
     <div class="image">
-      <Icon :dataStyle="option.dataStyle" />
+      <!-- <Icon :dataStyle="option.dataStyle" /> -->
+      <n-image
+        src="/src/assets/images/chart/zhigan/component/LowerRight.png"
+        :width="option.dataStyle.imageWidth"
+        :height="option.dataStyle.imageHeight"
+      />
     </div>
   </div>
 </template>
@@ -41,6 +46,7 @@
 
 <style lang="scss" scoped>
   .ZhiGan_LowerRight {
+    position: relative;
     background: v-bind('`${option.dataStyle.backgroud}`');
     width: v-bind('`${w}px`');
     height: v-bind('`${h}px`');
@@ -49,6 +55,5 @@
     position: absolute;
     right: v-bind('`${option.dataStyle.right}px`');
     bottom: v-bind('`${option.dataStyle.bottom}px`');
-    bottom: 0px;
   }
 </style>

src/packages/components/Zhigan/Zhigan/ZhiGan_ModalCarousel/index.vue

@@ -104,6 +104,11 @@
     dataset: props.chartConfig.option.dataset,
     dataStyle: props.chartConfig.option.dataStyle,
   });
+
+  // 数据callback处理（预览时触发）
+  useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => {
+    option.dataset = resData;
+  });
 </script>
 
 <style lang="scss" scoped>

src/packages/components/Zhigan/Zhigan/ZhiGan_ModalVideo/index.vue

@@ -8,7 +8,6 @@
       crossOrigin="anonymous"
       playsinline
       autoplay
-      :object-fit="option.dataset.fit"
       :loop="option.dataStyle.videoLoop"
       :muted="option.dataStyle.videoMuted"
       :width="`${w - 2 * option.dataStyle.padding - 2 * option.dataStyle.borderWidth}`"
@@ -24,7 +23,6 @@
       crossOrigin="anonymous"
       playsinline
       autoplay
-      :object-fit="option.dataset.fit"
       :loop="option.dataStyle.videoLoop"
       :muted="option.dataStyle.videoMuted"
       :width="`${w - 2 * option.dataStyle.padding - 2 * option.dataStyle.borderWidth}`"
@@ -103,6 +101,12 @@
       player = null;
     }
   });
+
+  // 数据callback处理（预览时触发）
+  useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => {
+    option.dataset = resData;
+    handlerPlayVideo();
+  });
 </script>
 
 <style lang="scss" scoped>

src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouModal/index.vue

@@ -110,7 +110,6 @@
               crossOrigin="anonymous"
               playsinline
               autoplay
-              :object-fit="option.dataset.fit"
               :loop="option.dataStyle.videoloop"
               :muted="option.dataStyle.videomuted"
               :style="{

src/packages/components/Zhigan/Zhigan/ZhiGan_WuRenJiShiShiHuaMian/index.vue

@@ -12,7 +12,6 @@
               crossOrigin="anonymous"
               playsinline
               autoplay
-              :object-fit="option.dataset.fit"
               :loop="option.dataStyle.videoloop"
               :muted="option.dataStyle.videomuted"
               :width="`${option.dataStyle.videowidth - 2 * option.dataStyle.borderWidth - 2 * option.dataStyle.padding}`"
@@ -30,7 +29,6 @@
               crossOrigin="anonymous"
               playsinline
               autoplay
-              :object-fit="option.dataset.fit"
               :loop="option.dataStyle.videoloop"
               :muted="option.dataStyle.videomuted"
               :width="`${option.dataStyle.videowidth - 2 * option.dataStyle.borderWidth - 2 * option.dataStyle.padding}`"