修正表单字段在没有对应propMeta时的editMode设置

entropy-cloud · Sep 3, 2023 · 193cbeb · 193cbeb
1 parent fb880ca
commit 193cbeb
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/...src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/reflect-config.json b/...src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/reflect-config.json
@@ -36880,6 +36880,10 @@
         "name": "getBeforeExecute",
         "parameterTypes": []
       },
+      {
+        "name": "getDecisionMatrix",
+        "parameterTypes": []
+      },
       {
         "name": "getDecisionMatrxi",
         "parameterTypes": []

diff --git a/nop-rule/nop-rule-dao/src/main/java/io/nop/rule/dao/entity/NopRuleDefinition.java b/nop-rule/nop-rule-dao/src/main/java/io/nop/rule/dao/entity/NopRuleDefinition.java
@@ -54,7 +54,7 @@ public void setBeforeExecute(String value) {
         getModelTextXmlComponent().setChildBodyXml(RULE_TAG_NAME, BEFORE_EXECUTE_NAME, value);
     }
 
-    public String getDecisionMatrxi() {
+    public String getDecisionMatrix() {
         return getModelTextXmlComponent().getChildBodyXml(DECISION_MATRIX_NAME);
     }
 

diff --git a/...e-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/NopRuleDefinition.view.xml b/...e-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/NopRuleDefinition.view.xml
@@ -8,7 +8,7 @@
     </grids>
 
     <forms>
-        <form id="template" x:abstract="true">
+        <form id="template" x:abstract="true" layoutControl="tabs" size="xl" labelWidth="130px">
             <cells>
                 <cell id="ruleInputs">
                     <selection>
@@ -24,7 +24,7 @@
             </cells>
         </form>
 
-        <form id="edit" layoutControl="tabs" size="xl" x:prototype="template">
+        <form id="edit" x:prototype="template">
             <layout>
                 ==baseInfo[基本信息]====
                 __useImportFile importFile
@@ -54,10 +54,10 @@
                 <!-- custom=true表示此字段不需要在meta中定义
                   两个下划线作为前缀表示此字段仅在前端使用，不会提交到后台
                 -->
-                <cell id="__useImportFile" custom="true" stdDomain="boolean">
+                <cell id="__useImportFile" label="导入模型文件" custom="true" stdDomain="boolean">
                 </cell>
 
-                <cell id="importFile" stdDomain="file">
+                <cell id="importFile" stdDomain="file" editMode="edit">
                     <visibleOn>${__useImportFile}</visibleOn>
                 </cell>
 
@@ -69,6 +69,11 @@
                     <visibleOn>${!__useImportFile}</visibleOn>
                 </cell>
 
+                <cell id="extConfig">
+                    <visibleOn>${!__useImportFile}</visibleOn>
+                </cell>
+
+
                 <cell id="matrixConfig">
                     <visibleOn>${ruleType == 'MATX'}</visibleOn>
                 </cell>

diff --git a/nop-web/src/main/resources/_vfs/nop/web/xlib/web.xlib b/nop-web/src/main/resources/_vfs/nop/web/xlib/web.xlib
@@ -337,8 +337,8 @@
                     let cellModel = formModel.getCell(formCell.id);
                     let propMeta = objMeta?.getProp(cellModel?.prop || formCell.id);
                     let rd = formCell.readonly || cellModel?.readonly
-                                 || (formModel.editMode == 'update' && !propMeta?.updatable)
-                                 || (formModel.editMode == 'add' && !propMeta?.insertable);
+                                 || ((formModel.editMode == 'update' or formModel.editMode == 'edit') && propMeta && !propMeta?.updatable)
+                                 || (formModel.editMode == 'add' && propMeta && !propMeta?.insertable);
 
                     // 在编辑关联表时会明确指定字段的值固定，此时自动输出hidden字段
                     if(!rd and fixedProps?.contains(formCell.id)){
@@ -362,7 +362,7 @@
                     let hint = cellModel?.hint
 
                     let cell = {
-                        name: (mode?.startsWith('query') and !formCell.id.startsWith('v_')?
+                        name: (mode.startsWith('query') and !formCell.id.startsWith('v_')?
                                     'filter_' + formCell.id + (filterOp ? '__'+filterOp:'')
                                     : formCell.id),
                         // 不显示label的时候，以label为placeholder

diff --git a/nop-xlang/src/test/resources/io/nop/xlang/expr/exprs/bool-op.test.md b/nop-xlang/src/test/resources/io/nop/xlang/expr/exprs/bool-op.test.md
@@ -41,4 +41,11 @@ $.checkEquals(true, !x && !!!x);
 let x = null;
 $.checkEquals('a', x ?? 'a');
 $.checkEquals(true, x ?? !x);
+````
+
+## 5. 空值取反
+
+````expr
+let propMeta = null;
+$.checkState(!propMeta?.insertable)
 ````