|
@@ -669,6 +669,7 @@ let preHandleObj = {
|
|
|
[JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES]:
|
|
[JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES]:
|
|
|
getDefaultFloorBillGljTypes(),
|
|
getDefaultFloorBillGljTypes(),
|
|
|
[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD]: false,
|
|
[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD]: false,
|
|
|
|
|
+ [JV.PROP_HANDLE_TYPE_ONLY_CONCRETE_DATA]: false,
|
|
|
[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD]: false,
|
|
[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD]: false,
|
|
|
[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA]: false,
|
|
[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA]: false,
|
|
|
};
|
|
};
|
|
@@ -762,6 +763,7 @@ let preHandleObj = {
|
|
|
item[JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES] =
|
|
item[JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES] =
|
|
|
getDefaultFloorBillGljTypes();
|
|
getDefaultFloorBillGljTypes();
|
|
|
item[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] = false;
|
|
item[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] = false;
|
|
|
|
|
+ item[JV.PROP_HANDLE_TYPE_ONLY_CONCRETE_DATA] = false;
|
|
|
item[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD] = false;
|
|
item[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD] = false;
|
|
|
item[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA] = false;
|
|
item[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA] = false;
|
|
|
break;
|
|
break;
|
|
@@ -2048,6 +2050,8 @@ let preHandleFloorBillGljObj = {
|
|
|
dest[JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES] = values.slice();
|
|
dest[JV.PROP_HANDLE_TYPE_FLOOR_BILL_GLJ_TYPES] = values.slice();
|
|
|
dest[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] =
|
|
dest[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] =
|
|
|
!!src[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD];
|
|
!!src[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD];
|
|
|
|
|
+ dest[JV.PROP_HANDLE_TYPE_ONLY_CONCRETE_DATA] =
|
|
|
|
|
+ !!src[JV.PROP_HANDLE_TYPE_ONLY_CONCRETE_DATA];
|
|
|
dest[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD] =
|
|
dest[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD] =
|
|
|
!!src[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD];
|
|
!!src[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD];
|
|
|
dest[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA] =
|
|
dest[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA] =
|
|
@@ -2095,6 +2099,11 @@ let preHandleFloorBillGljObj = {
|
|
|
showConcreteChk.checked =
|
|
showConcreteChk.checked =
|
|
|
!!preHandleObj.currentNode[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD];
|
|
!!preHandleObj.currentNode[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD];
|
|
|
}
|
|
}
|
|
|
|
|
+ let onlyConcreteChk = $("#chk_only_concrete_data")[0];
|
|
|
|
|
+ if (onlyConcreteChk) {
|
|
|
|
|
+ onlyConcreteChk.checked =
|
|
|
|
|
+ !!preHandleObj.currentNode[JV.PROP_HANDLE_TYPE_ONLY_CONCRETE_DATA];
|
|
|
|
|
+ }
|
|
|
let showMachineChk = $("#chk_show_machine_child")[0];
|
|
let showMachineChk = $("#chk_show_machine_child")[0];
|
|
|
if (showMachineChk) {
|
|
if (showMachineChk) {
|
|
|
showMachineChk.checked =
|
|
showMachineChk.checked =
|
|
@@ -2119,6 +2128,8 @@ let preHandleFloorBillGljObj = {
|
|
|
),
|
|
),
|
|
|
[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD]:
|
|
[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD]:
|
|
|
!!handleObj[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD],
|
|
!!handleObj[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD],
|
|
|
|
|
+ [JV.PROP_HANDLE_TYPE_ONLY_CONCRETE_DATA]:
|
|
|
|
|
+ !!handleObj[JV.PROP_HANDLE_TYPE_ONLY_CONCRETE_DATA],
|
|
|
[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD]:
|
|
[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD]:
|
|
|
!!handleObj[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD],
|
|
!!handleObj[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD],
|
|
|
[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA]:
|
|
[JV.PROP_HANDLE_TYPE_NOT_MERGE_GLJ_DATA]:
|
|
@@ -2154,6 +2165,8 @@ let preHandleFloorBillGljObj = {
|
|
|
if (me.currentNode) {
|
|
if (me.currentNode) {
|
|
|
if (dom && dom.id === "chk_show_concrete_child") {
|
|
if (dom && dom.id === "chk_show_concrete_child") {
|
|
|
me.currentNode[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] = dom.checked;
|
|
me.currentNode[JV.PROP_HANDLE_TYPE_SHOW_CONCRETE_CHILD] = dom.checked;
|
|
|
|
|
+ } else if (dom && dom.id === "chk_only_concrete_data") {
|
|
|
|
|
+ me.currentNode[JV.PROP_HANDLE_TYPE_ONLY_CONCRETE_DATA] = dom.checked;
|
|
|
} else if (dom && dom.id === "chk_show_machine_child") {
|
|
} else if (dom && dom.id === "chk_show_machine_child") {
|
|
|
me.currentNode[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD] = dom.checked;
|
|
me.currentNode[JV.PROP_HANDLE_TYPE_SHOW_MACHINE_CHILD] = dom.checked;
|
|
|
} else if (dom && dom.id === "chk_not_merge_glj_data") {
|
|
} else if (dom && dom.id === "chk_not_merge_glj_data") {
|