From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-generator/src/main/resources/web/template_1.json | 243 +++++++++--------------------------------------
1 files changed, 49 insertions(+), 194 deletions(-)
diff --git a/java110-generator/src/main/resources/web/template_1.json b/java110-generator/src/main/resources/web/template_1.json
old mode 100644
new mode 100755
index f247163..6088c13
--- a/java110-generator/src/main/resources/web/template_1.json
+++ b/java110-generator/src/main/resources/web/template_1.json
@@ -1,213 +1,68 @@
{
- "templateName":"鍚堝悓淇℃伅",
- "directories": "admin",
- "templateCode":"contract",
- "templateKey":"contractId",
- "templateKeyName":"鍚堝悓ID",
- "searchCode": "contractId",
- "searchName": "鍚堝悓ID",
+ "templateName":"鏀舵嵁妯℃澘",
+ "directories": "property",
+ "templateCode":"feePrintPage",
+ "templateKey":"pageId",
+ "templateKeyName":"鏀舵嵁ID",
+ "searchCode": "pageId",
+ "searchName": "鏀舵嵁ID",
"conditions": [
{
- "name": "鍚堝悓鍚嶇О",
- "inputType": "input",
- "code": "contractName",
- "whereCondition": "equal"
+ "whereCondition": "equal",
+ "code": "pageId",
+ "name": "椤甸潰ID",
+ "inputType": "input"
},
{
- "name": "鍚堝悓缂栧彿",
- "inputType": "input",
- "code": "contractCode",
- "whereCondition": "equal"
+ "whereCondition": "equal",
+ "code": "pageName",
+ "name": "鍚嶇О",
+ "inputType": "input"
},
{
- "name": "鍚堝悓绫诲瀷",
- "inputType": "input",
- "code": "contractType",
- "whereCondition": "equal"
+ "whereCondition": "equal",
+ "code": "state",
+ "name": "鐘舵��",
+ "inputType": "input"
}
],
- "columns":[
+ "columns": [
{
- "code": "contractName",
- "cnCode":"鍚堝悓鍚嶇О",
- "desc":"蹇呭～锛岃濉啓鍚堝悓鍚嶇О",
- "required":true,
- "hasDefaultValue":false,
+ "hasDefaultValue": false,
+ "limitParam": "128",
+ "code": "pageName",
+ "limitErrInfo": "鍚嶇О涓嶈兘瓒呰繃128",
+ "cnCode": "鍚嶇О",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"鍚堝悓鍚嶇О涓嶈兘瓒呰繃64浣�",
- "show": true
+ "required": true,
+ "desc": "蹇呭～锛屽悕绉�"
},
{
- "code": "contractCode",
- "cnCode":"鍚堝悓缂栧彿",
- "desc":"閫夊～锛岃濉啓鍚堝悓缂栧彿",
- "required":true,
- "hasDefaultValue":false,
+ "hasDefaultValue": false,
+ "limitParam": "30",
+ "code": "communityId",
+ "limitErrInfo": "灏忓尯ID涓嶈兘瓒呰繃30",
+ "cnCode": "灏忓尯ID",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "limit":"maxLength",
- "limitParam":"30",
- "limitErrInfo":"鍚堝悓缂栧彿閿欒",
- "show": true
+ "required": true,
+ "desc": "蹇呭～锛屽皬鍖篒D"
},
{
- "code": "contractType",
- "cnCode":"鍚堝悓绫诲瀷",
- "desc":"蹇呭～锛岃閫夋嫨鍚堝悓绫诲瀷",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "select",
- "selectValue":"10001,10002",
- "selectValueName":"灏忓尯鏂囧寲,鍏朵粬",
- "limit":"num",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓绫诲瀷鏍煎紡閿欒",
- "show": true
- },
- {
- "code": "partyA",
- "cnCode":"鐢叉柟",
- "desc":"蹇呭～锛岃濉啓鐢叉柟",
- "required":true,
- "hasDefaultValue":false,
+ "hasDefaultValue": false,
+ "limitParam": "512",
+ "code": "pageUrl",
+ "limitErrInfo": "鏀舵嵁椤甸潰涓嶈兘瓒呰繃512",
+ "cnCode": "鏀舵嵁椤甸潰",
+ "limit": "maxLength",
+ "show": true,
"inputType": "input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"鐢叉柟鍚嶇О澶暱",
- "show": true
- },
- {
- "code": "partyB",
- "cnCode":"涔欐柟",
- "desc":"蹇呭～锛岃濉啓涔欐柟",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"200",
- "limitErrInfo":"涔欐柟鍚嶇О澶暱",
- "show": true
- },
- {
- "code": "aContacts",
- "cnCode":"鐢叉柟鑱旂郴浜�",
- "desc":"蹇呭～锛岃濉啓鐢叉柟鑱旂郴浜�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"鐢叉柟鑱旂郴浜洪暱搴﹁秴杩�64浣�",
- "show": false
- },
- {
- "code": "bContacts",
- "cnCode":"涔欐柟鑱旂郴浜�",
- "desc":"蹇呭～锛岃濉啓鐢叉柟鑱旂郴浜�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"鐢叉柟鑱旂郴浜洪暱搴﹁秴杩�64浣�",
- "show": false
- },
- {
- "code": "aLink",
- "cnCode":"鐢叉柟鑱旂郴鐢佃瘽",
- "desc":"蹇呭～锛岃濉啓鐢叉柟鑱旂郴鐢佃瘽",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"phone",
- "limitParam":"",
- "limitErrInfo":"鐢叉柟鑱旂郴鐢佃瘽閿欒",
- "show": false
- },
- {
- "code": "bLink",
- "cnCode":"涔欐柟鑱旂郴鐢佃瘽",
- "desc":"蹇呭～锛岃濉啓涔欐柟鑱旂郴鐢佃瘽",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"phone",
- "limitParam":"",
- "limitErrInfo":"涔欐柟鑱旂郴鐢佃瘽閿欒",
- "show": false
- },
- {
- "code": "operator",
- "cnCode":"缁忓姙浜�",
- "desc":"蹇呭～锛岃濉啓缁忓姙浜�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"maxLength",
- "limitParam":"64",
- "limitErrInfo":"缁忓姙浜鸿秴杩�64浣�",
- "show": true
- },
- {
- "code": "operatorLink",
- "cnCode":"鑱旂郴鐢佃瘽",
- "desc":"蹇呭～锛岃濉啓缁忓姙浜鸿仈绯荤數璇�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"phone",
- "limitParam":"",
- "limitErrInfo":"缁忓姙浜鸿仈绯荤數璇濇牸寮忛敊璇�",
- "show": false
- },
- {
- "code": "amount",
- "cnCode":"鍚堝悓閲戦",
- "desc":"蹇呭～锛岃濉啓鍚堝悓閲戦",
- "required":false,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"money",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓閲戦鏍煎紡閿欒锛屽1.50",
- "show": true
- },
- {
- "code": "startTime",
- "cnCode":"寮�濮嬫椂闂�",
- "desc":"蹇呭～锛岃濉啓鍚堝悓寮�濮嬫椂闂�",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"dateTime",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓寮�濮嬫椂闂存牸寮忛敊璇�",
- "show": true
- },
- {
- "code": "endTime",
- "cnCode":"缁撴潫鏃堕棿",
- "desc":"蹇呭～锛岃濉啓鍚堝悓缁撴潫鏃堕棿",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"dateTime",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓缁撴潫鏃堕棿鏍煎紡閿欒",
- "show": true
- },
- {
- "code": "signingTime",
- "cnCode":"绛捐鏃堕棿",
- "desc":"閫夊～锛岃濉啓鍚堝悓绛捐鏃堕棿",
- "required":true,
- "hasDefaultValue":false,
- "inputType": "input",
- "limit":"dateTime",
- "limitParam":"",
- "limitErrInfo":"鍚堝悓绛捐鏃堕棿鏍煎紡閿欒",
- "show": false
+ "required": true,
+ "desc": "蹇呭～锛屾敹鎹〉闈�"
}
]
-}
\ No newline at end of file
+
+}
--
Gitblit v1.8.0