提交 c52a1414 编写于 作者: zhangpingchuan's avatar zhangpingchuan

feat: 合并主干到苏研样式分支

...@@ -14,7 +14,7 @@ export async function attachEnvironmentConfig(): Promise<void> { ...@@ -14,7 +14,7 @@ export async function attachEnvironmentConfig(): Promise<void> {
const key2 = envMap.has(key) ? envMap.get(key)! : key; const key2 = envMap.has(key) ? envMap.get(key)! : key;
if (env[key2]) { if (env[key2]) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
(ibiz.env as any)[key] = env[key2]; (ibiz.env as any)[key] = ibiz.util.rawValue.format(env[key2]);
} }
}); });
......
...@@ -247,6 +247,31 @@ ...@@ -247,6 +247,31 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/PhoneNumber.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/PhoneNumber.json"
}, },
"enableBackend" : false "enableBackend" : false
}, {
"actionHolder" : 2,
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json",
"logicName" : "测试包含操作",
"name" : "testcontains",
"getPSDEActionInput" : {
"name" : "TestcontainsInput",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSDEActionReturn" : {
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDELogic" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/testcontains.json"
},
"enableBackend" : false
}, { }, {
"actionHolder" : 1, "actionHolder" : 1,
"actionMode" : "CUSTOM", "actionMode" : "CUSTOM",
...@@ -3685,6 +3710,90 @@ ...@@ -3685,6 +3710,90 @@
}, },
"enableBackend" : true, "enableBackend" : true,
"enableFront" : false "enableFront" : false
}, {
"codeName" : "testcontains",
"defaultParamName" : "Default",
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/testcontains.json",
"logicName" : "测试包含操作",
"name" : "测试包含操作",
"getPSDELogicNodes" : [ {
"codeName" : "Begin",
"leftPos" : 200,
"logicNodeType" : "BEGIN",
"name" : "开始",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
},
"name" : "连接名称",
"getPSDELogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"name" : "连接条件组",
"getPSDELogicLinkConds" : [ {
"condOP" : "CONTAINS",
"dstFieldName" : "MONEY",
"getDstLogicParam" : {
"modelref" : true,
"id" : "Default"
},
"logicType" : "SINGLE",
"name" : "Default[MONEY] 包含属性(Contains)",
"getSrcLogicParam" : {
"modelref" : true,
"id" : "Default"
}
} ]
},
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "PREPAREPARAM1",
"leftPos" : 360,
"logicNodeType" : "PREPAREPARAM",
"name" : "准备参数",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "END1"
},
"name" : "连接名称",
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
}
} ],
"topPos" : 240
}, {
"codeName" : "END1",
"leftPos" : 590,
"logicNodeType" : "END",
"name" : "结束",
"topPos" : 260
} ],
"getPSDELogicParams" : [ {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"getParamPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
},
"default" : true,
"entityParam" : true
} ],
"getStartPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
},
"enableBackend" : false,
"enableFront" : true
}, { }, {
"codeName" : "xxxA", "codeName" : "xxxA",
"debugMode" : 1, "debugMode" : 1,
...@@ -3951,6 +4060,10 @@ ...@@ -3951,6 +4060,10 @@
"enableBackend" : true, "enableBackend" : true,
"enableFront" : false "enableFront" : false
} ], } ],
"getAllPSDEMSLogics" : [ {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEMSLOGICS/test11.json"
} ],
"getAllPSDEMethodDTOs" : [ { "getAllPSDEMethodDTOs" : [ {
"name" : "PhoneDTO", "name" : "PhoneDTO",
"getPSDEMethodDTOFields" : [ { "getPSDEMethodDTOFields" : [ {
...@@ -5052,6 +5165,12 @@ ...@@ -5052,6 +5165,12 @@
"name" : "视图消息卡片导航视图", "name" : "视图消息卡片导航视图",
"realModelSubType" : "DEDATAVIEWEXPVIEW", "realModelSubType" : "DEDATAVIEWEXPVIEW",
"realModelType" : "PSDEVIEWBASE" "realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr05194830EditView",
"logicName" : "测试contains",
"name" : "测试contains",
"realModelSubType" : "DEEDITVIEW",
"realModelType" : "PSDEVIEWBASE"
}, { }, {
"codeName" : "Usr04106184OptionView", "codeName" : "Usr04106184OptionView",
"logicName" : "视图消息选项操作视图", "logicName" : "视图消息选项操作视图",
...@@ -5119,6 +5238,13 @@ ...@@ -5119,6 +5238,13 @@
"name" : "ai测试编辑视图_表单", "name" : "ai测试编辑视图_表单",
"realModelSubType" : "EDITFORM", "realModelSubType" : "EDITFORM",
"realModelType" : "PSDEFORM" "realModelType" : "PSDEFORM"
}, {
"codeName" : "Usr05194830EditView_Form",
"logicName" : "测试contains_表单",
"modelTag2" : "0",
"name" : "测试contains_表单",
"realModelSubType" : "EDITFORM",
"realModelType" : "PSDEFORM"
}, { }, {
"codeName" : "TestEditView_Form", "codeName" : "TestEditView_Form",
"logicName" : "测试模型_表单", "logicName" : "测试模型_表单",
......
{
"actionHolder" : 2,
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json",
"logicName" : "测试包含操作",
"name" : "testcontains",
"getPSDEActionInput" : {
"name" : "TestcontainsInput",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSDEActionReturn" : {
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDELogic" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/testcontains.json"
},
"enableBackend" : false
}
\ No newline at end of file
{
"codeName" : "testcontains",
"defaultParamName" : "Default",
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/testcontains.json",
"logicName" : "测试包含操作",
"name" : "测试包含操作",
"getPSDELogicNodes" : [ {
"codeName" : "Begin",
"leftPos" : 200,
"logicNodeType" : "BEGIN",
"name" : "开始",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
},
"name" : "连接名称",
"getPSDELogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"name" : "连接条件组",
"getPSDELogicLinkConds" : [ {
"condOP" : "CONTAINS",
"dstFieldName" : "MONEY",
"getDstLogicParam" : {
"modelref" : true,
"id" : "Default"
},
"logicType" : "SINGLE",
"name" : "Default[MONEY] 包含属性(Contains)",
"getSrcLogicParam" : {
"modelref" : true,
"id" : "Default"
}
} ]
},
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "PREPAREPARAM1",
"leftPos" : 360,
"logicNodeType" : "PREPAREPARAM",
"name" : "准备参数",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "END1"
},
"name" : "连接名称",
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
}
} ],
"topPos" : 240
}, {
"codeName" : "END1",
"leftPos" : 590,
"logicNodeType" : "END",
"name" : "结束",
"topPos" : 260
} ],
"getPSDELogicParams" : [ {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"getParamPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
},
"default" : true,
"entityParam" : true
} ],
"getStartPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
},
"enableBackend" : false,
"enableFront" : true
}
\ No newline at end of file
{
"codeName" : "test11",
"dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEMSLOGICS/test11.json",
"logicName" : "test11",
"name" : "test11"
}
\ No newline at end of file
...@@ -271,6 +271,35 @@ ...@@ -271,6 +271,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
...@@ -1950,6 +1979,93 @@ ...@@ -1950,6 +1979,93 @@
}, },
"enableBackend" : false, "enableBackend" : false,
"enableFront" : true "enableFront" : true
}, {
"codeName" : "testcontains",
"defaultParamName" : "Default",
"logicName" : "测试包含操作",
"name" : "测试包含操作",
"getPSDELogicNodes" : [ {
"codeName" : "Begin",
"leftPos" : 200,
"logicNodeType" : "BEGIN",
"name" : "开始",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
},
"name" : "连接名称",
"getPSDELogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"name" : "连接条件组",
"getPSDELogicLinkConds" : [ {
"condOP" : "CONTAINS",
"dstFieldName" : "MONEY",
"getDstLogicParam" : {
"modelref" : true,
"id" : "Default"
},
"logicType" : "SINGLE",
"name" : "Default[MONEY] 包含属性(Contains)",
"getSrcLogicParam" : {
"modelref" : true,
"id" : "Default"
}
} ]
},
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "PREPAREPARAM1",
"leftPos" : 360,
"logicNodeType" : "PREPAREPARAM",
"name" : "准备参数",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "END1"
},
"name" : "连接名称",
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
}
} ],
"topPos" : 240
}, {
"codeName" : "END1",
"leftPos" : 590,
"logicNodeType" : "END",
"name" : "结束",
"topPos" : 260
} ],
"getPSDELogicParams" : [ {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"getParamPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/Phone.json"
},
"getParamPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
},
"default" : true,
"entityParam" : true
} ],
"getStartPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
},
"enableBackend" : false,
"enableFront" : true
} ], } ],
"getAllPSAppDEMethodDTOs" : [ { "getAllPSAppDEMethodDTOs" : [ {
"codeName" : "PhoneDTO", "codeName" : "PhoneDTO",
...@@ -2636,6 +2752,35 @@ ...@@ -2636,6 +2752,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
......
...@@ -25766,6 +25766,35 @@ ...@@ -25766,6 +25766,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
...@@ -27445,6 +27474,93 @@ ...@@ -27445,6 +27474,93 @@
}, },
"enableBackend" : false, "enableBackend" : false,
"enableFront" : true "enableFront" : true
}, {
"codeName" : "testcontains",
"defaultParamName" : "Default",
"logicName" : "测试包含操作",
"name" : "测试包含操作",
"getPSDELogicNodes" : [ {
"codeName" : "Begin",
"leftPos" : 200,
"logicNodeType" : "BEGIN",
"name" : "开始",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
},
"name" : "连接名称",
"getPSDELogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"name" : "连接条件组",
"getPSDELogicLinkConds" : [ {
"condOP" : "CONTAINS",
"dstFieldName" : "MONEY",
"getDstLogicParam" : {
"modelref" : true,
"id" : "Default"
},
"logicType" : "SINGLE",
"name" : "Default[MONEY] 包含属性(Contains)",
"getSrcLogicParam" : {
"modelref" : true,
"id" : "Default"
}
} ]
},
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "PREPAREPARAM1",
"leftPos" : 360,
"logicNodeType" : "PREPAREPARAM",
"name" : "准备参数",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "END1"
},
"name" : "连接名称",
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
}
} ],
"topPos" : 240
}, {
"codeName" : "END1",
"leftPos" : 590,
"logicNodeType" : "END",
"name" : "结束",
"topPos" : 260
} ],
"getPSDELogicParams" : [ {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"getParamPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/Phone.json"
},
"getParamPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
},
"default" : true,
"entityParam" : true
} ],
"getStartPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
},
"enableBackend" : false,
"enableFront" : true
} ], } ],
"getAllPSAppDEMethodDTOs" : [ { "getAllPSAppDEMethodDTOs" : [ {
"codeName" : "PhoneDTO", "codeName" : "PhoneDTO",
...@@ -28131,6 +28247,35 @@ ...@@ -28131,6 +28247,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
...@@ -271,6 +271,35 @@ ...@@ -271,6 +271,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
...@@ -1950,6 +1979,93 @@ ...@@ -1950,6 +1979,93 @@
}, },
"enableBackend" : false, "enableBackend" : false,
"enableFront" : true "enableFront" : true
}, {
"codeName" : "testcontains",
"defaultParamName" : "Default",
"logicName" : "测试包含操作",
"name" : "测试包含操作",
"getPSDELogicNodes" : [ {
"codeName" : "Begin",
"leftPos" : 200,
"logicNodeType" : "BEGIN",
"name" : "开始",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
},
"name" : "连接名称",
"getPSDELogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"name" : "连接条件组",
"getPSDELogicLinkConds" : [ {
"condOP" : "CONTAINS",
"dstFieldName" : "MONEY",
"getDstLogicParam" : {
"modelref" : true,
"id" : "Default"
},
"logicType" : "SINGLE",
"name" : "Default[MONEY] 包含属性(Contains)",
"getSrcLogicParam" : {
"modelref" : true,
"id" : "Default"
}
} ]
},
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "PREPAREPARAM1",
"leftPos" : 360,
"logicNodeType" : "PREPAREPARAM",
"name" : "准备参数",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "END1"
},
"name" : "连接名称",
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
}
} ],
"topPos" : 240
}, {
"codeName" : "END1",
"leftPos" : 590,
"logicNodeType" : "END",
"name" : "结束",
"topPos" : 260
} ],
"getPSDELogicParams" : [ {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"getParamPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json"
},
"getParamPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
},
"default" : true,
"entityParam" : true
} ],
"getStartPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
},
"enableBackend" : false,
"enableFront" : true
} ], } ],
"getAllPSAppDEMethodDTOs" : [ { "getAllPSAppDEMethodDTOs" : [ {
"codeName" : "PhoneDTO", "codeName" : "PhoneDTO",
...@@ -2636,6 +2752,35 @@ ...@@ -2636,6 +2752,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
......
...@@ -6309,6 +6309,35 @@ ...@@ -6309,6 +6309,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
...@@ -7988,6 +8017,93 @@ ...@@ -7988,6 +8017,93 @@
}, },
"enableBackend" : false, "enableBackend" : false,
"enableFront" : true "enableFront" : true
}, {
"codeName" : "testcontains",
"defaultParamName" : "Default",
"logicName" : "测试包含操作",
"name" : "测试包含操作",
"getPSDELogicNodes" : [ {
"codeName" : "Begin",
"leftPos" : 200,
"logicNodeType" : "BEGIN",
"name" : "开始",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
},
"name" : "连接名称",
"getPSDELogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"name" : "连接条件组",
"getPSDELogicLinkConds" : [ {
"condOP" : "CONTAINS",
"dstFieldName" : "MONEY",
"getDstLogicParam" : {
"modelref" : true,
"id" : "Default"
},
"logicType" : "SINGLE",
"name" : "Default[MONEY] 包含属性(Contains)",
"getSrcLogicParam" : {
"modelref" : true,
"id" : "Default"
}
} ]
},
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "PREPAREPARAM1",
"leftPos" : 360,
"logicNodeType" : "PREPAREPARAM",
"name" : "准备参数",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "END1"
},
"name" : "连接名称",
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
}
} ],
"topPos" : 240
}, {
"codeName" : "END1",
"leftPos" : 590,
"logicNodeType" : "END",
"name" : "结束",
"topPos" : 260
} ],
"getPSDELogicParams" : [ {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"getParamPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json"
},
"getParamPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
},
"default" : true,
"entityParam" : true
} ],
"getStartPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
},
"enableBackend" : false,
"enableFront" : true
} ], } ],
"getAllPSAppDEMethodDTOs" : [ { "getAllPSAppDEMethodDTOs" : [ {
"codeName" : "PhoneDTO", "codeName" : "PhoneDTO",
...@@ -8674,6 +8790,35 @@ ...@@ -8674,6 +8790,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
......
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
"attrValue" : "'YYYY-MM'", "attrValue" : "'YYYY-MM'",
"name" : "logic_valueformat_valueformat" "name" : "logic_valueformat_valueformat"
} ], } ],
"valueFormat" : "YYYY-MM-DD", "valueFormat" : "YYYY-MM",
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableRowEdit" : true, "enableRowEdit" : true,
...@@ -696,7 +696,7 @@ ...@@ -696,7 +696,7 @@
"codeName" : "Field4" "codeName" : "Field4"
} }
}, { }, {
"format" : "YYYY-MM-DD", "format" : "YYYY-MM",
"dataType" : 5, "dataType" : 5,
"name" : "date", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
...@@ -1094,11 +1094,11 @@ ...@@ -1094,11 +1094,11 @@
"codeName" : "Date" "codeName" : "Date"
}, },
"getPSEditor" : { "getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD", "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
"editorParams" : { "editorParams" : {
"TIMEFMT" : "YYYY-MM-DD" "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
}, },
"editorType" : "DATEPICKEREX_NOTIME", "editorType" : "DATEPICKER",
"name" : "date" "name" : "date"
}, },
"allowEmpty" : true "allowEmpty" : true
......
...@@ -325,6 +325,35 @@ ...@@ -325,6 +325,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
...@@ -2004,6 +2033,93 @@ ...@@ -2004,6 +2033,93 @@
}, },
"enableBackend" : false, "enableBackend" : false,
"enableFront" : true "enableFront" : true
}, {
"codeName" : "testcontains",
"defaultParamName" : "Default",
"logicName" : "测试包含操作",
"name" : "测试包含操作",
"getPSDELogicNodes" : [ {
"codeName" : "Begin",
"leftPos" : 200,
"logicNodeType" : "BEGIN",
"name" : "开始",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
},
"name" : "连接名称",
"getPSDELogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"name" : "连接条件组",
"getPSDELogicLinkConds" : [ {
"condOP" : "CONTAINS",
"dstFieldName" : "MONEY",
"getDstLogicParam" : {
"modelref" : true,
"id" : "Default"
},
"logicType" : "SINGLE",
"name" : "Default[MONEY] 包含属性(Contains)",
"getSrcLogicParam" : {
"modelref" : true,
"id" : "Default"
}
} ]
},
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "PREPAREPARAM1",
"leftPos" : 360,
"logicNodeType" : "PREPAREPARAM",
"name" : "准备参数",
"getPSDELogicLinks" : [ {
"getDstPSDELogicNode" : {
"modelref" : true,
"id" : "END1"
},
"name" : "连接名称",
"getSrcPSDELogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
}
} ],
"topPos" : 240
}, {
"codeName" : "END1",
"leftPos" : 590,
"logicNodeType" : "END",
"name" : "结束",
"topPos" : 260
} ],
"getPSDELogicParams" : [ {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"getParamPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
},
"getParamPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
},
"default" : true,
"entityParam" : true
} ],
"getStartPSDELogicNode" : {
"modelref" : true,
"id" : "Begin"
},
"enableBackend" : false,
"enableFront" : true
} ], } ],
"getAllPSAppDEMethodDTOs" : [ { "getAllPSAppDEMethodDTOs" : [ {
"codeName" : "PhoneDTO", "codeName" : "PhoneDTO",
...@@ -2690,6 +2806,35 @@ ...@@ -2690,6 +2806,35 @@
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json" "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Test.json"
}, },
"builtinMethod" : false "builtinMethod" : false
}, {
"actionMode" : "CUSTOM",
"actionType" : "DELOGIC",
"codeName" : "Testcontains",
"methodType" : "DEACTION",
"name" : "testcontains",
"getPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getPSAppDEMethodInput" : {
"codeName" : "TestcontainsInput",
"name" : "TestcontainsInput",
"getPSAppDEMethodDTO" : {
"modelref" : true,
"id" : "PhoneDTO"
},
"type" : "DTO"
},
"getPSAppDEMethodReturn" : {
"codeName" : "TestcontainsResult",
"name" : "TestcontainsResult",
"type" : "VOID"
},
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Testcontains.json"
},
"builtinMethod" : false
}, { }, {
"actionMode" : "UPDATE", "actionMode" : "UPDATE",
"codeName" : "Update", "codeName" : "Update",
...@@ -3371,6 +3516,93 @@ ...@@ -3371,6 +3516,93 @@
"globalUIAction" : true, "globalUIAction" : true,
"id" : "test1@Phone" "id" : "test1@Phone"
} ], } ],
"getAllPSAppDEUILogics" : [ {
"codeName" : "test3",
"defaultParamName" : "Default",
"logicName" : "test3",
"name" : "test3",
"getPSDEUILogicNodes" : [ {
"codeName" : "Begin",
"leftPos" : 200,
"logicNodeType" : "BEGIN",
"name" : "开始",
"getPSDEUILogicLinks" : [ {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "DELOGIC1"
},
"linkMode" : 0,
"name" : "连接名称",
"getPSDEUILogicLinkGroupCond" : {
"groupOP" : "AND",
"logicType" : "GROUP",
"getPSDEUILogicLinkConds" : [ {
"condOP" : "CONTAINS",
"dstFieldName" : "lowprice",
"getDstLogicParam" : {
"modelref" : true,
"id" : "Default"
},
"logicType" : "SINGLE",
"name" : "Default[lowprice] 包含属性(Contains)"
} ]
},
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "DELOGIC1",
"getDstPSAppDELogic" : {
"modelref" : true,
"id" : "testcontains"
},
"getDstPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
},
"getDstPSDEUILogicParam" : {
"modelref" : true,
"id" : "Default"
},
"leftPos" : 357,
"logicNodeType" : "DELOGIC",
"name" : "实体处理逻辑",
"getPSDEUILogicLinks" : [ {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "END1"
},
"linkMode" : 0,
"name" : "连接名称",
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "DELOGIC1"
}
} ],
"topPos" : 216
}, {
"codeName" : "END1",
"leftPos" : 603,
"logicNodeType" : "END",
"name" : "结束",
"topPos" : 208
} ],
"getPSDEUILogicParams" : [ {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"default" : true,
"entityParam" : true
} ],
"getStartPSDEUILogicNode" : {
"modelref" : true,
"id" : "Begin"
}
} ],
"getAllPSAppPortletCats" : [ { "getAllPSAppPortletCats" : [ {
"codeName" : "list", "codeName" : "list",
"name" : "列表", "name" : "列表",
...@@ -3420,6 +3652,10 @@ ...@@ -3420,6 +3652,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0301269576GridView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0301269576GridView.json",
"viewType" : "DEGRIDVIEW" "viewType" : "DEGRIDVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr05194830EditView.json",
"viewType" : "DEEDITVIEW"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr04107034PickupView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr04107034PickupView.json",
......
...@@ -1368,7 +1368,7 @@ ...@@ -1368,7 +1368,7 @@
"attrValue" : "'YYYY-MM'", "attrValue" : "'YYYY-MM'",
"name" : "logic_valueformat_valueformat" "name" : "logic_valueformat_valueformat"
} ], } ],
"valueFormat" : "YYYY-MM-DD", "valueFormat" : "YYYY-MM",
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableRowEdit" : true, "enableRowEdit" : true,
...@@ -1747,7 +1747,7 @@ ...@@ -1747,7 +1747,7 @@
"codeName" : "Field4" "codeName" : "Field4"
} }
}, { }, {
"format" : "YYYY-MM-DD", "format" : "YYYY-MM",
"dataType" : 5, "dataType" : 5,
"name" : "date", "name" : "date",
"getPSAppDEField" : { "getPSAppDEField" : {
...@@ -2145,11 +2145,11 @@ ...@@ -2145,11 +2145,11 @@
"codeName" : "Date" "codeName" : "Date"
}, },
"getPSEditor" : { "getPSEditor" : {
"dateTimeFormat" : "YYYY-MM-DD", "dateTimeFormat" : "YYYY-MM-DD HH:mm:ss",
"editorParams" : { "editorParams" : {
"TIMEFMT" : "YYYY-MM-DD" "TIMEFMT" : "YYYY-MM-DD HH:mm:ss"
}, },
"editorType" : "DATEPICKEREX_NOTIME", "editorType" : "DATEPICKER",
"name" : "date" "name" : "date"
}, },
"allowEmpty" : true "allowEmpty" : true
......
...@@ -53,6 +53,21 @@ ...@@ -53,6 +53,21 @@
"engineType" : "EditView", "engineType" : "EditView",
"name" : "engine" "name" : "engine"
} ], } ],
"getPSAppViewLogics" : [ {
"eventNames" : "onLoadDraftSuccess",
"logicTrigger" : "CTRLEVENT",
"logicType" : "APPDEUILOGIC",
"name" : "TEST",
"getPSAppDEUILogic" : {
"modelref" : true,
"id" : "test3"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json"
},
"getPSViewCtrlName" : "form"
} ],
"getPSControls" : [ { "getPSControls" : [ {
"codeName" : "TestEditViewtoolbar", "codeName" : "TestEditViewtoolbar",
"controlType" : "TOOLBAR", "controlType" : "TOOLBAR",
......
...@@ -570,6 +570,25 @@ ...@@ -570,6 +570,25 @@
"cssClass" : "fa-solid fa-frog" "cssClass" : "fa-solid fa-frog"
}, },
"tooltip" : "流式布局分页导航1" "tooltip" : "流式布局分页导航1"
}, {
"accUserMode" : 2,
"caption" : "测试contains",
"itemType" : "MENUITEM",
"name" : "menuitem403",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0519569902"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "测试contains"
}, { }, {
"accUserMode" : 2, "accUserMode" : 2,
"caption" : "测试模型", "caption" : "测试模型",
......
...@@ -16,6 +16,16 @@ ...@@ -16,6 +16,16 @@
"cssClass" : "fa-solid fa-frog" "cssClass" : "fa-solid fa-frog"
}, },
"tooltip" : "流式布局分页导航1" "tooltip" : "流式布局分页导航1"
}, {
"accUserMode" : 2,
"caption" : "测试contains",
"itemType" : "MENUITEM",
"name" : "menuitem403",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0519569902"
},
"tooltip" : "测试contains"
}, { }, {
"accUserMode" : 2, "accUserMode" : 2,
"caption" : "测试模型", "caption" : "测试模型",
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册