From 5408346178dd12b7ab78fb51c76f59c300a7e153 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期四, 31 十月 2024 23:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml
index 27e2f5b..48cbb03 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1201.view.xml
@@ -186,6 +186,11 @@
       <PropertyDef name="czbz">
         <Property></Property>
         <Property name="label">鎿嶄綔鏍囧織</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="kqdm">
         <Property></Property>
@@ -219,12 +224,41 @@
         <Property name="label">澶囨敞璇存槑</Property>
       </PropertyDef>
     </DataType>
+    <DataType name="dtParam">
+      <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+      <PropertyDef name="kqdm">
+        <Property></Property>
+        <Property name="label">鎵�灞炲簱鍖�</Property>
+      </PropertyDef>
+      <PropertyDef name="start">
+        <Property name="dataType">Date</Property>
+        <Property name="label">寮�濮嬫椂闂�</Property>
+      </PropertyDef>
+      <PropertyDef name="end">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鎴鏃堕棿</Property>
+      </PropertyDef>
+      <PropertyDef name="czbz">
+        <Property></Property>
+        <Property name="label">鎿嶄綔鏍囧織</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;CZBZ&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+    </DataType>
   </Model>
   <View layout="regionPadding:10">
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
       <Property name="dataType">[dtMain]</Property>
       <Property name="dataProvider">whjlApi1201PR#listData</Property>
+      <Property name="pageSize">20</Property>
+    </DataSet>
+    <DataSet id="dsQuery">
+      <ClientEvent name="onReady">self.insert();</ClientEvent>
+      <Property name="dataType">dtParam</Property>
     </DataSet>
     <Container layout="regionPadding:10" layoutConstraint="top">
       <Property name="exClassName">bg-color</Property>
@@ -381,11 +415,18 @@
         </DataColumn>
       </DataGrid>
     </Container>
+    <Container layoutConstraint="bottom">
+      <Property name="exClassName">bg-color</Property>
+      <DataPilot layoutConstraint="right">
+        <Property name="dataSet">dsMain</Property>
+        <Property name="itemCodes">pageSize,pages</Property>
+      </DataPilot>
+    </Container>
     <Dialog id="dialogMain">
       <Property name="width">85%</Property>
       <Property name="closeable">false</Property>
       <Property name="iconClass">fa fa-sliders</Property>
-      <Property name="caption">鍐涚伯浼佷笟淇℃伅</Property>
+      <Property name="caption">鍓渚涘簲鍟嗕俊鎭�</Property>
       <Property name="height">85%</Property>
       <Buttons>
         <Button>

--
Gitblit v1.9.3