Merge remote-tracking branch 'origin/develop-raojiaguan' into develop

# Conflicts:
#	develop/@gms/gms-plugin-billexpand/src/emcon.js
#	develop/@gms/gms-plugin-billexpand/src/mcon.js

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -4305,6 +4305,7 @@ export default {
 			"discard": false,
 			"path": "通用",
 			"extends": {
+
 					"info": {
 							"param": [
 							],
@@ -4318,6 +4319,22 @@ export default {
 			"title": "后端公式：取当前登录人对应的职员基础数据对象的某个字段",
 			"value": "GetUserStaffInfo"
 	},
+	{
+			"discard": false,
+			"path": "通用",
+			"extends": {
+				"info": {
+					"param": [],
+					"name": "SubTableSetBaseData",
+					"description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)",
+					"title": "根据多个条件去过滤基础数据",
+					"return": 0
+				}
+			},
+			"description": "例如MdFilterInfiniteValue(1.在该基础数据中他的扩展字段名:bm,2.上一个参数取到字段名后具体的值是多少如果你要从单据上取那就是xxx.code等等,以此类推两个参数为一组无限制的or方式过滤)",
+			"title": "根据多个条件去过滤基础数据",
+			"value": "MdFilterInfiniteValue"
+		},
 	],
 	dropdownOptionList: [
 		{

develop/@gms/gms-plugin-billexpand/src/formula/MdFilterInfiniteValue.js

+// 通过基础数据指定字段的值过滤基础数据无限参数版---后台公式
+export default {
+    execute:function(){
+        console.log("通过基础数据指定字段的值过滤基础数据无限参数版");
+    },
+    getResultType:function(){
+        return FMR.ConstDataTypes.General;
+    }
+}
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/mcon.js

@@ -181,6 +181,7 @@ import AmountComp from "./formula/AmountComp";
 import EqualsMasterAndSubField from "./formula/EqualsMasterAndSubField";
 import SubTableHasContainField from "./formula/SubTableHasContainField";
 import GetUserStaffInfo from "./formula/GetUserStaffInfo";
+import MdFilterInfiniteValue from "./formula/MdFilterInfiniteValue";
 export default {
     actions: {
         updateFieldAction,
@@ -270,6 +271,7 @@ export default {
         integerControl
     },
     formula: {
+        MdFilterInfiniteValue,
         SubTableSetBaseData,
         LoginUserIsContianRole,
         SubTableJointString,