From e7ab049344b954b044fc474992c378fcbbeeba33 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
index 9e995ca..a2950ec 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
@@ -179,7 +179,7 @@
           <Property name="iconClass">fa fa-plus</Property>
         </ToolBarButton>
         <ToolBarButton>
-          <ClientEvent name="onClick">var data = view.get(&quot;#dataGridCamera&quot;).get(&quot;selection&quot;);&#xD;
+          <ClientEvent name="onClick">var data = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
             if(data){&#xD;
             view.get(&quot;#dialogMain&quot;).show();&#xD;
             }else{&#xD;
@@ -191,7 +191,7 @@
           <Property name="iconClass">fa fa-pencil-square-o</Property>
         </ToolBarButton>
         <ToolBarButton>
-          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridCamera&quot;).get(&quot;selection&quot;);&#xD;
+          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
             if(select){&#xD;
             view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
             if(result){&#xD;
@@ -278,7 +278,6 @@
       <Property name="width">60%</Property>
       <Property name="caption">鎹熺泭淇℃伅</Property>
       <Property name="closeable">false</Property>
-      <Property name="height">50%</Property>
       <Buttons>
         <Button>
           <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;

--
Gitblit v1.9.3