From 899d74ab3d00f7d0b0909d23551b1f971e2edea4 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期四, 17 八月 2023 18:57:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml |   47 +++++++++++++++++++++++++++++++++++------------
 1 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml b/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml
index 151dce9..fdaf621 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml
+++ b/src/main/java/com/fzzy/whjl/view/WhjlApi1101.view.xml
@@ -396,11 +396,6 @@
       <PropertyDef name="sfjbjlcbzg">
         <Property></Property>
         <Property name="label">鏄惁鍏峰鍐涚伯鍌ㄥ璧勬牸</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;YN&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="fddbr">
         <Property></Property>
@@ -488,11 +483,6 @@
       <PropertyDef name="sfyx">
         <Property></Property>
         <Property name="label">鏄惁鍚敤</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;YN&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="bz">
         <Property></Property>
@@ -505,6 +495,19 @@
       <PropertyDef name="updateTime">
         <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>
+      <PropertyDef name="kqdm">
+        <Property></Property>
+        <Property name="label">搴撳尯浠ｇ爜</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtGBArea">
@@ -746,6 +749,7 @@
           <AutoFormElement>
             <Property name="name">sfjbjlcbzg</Property>
             <Property name="property">sfjbjlcbzg</Property>
+            <Property name="trigger">listDropYN</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -843,6 +847,7 @@
           <AutoFormElement>
             <Property name="name">sfyx</Property>
             <Property name="property">sfyx</Property>
+            <Property name="trigger">listDropYN</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -858,6 +863,16 @@
           <AutoFormElement>
             <Property name="name">updateTime</Property>
             <Property name="property">updateTime</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">czbz</Property>
+            <Property name="property">czbz</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">kqdm</Property>
+            <Property name="property">kqdm</Property>
             <Editor/>
           </AutoFormElement>
         </AutoForm>
@@ -879,7 +894,7 @@
       <Property name="service">whjlApi1101PR#pushData</Property>
     </AjaxAction>
     <CustomDropDown id="cddGbArea">
-      <Property name="assignmentMap">xzqhdm=code,xzqhmc=name</Property>
+      <Property name="assignmentMap">qyxzqhdm=code,qyxzqhmc=name</Property>
       <Property name="height">500</Property>
       <Property name="minHeight">500</Property>
       <Property name="maxHeight">500</Property>
@@ -940,11 +955,19 @@
       <Children>
         <Container>
           <IFrame id="iFrame">
-            <Property name="userData"></Property>
+            <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+            <Property name="userData">
+              <Entity>
+                <Property name="deptId">deptId</Property>
+              </Entity>
+            </Property>
           </IFrame>
         </Container>
       </Children>
       <Tools/>
     </Dialog>
+    <ListDropDown id="listDropYN">
+      <Property name="items">鏄�,鍚�</Property>
+    </ListDropDown>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3