From 3fa6a7578ab339091b4c8cdcaf7c7d9547dc50e0 Mon Sep 17 00:00:00 2001
From: FangfangZhao <zhaofang123@gmail.com>
Date: Sun, 9 Dec 2018 17:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/helper/manager/FormManager.java       |  1 +
 src/main/resources/jdbc.properties               |  2 +-
 src/main/webapp/admin/bizuser/dept-list.jsp      | 10 +++++++++-
 src/main/webapp/admin/bizuser/dept-view.jsp      |  8 +++++++-
 src/main/webapp/admin/bizuser/role-view.jsp      |  8 +++++++-
 src/main/webapp/admin/bizuser/user-list.jsp      | 10 +++++++++-
 src/main/webapp/admin/bizuser/user-view.jsp      | 10 ++++++++--
 src/main/webapp/admin/entity/entity-edit.jsp     | 11 ++++++-----
 src/main/webapp/admin/entity/form-design.jsp     |  5 ++++-
 src/main/webapp/assets/js/rb-list.jsx            | 10 +++++++++-
 src/main/webapp/assets/js/rb-view.jsx            | 16 ++++++++++++----
 src/main/webapp/general-entity/record-list.jsp   | 14 ++++++++------
 src/main/webapp/general-entity/record-view.jsp   | 16 +++++++++-------
 src/main/webapp/general-entity/slave-list.jsp    | 14 ++++++++------
 src/main/webapp/general-entity/slave-view.jsp    | 12 +++++++-----
 15 files changed, 105 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/rebuild/server/helper/manager/FormManager.java b/src/main/java/com/rebuild/server/helper/manager/FormManager.java
index ccd1926f8..17120f93f 100644
--- a/src/main/java/com/rebuild/server/helper/manager/FormManager.java
+++ b/src/main/java/com/rebuild/server/helper/manager/FormManager.java
@@ -180,6 +180,7 @@ public class FormManager extends LayoutManager {
 			else if (!entityMeta.containsField(fieldName)) {
 				LOG.warn("Unknow field '" + fieldName + "' in '" + entity + "'");
 				iter.remove();
+				continue;
 			}
 			
 			Field fieldMeta = entityMeta.getField(fieldName);
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index cd87420b4..61864b230 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -1,7 +1,7 @@
 # 
 # DB settings
 
-db.url=jdbc:mysql://127.0.0.1:4653/rebuild?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull
+db.url=jdbc:mysql://127.0.0.1:4653/rebuild10?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull
 db.user=rebuild
 db.passwd=rebuild
 
diff --git a/src/main/webapp/admin/bizuser/dept-list.jsp b/src/main/webapp/admin/bizuser/dept-list.jsp
index 7b9f0b9a8..bd4ddd4e0 100644
--- a/src/main/webapp/admin/bizuser/dept-list.jsp
+++ b/src/main/webapp/admin/bizuser/dept-list.jsp
@@ -69,12 +69,20 @@
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-forms-ext.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/bizuser/dept-tree.js"></script>
+<script>
+window.__PageConfig = {
+	type: 'RecordList',
+	entity: ['Department','${entityLabel}','${entityIcon}'],
+	privileges: ${entityPrivileges},
+	listConfig: ${DataListConfig},
+	advFilter: false
+}
+</script>
 <script type="text/babel">
 RbForm.postAfter = function(){
 	location.reload()
 }
 $(document).ready(function(){
-	RbListPage.init($.parseJSON('${DataListConfig}'), ['Department','${entityLabel}','${entityIcon}'], $.parseJSON('${entityPrivileges}'))
 	loadDeptTree()
 })
 clickDept = function(depts) {
diff --git a/src/main/webapp/admin/bizuser/dept-view.jsp b/src/main/webapp/admin/bizuser/dept-view.jsp
index fbf7e6ecd..8e61de9eb 100644
--- a/src/main/webapp/admin/bizuser/dept-view.jsp
+++ b/src/main/webapp/admin/bizuser/dept-view.jsp
@@ -45,9 +45,15 @@
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-forms-ext.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-view.jsx" type="text/babel"></script>
+<script>
+window.__PageConfig = {
+	type: 'RecordView',
+	entity: ['Department','${entityLabel}','${entityIcon}'],
+	recordId: '${id}'
+}
+</script>
 <script type="text/babel">
 $(document).ready(function(){
-	RbViewPage.init('${id}', ['Department','${entityLabel}','${entityIcon}'])
 	if (rb.isAdminUser == false || rb.isAdminVerified == false) $('.view-action').remove()
 
 	$('.J_delete').off('click').click(function(){
diff --git a/src/main/webapp/admin/bizuser/role-view.jsp b/src/main/webapp/admin/bizuser/role-view.jsp
index 063e64e69..455234754 100644
--- a/src/main/webapp/admin/bizuser/role-view.jsp
+++ b/src/main/webapp/admin/bizuser/role-view.jsp
@@ -39,9 +39,15 @@
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-forms-ext.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-view.jsx" type="text/babel"></script>
+<script>
+window.__PageConfig = {
+	type: 'RecordView',
+	entity: ['Role','${entityLabel}','${entityIcon}'],
+	recordId: '${id}'
+}
+</script>
 <script type="text/babel">
 $(document).ready(function(){
-	RbViewPage.init('${id}', ['Role','${entityLabel}','${entityIcon}'])
 	if (rb.isAdminUser == false || rb.isAdminVerified == false) $('.view-action').remove()
 })
 </script>
diff --git a/src/main/webapp/admin/bizuser/user-list.jsp b/src/main/webapp/admin/bizuser/user-list.jsp
index 95d3ed8e4..bfe59044e 100644
--- a/src/main/webapp/admin/bizuser/user-list.jsp
+++ b/src/main/webapp/admin/bizuser/user-list.jsp
@@ -74,6 +74,15 @@
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-forms-ext.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/bizuser/dept-tree.js"></script>
+<script>
+window.__PageConfig = {
+	type: 'RecordList',
+	entity: ['User','${entityLabel}','${entityIcon}'],
+	privileges: ${entityPrivileges},
+	listConfig: ${DataListConfig},
+	advFilter: false
+}
+</script>
 <script type="text/babel">
 let formPostType = 1
 RbForm.postAfter = function(){
@@ -81,7 +90,6 @@ RbForm.postAfter = function(){
 	else loadDeptTree()
 }
 $(document).ready(function(){
-	RbListPage.init($.parseJSON('${DataListConfig}'), ['User','${entityLabel}','${entityIcon}'], $.parseJSON('${entityPrivileges}'))
 	loadDeptTree()
 
 	$('.J_new').click(function(){ formPostType = 1 })
diff --git a/src/main/webapp/admin/bizuser/user-view.jsp b/src/main/webapp/admin/bizuser/user-view.jsp
index 96079bd1b..2b1693860 100644
--- a/src/main/webapp/admin/bizuser/user-view.jsp
+++ b/src/main/webapp/admin/bizuser/user-view.jsp
@@ -52,9 +52,15 @@
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-forms-ext.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-view.jsx" type="text/babel"></script>
+<script>
+window.__PageConfig = {
+	type: 'RecordView',
+	entity: ['User','${entityLabel}','${entityIcon}'],
+	recordId: '${id}'
+}
+</script>
 <script type="text/babel">
 $(document).ready(function(){
-	RbViewPage.init('${id}', ['User','${entityLabel}','${entityIcon}'])
 	if (rb.isAdminUser == false || rb.isAdminVerified == false) $('.view-action').remove()
 
 	$('.J_delete').off('click').click(function(){
@@ -85,7 +91,7 @@ $(document).ready(function(){
 		if (res.data.disabled == true) reason.push('已停用')
 		$('.J_tips').removeClass('hide').find('.message p').text('当前用户处于未激活状态，因为其 ' + reason.join(' / '))
 	})
-});
+})
 </script>
 </body>
 </html>
diff --git a/src/main/webapp/admin/entity/entity-edit.jsp b/src/main/webapp/admin/entity/entity-edit.jsp
index 96e910daf..b4c04f7a3 100644
--- a/src/main/webapp/admin/entity/entity-edit.jsp
+++ b/src/main/webapp/admin/entity/entity-edit.jsp
@@ -75,7 +75,7 @@ a#entityIcon:hover{opacity:0.8}
 						<div class="form-group row">
 							<label class="col-sm-2 col-form-label text-sm-right">主显字段</label>
 							<div class="col-lg-5 col-sm-10">
-								<select class="form-control form-control-sm" id="nameField">
+								<select class="form-control form-control-sm" id="nameField" data-o="${nameField}">
 								</select>
 								<p class="form-text mb-0">好的主显字段应能够清晰的表示记录本身，如客户中的客户名称或订单中的订单编号</p>
 							</div>
@@ -122,7 +122,8 @@ $(document).ready(function(){
 			label = $val('#entityLabel'),
 			comments = $val('#comments'),
 			nameField = $val('#nameField')
-		let _data = { icon:icon, entityLabel:label, comments:comments, nameField:nameField }
+		let _data = { entityLabel:label, comments:comments, nameField:nameField }
+		if (!!icon) data.icon = icon
 		_data = $cleanMap(_data)
 		if (Object.keys(_data) == 0){ location.reload(); return }
 		
@@ -140,12 +141,12 @@ $(document).ready(function(){
 	
 	$.get(rb.baseUrl + '/commons/metadata/fields?entity=${entityName}', function(d){
 		let rs = d.data.map((item) => {
-			let not = item.type == 'REFERENCE' || item.type == 'NTEXT'
+			let unName = item.type == 'REFERENCE' || item.type == 'NTEXT'
 			return {
 				id: item.name,
 				text: item.label,
-				disabled: not,
-				title: not ? '此字段（类型）不能作为主显字段' : ''
+				disabled: unName,
+				title: unName ? '此字段（类型）不能作为主显字段' : ''
 			}
 		})
 		$('#nameField').select2({
diff --git a/src/main/webapp/admin/entity/form-design.jsp b/src/main/webapp/admin/entity/form-design.jsp
index 2aa218f3b..39d4b83a2 100644
--- a/src/main/webapp/admin/entity/form-design.jsp
+++ b/src/main/webapp/admin/entity/form-design.jsp
@@ -74,9 +74,12 @@
 	</div>
 </div>
 <%@ include file="/_include/Foot.jsp"%>
+<script>
+var FormConfig = ${FormConfig} || [];  // ES5:Unbabel
+</script>
 <script type="text/babel">
 $(document).ready(function(){
-	const config = JSON.parse('${FormConfig}' || '[]');
+	const config = FormConfig
 	$.get('../list-field?entity=${entityName}', function(res){
 		let validFields = {}, configFields = []
 		$(config.elements).each(function(){ configFields.push(this.field) })
diff --git a/src/main/webapp/assets/js/rb-list.jsx b/src/main/webapp/assets/js/rb-list.jsx
index 508aaadad..f9bbcfc0a 100644
--- a/src/main/webapp/assets/js/rb-list.jsx
+++ b/src/main/webapp/assets/js/rb-list.jsx
@@ -472,4 +472,12 @@ const QuickFilter = {
     // 复写增加额外过滤条件
     mergeFilter() {
     }
-};
\ No newline at end of file
+}
+
+// Init
+$(document).ready(() => {
+    let wpc = window.__PageConfig
+    if (!wpc) return
+    RbListPage.init(wpc.listConfig, wpc.entity, wpc.privileges)
+    if (!(wpc.advFilter == false)) rb.AdvFilter.init('.adv-search', wpc.entity[0])
+})
\ No newline at end of file
diff --git a/src/main/webapp/assets/js/rb-view.jsx b/src/main/webapp/assets/js/rb-view.jsx
index d64e7752a..a5ad9de09 100644
--- a/src/main/webapp/assets/js/rb-view.jsx
+++ b/src/main/webapp/assets/js/rb-view.jsx
@@ -120,11 +120,9 @@ const RbViewPage = {
         $('.J_reload').click(function(){
             location.reload()
         })
-        
-        this.renderRecordMeta()
     },
     
-    renderRecordMeta() {
+    initRecordMeta() {
         $.get(`${rb.baseUrl}/app/entity/record-meta?id=${this.__id}`, function(res){
             if (res.error_code == 0) {
                 let _data = res.data
@@ -257,4 +255,14 @@ const RbViewPage = {
             else setTimeout(function() { parent.location.reload() }, 1000)
         }
     }
-}
\ No newline at end of file
+}
+
+// Init
+$(document).ready(function(){
+    let wpc = window.__PageConfig
+    if (!wpc) return
+    RbViewPage.init(wpc.recordId, wpc.entity, wpc.privileges)
+    RbViewPage.initRecordMeta()
+    if (!!wpc.viewTabs) RbViewPage.initVTabs(wpc.viewTabs)
+    if (!!wpc.viewAdds) RbViewPage.initVAdds(wpc.viewAdds)
+})
\ No newline at end of file
diff --git a/src/main/webapp/general-entity/record-list.jsp b/src/main/webapp/general-entity/record-list.jsp
index 09ef4e888..e895e77bd 100644
--- a/src/main/webapp/general-entity/record-list.jsp
+++ b/src/main/webapp/general-entity/record-list.jsp
@@ -81,12 +81,14 @@
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-advfilter.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/assign-share.jsx" type="text/babel"></script>
-<script type="text/babel">
-window.pageType = 'RecordList'
-$(document).ready(function(){
-	RbListPage.init($.parseJSON('${DataListConfig}'), ['${entityName}','${entityLabel}','${entityIcon}'], $.parseJSON('${entityPrivileges}'))
-	rb.AdvFilter.init('.adv-search', '${entityName}')
-})
+<script>
+window.__PageConfig = {
+	type: 'RecordList',
+	entity: ['${entityName}','${entityLabel}','${entityIcon}'],
+	privileges: ${entityPrivileges},
+	listConfig: ${DataListConfig},
+	advFilter: true
+}
 </script>
 </body>
 </html>
diff --git a/src/main/webapp/general-entity/record-view.jsp b/src/main/webapp/general-entity/record-view.jsp
index 8a5208654..0e976193e 100644
--- a/src/main/webapp/general-entity/record-view.jsp
+++ b/src/main/webapp/general-entity/record-view.jsp
@@ -87,13 +87,15 @@
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-view.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/assign-share.jsx" type="text/babel"></script>
-<script type="text/babel">
-window.pageType = 'RecordView'
-$(document).ready(function(){
-	RbViewPage.init('${id}', ['${entityName}','${entityLabel}','${entityIcon}'], $.parseJSON('${entityPrivileges}'))
-	RbViewPage.initVTabs($.parseJSON('${ViewTabs}'))
-	RbViewPage.initVAdds($.parseJSON('${ViewAdds}'))
-})
+<script>
+window.__PageConfig = {
+	type: 'RecordView',
+	entity: ['${entityName}','${entityLabel}','${entityIcon}'],
+	privileges: ${entityPrivileges},
+	viewTabs: ${ViewTabs},
+	viewAdds: ${ViewAdds},
+	recordId: '${id}'
+}
 </script>
 </body>
 </html>
diff --git a/src/main/webapp/general-entity/slave-list.jsp b/src/main/webapp/general-entity/slave-list.jsp
index 58b0f254e..fdaf2a18d 100644
--- a/src/main/webapp/general-entity/slave-list.jsp
+++ b/src/main/webapp/general-entity/slave-list.jsp
@@ -75,12 +75,14 @@
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-advfilter.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/assign-share.jsx" type="text/babel"></script>
-<script type="text/babel">
-window.pageType = 'SlaveList'
-$(document).ready(function(){
-	RbListPage.init($.parseJSON('${DataListConfig}'), ['${entityName}','${entityLabel}','${entityIcon}'], $.parseJSON('${entityPrivileges}'))
-	rb.AdvFilter.init('.adv-search', '${entityName}')
-})
+<script>
+window.__PageConfig = {
+	type: 'SlaveList',
+	entity: ['${entityName}','${entityLabel}','${entityIcon}'],
+	privileges: ${entityPrivileges},
+	listConfig: ${DataListConfig},
+	advFilter: true
+}
 </script>
 </body>
 </html>
diff --git a/src/main/webapp/general-entity/slave-view.jsp b/src/main/webapp/general-entity/slave-view.jsp
index beff7002f..da5f92d58 100644
--- a/src/main/webapp/general-entity/slave-view.jsp
+++ b/src/main/webapp/general-entity/slave-view.jsp
@@ -59,11 +59,13 @@
 <%@ include file="/_include/Foot.jsp"%>
 <script src="${baseUrl}/assets/js/rb-forms.jsx" type="text/babel"></script>
 <script src="${baseUrl}/assets/js/rb-view.jsx" type="text/babel"></script>
-<script type="text/babel">
-window.pageType = 'SlaveView'
-$(document).ready(function(){
-	RbViewPage.init('${id}', ['${entityName}','${entityLabel}','${entityIcon}'], $.parseJSON('${entityPrivileges}'))
-})
+<script>
+window.__PageConfig = {
+	type: 'SlaveView',
+	entity: ['${entityName}','${entityLabel}','${entityIcon}'],
+	privileges: ${entityPrivileges},
+	recordId: '${id}'
+}
 </script>
 </body>
 </html>