From f30bc9d11d18e93626e4530dd2de54d479c2521d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 08 十一月 2021 21:48:22 +0800
Subject: [PATCH] Merge branch 'master' into bms

---
 src/templates/zshare/formconfig.jsx |   80 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 79 insertions(+), 1 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index fbcc7db..b2ece7d 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -678,6 +678,20 @@
         text: Formdict['model.false']
       }]
     },
+    {
+      type: 'radio',
+      key: 'query',
+      label: '鍙備笌鏌ヨ',
+      initVal: card.query || 'true',
+      tooltip: '鏄惁浣滀负 where 鏉′欢锛屽弬涓庢暟鎹煡璇€��',
+      options: [{
+        value: 'true',
+        text: '鏄�'
+      }, {
+        value: 'false',
+        text: '鍚�'
+      }]
+    },
     // {
     //   type: 'radio',
     //   key: 'transfer',
@@ -2615,6 +2629,70 @@
       required: false
     },
     {
+      type: 'select',
+      key: 'minDate',
+      label: '鏈�灏忓��',
+      initVal: card.minDate || '',
+      required: false,
+      options: [{
+        value: '',
+        text: '鏃�'
+      }, {
+        value: '0',
+        text: '褰撳ぉ'
+      }, {
+        value: '-1',
+        text: '鍓嶄竴澶�'
+      }, {
+        value: '-2',
+        text: '鍓嶄袱澶�'
+      }, {
+        value: '-3',
+        text: '鍓嶄笁澶�'
+      }, {
+        value: '-7',
+        text: '鍓嶄竷澶�'
+      }, {
+        value: '-30',
+        text: '鍓�30澶�'
+      }, {
+        value: '-90',
+        text: '鍓�90澶�'
+      }]
+    },
+    {
+      type: 'select',
+      key: 'maxDate',
+      label: '鏈�澶у��',
+      initVal: card.maxDate || '',
+      required: false,
+      options: [{
+        value: '',
+        text: '鏃�'
+      }, {
+        value: '0',
+        text: '褰撳ぉ'
+      }, {
+        value: '1',
+        text: '鍚庝竴澶�'
+      }, {
+        value: '2',
+        text: '鍚庝袱澶�'
+      }, {
+        value: '3',
+        text: '鍚庝笁澶�'
+      }, {
+        value: '7',
+        text: '鍚庝竷澶�'
+      }, {
+        value: '30',
+        text: '鍚�30澶�'
+      }, {
+        value: '90',
+        text: '鍚�90澶�'
+      }]
+    },
+    {
       type: 'number',
       key: 'fieldlength',
       min: 1,
@@ -3007,7 +3085,7 @@
       key: 'place',
       label: '鎺掑垪',
       initVal: card.place || 'left_right',
-      tooltip: '鎻愮ず鏂囧瓧涓庤緭鍏ユ鐨勪綅缃叧绯汇�傛敞锛氫笂涓嬫帓鍒楁槸浼氱鐢ㄦ壂鐮佸姛鑳姐��',
+      tooltip: '鎻愮ず鏂囧瓧涓庤緭鍏ユ鐨勪綅缃叧绯汇��',
       forbid: appType !== 'mob',
       options: [{
         value: 'left_right',

--
Gitblit v1.8.0