修正GraphQL的返回类型设置, 没有设置type时根据stdDomain猜测

entropy-cloud · Aug 9, 2024 · 1036c08 · 1036c08
1 parent d007d15
commit 1036c08
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 12 deletions.
diff --git a/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt b/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt
@@ -617,6 +617,7 @@
 /nop/report/xlib/xpt-rt.xlib
 /nop/report/xlib/xpt.xlib
 /nop/rpc/imp/api.imp.xml
+/nop/rpc/imp/api.imp.xml.rej
 /nop/rpc/imp/template.api.xlsx
 /nop/rule/_module
 /nop/rule/auth/_nop-rule-api.action-auth.xml
@@ -1049,6 +1050,7 @@
 /nop/web/xlib/view-gen.xlib
 /nop/web/xlib/view-gen/impl_GenFromMeta.xpl
 /nop/web/xlib/web.xlib
+/nop/web/xlib/web.xlib.rej
 /nop/web/xlib/web/grid_crud.xpl
 /nop/web/xlib/web/impl_GenForm.xpl
 /nop/web/xlib/web/impl_GenGrid.xpl

diff --git a/...raphql-core/src/main/java/io/nop/graphql/core/schema/meta/ObjMetaToGraphQLDefinition.java b/...raphql-core/src/main/java/io/nop/graphql/core/schema/meta/ObjMetaToGraphQLDefinition.java
@@ -30,6 +30,7 @@
 import io.nop.graphql.core.schema.TypeRegistry;
 import io.nop.graphql.core.utils.GraphQLObjMetaHelper;
 import io.nop.graphql.core.utils.GraphQLTypeHelper;
+import io.nop.xlang.xdef.domain.StdDomainRegistry;
 import io.nop.xlang.xmeta.IObjMeta;
 import io.nop.xlang.xmeta.IObjPropMeta;
 import io.nop.xlang.xmeta.ISchema;
@@ -195,12 +196,15 @@ public GraphQLType toGraphQLType(String thisObjName, ISchema schema, boolean man
                 if (bizObjName != null)
                     return GraphQLTypeHelper.namedType(bizObjName);
 
-                StdDataType stdDataType = schema.getStdDataType();
-                if (stdDataType != null)
-                    gqlType = GraphQLTypeHelper.scalarType(GraphQLScalarType.fromStdDataType(stdDataType));
-                if (gqlType == null)
-                    gqlType = GraphQLTypeHelper.scalarType(GraphQLScalarType.String);
-                return gqlType;
+                type = guessType(schema);
+                if (type == null) {
+                    StdDataType stdDataType = schema.getStdDataType();
+                    if (stdDataType != null)
+                        gqlType = GraphQLTypeHelper.scalarType(GraphQLScalarType.fromStdDataType(stdDataType));
+                    if (gqlType == null)
+                        gqlType = GraphQLTypeHelper.scalarType(GraphQLScalarType.String);
+                    return gqlType;
+                }
             }
             gqlType = ReflectionGraphQLTypeFactory.INSTANCE.buildGraphQLType(type, thisObjName, bizObjName,
                     typeRegistry, input);
@@ -213,6 +217,13 @@ public GraphQLType toGraphQLType(String thisObjName, ISchema schema, boolean man
         return gqlType;
     }
 
+    IGenericType guessType(ISchema schema) {
+        String stdDomain = schema.getStdDomain();
+        if (stdDomain == null)
+            return null;
+        return StdDomainRegistry.instance().getStdDomainHandler(stdDomain).getGenericType(false, null);
+    }
+
     private GraphQLType buildObjType(String thisObjName, ISchema schema, TypeRegistry registry, boolean input) {
         GraphQLObjectDefinition def = new GraphQLObjectDefinition();
         def.setLocation(schema.getLocation());

diff --git a/...nop-graphql-core/src/main/java/io/nop/graphql/core/schema/utils/GraphQLSourcePrinter.java b/...nop-graphql-core/src/main/java/io/nop/graphql/core/schema/utils/GraphQLSourcePrinter.java
@@ -341,7 +341,11 @@ private void printArgDefs(List<GraphQLArgumentDefinition> args) {
     public void visitGraphQLArgumentDefinition(GraphQLArgumentDefinition node) {
         out.append(node.getName());
         out.append(':');
-        visit(node.getType());
+        if(node.getType() == null){
+            out.append("Any");
+        }else {
+            visit(node.getType());
+        }
         if (node.getDefaultValue() != null) {
             out.append(" = ");
             visit(node.getDefaultValue());

diff --git a/...ule-meta/src/main/resources/_vfs/nop/rule/model/NopRuleDefinition/NopRuleDefinition.xmeta b/...ule-meta/src/main/resources/_vfs/nop/rule/model/NopRuleDefinition/NopRuleDefinition.xmeta
@@ -16,7 +16,7 @@
         </prop>
 
         <prop name="beforeExecute" displayName="初始化代码" ui:show="L" insertable="true" updatable="true">
-            <schema stdDomain="xpl"/>
+            <schema stdDomain="xpl" type="String"/>
         </prop>
 
         <prop name="importFile" displayName="Excel规则文件" published="false" updatable="false" insertable="false"
@@ -31,7 +31,7 @@
         </prop>
 
         <prop name="decisionMatrix" displayName="决策矩阵配置" ui:show="L" insertable="true" updatable="true">
-            <schema stdDomain="xml"/>
+            <schema stdDomain="xml" type="String"/>
         </prop>
     </props>
 </meta>
diff --git a/...rule/nop-rule-meta/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xmeta b/...rule/nop-rule-meta/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xmeta
@@ -23,7 +23,7 @@
         </prop>
 
         <prop name="defaultExpr" displayName="缺省值" insertable="true" updatable="true">
-            <schema stdDomain="xpl"/>
+            <schema stdDomain="xpl" type="String"/>
         </prop>
 
         <prop name="description" displayName="描述" insertable="true" updatable="true">

diff --git a/...e-meta/src/main/resources/_vfs/nop/rule/model/NopRuleOutputValue/NopRuleOutputValue.xmeta b/...e-meta/src/main/resources/_vfs/nop/rule/model/NopRuleOutputValue/NopRuleOutputValue.xmeta
@@ -7,7 +7,7 @@
         </prop>
 
         <prop name="valueExpr" displayName="变量表达式" mandatory="true">
-            <schema stdDomain="xpl"/>
+            <schema stdDomain="xpl" type="String"/>
         </prop>
     </props>
 </meta>
diff --git a/...e-service/src/main/resources/_vfs/nop/rule/model/NopRuleDefinition/NopRuleDefinition.xbiz b/...e-service/src/main/resources/_vfs/nop/rule/model/NopRuleDefinition/NopRuleDefinition.xbiz
@@ -3,7 +3,7 @@
 
     <actions>
         <query name="getOutputFieldsEditSchema">
-           <arg name="ruleId" mandatory="true" />
+           <arg name="ruleId" mandatory="true" type="String" />
            <arg name="selection" kind="FieldSelection"/>
            <arg name="svcCtx" kind="ServiceContext" />