将表单的字段code翻译为界面元素能够识别的格式

huigou-form/pom.xml

@@ -8,7 +8,9 @@
     <artifactId>huigou-form</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
-    <properties></properties>
+    <properties>
+        <huigou.version>1.2.11-SNAPSHOT</huigou.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -20,7 +22,7 @@
         <dependency>
             <groupId>com.huigou</groupId>
             <artifactId>huigou-uasp</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>${huigou.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

huigou-uasp/pom.xml

@@ -27,12 +27,10 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
         </dependency>
-        <!--
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
-         -->
         <!-- JSON -->
         <dependency>
             <groupId>net.sf.json-lib</groupId>
@@ -359,10 +357,6 @@
             <artifactId>lombok</artifactId>
             <version>1.18.12</version>
         </dependency>
-        <dependency>
-            <groupId>com.huigou</groupId>
-            <artifactId>huigou-form</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

huigou-uasp/src/main/java/com/huigou/uasp/bmp/intercept/ExecuteContextInterceptor.java

@@ -3,11 +3,10 @@ package com.huigou.uasp.bmp.intercept;
 import com.huigou.context.ContextUtil;
 import com.huigou.context.Operator;
 import com.huigou.context.ThreadLocalUtil;
+import com.huigou.data.repository.GeneralRepository;
 import com.huigou.exception.ApplicationException;
 import com.huigou.uasp.bmp.operator.OperatorUIElementPermissionBuilder;
 import com.huigou.uasp.bpm.event.ProcessEventContext;
-import com.huigou.uasp.form.domain.model.FormAttribute;
-import com.huigou.uasp.form.repository.FormAttributeRepository;
 import com.huigou.uasp.log.application.LogApplication;
 import com.huigou.uasp.log.aspect.BizLogBuilder;
 import com.huigou.uasp.log.domain.model.BizLog;
@@ -17,6 +16,7 @@ import com.huigou.util.Constants;
 import com.huigou.util.SpringBeanFactory;
 import com.huigou.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -37,7 +37,7 @@ public class ExecuteContextInterceptor extends HandlerInterceptorAdapter {
     @Autowired
     private LogApplication logApplication;
     @Autowired
-    private FormAttributeRepository formAttributeRepository;
+    private GeneralRepository generalRepository;
 
     private OperatorUIElementPermissionBuilder operatorUIElementPermissionBuilder;
 
@@ -60,9 +60,19 @@ public class ExecuteContextInterceptor extends HandlerInterceptorAdapter {
                 // 如果界面元素的formFieldId不为空，则说明该界面元素是与表单字段进行的绑定，这时需要将界面元素的code替换为：field+表单字段排序
                 String formFieldId = (String) m.get("formFieldId");
                 if (StringUtils.isNotBlank(formFieldId)) {
-                    FormAttribute formField = formAttributeRepository.findOne(formFieldId);
+                    Object formField = generalRepository.getEntityManager().createQuery("select fa from FormAttribute fa where fa.id=?1")
+                            .setParameter(1, formFieldId)
+                            .getSingleResult();
                     if (formField != null) {
-                        m.put("code", String.format("field%d", formField.getSequence()));
+                        Object sequence;
+                        try {
+                            sequence = BeanUtils.getPropertyDescriptor(formField.getClass(), "sequence")
+                                    .getReadMethod()
+                                    .invoke(formField);
+                        } catch (Exception e) {
+                            throw new ApplicationException(e);
+                        }
+                        m.put("code", String.format("field%d", sequence));
                     }
                 }
                 code = ClassHelper.convert(m.get("code"), String.class);

huigou-uasp/src/main/java/com/huigou/uasp/bpm/engine/application/impl/WorkflowApplicationImpl.java

@@ -1792,7 +1792,6 @@ public class WorkflowApplicationImpl extends BaseApplication implements Workflow
         if (procUnitHandler != null && procUnitHandler.getCooperationModelId() == CooperationModelKind.ASSISTANT) {
             chiefHandlerId = procUnitHandler.getChiefId();
         }
-
         return this.procUnitHandlerApplication.queryUIElmentPermissions(chiefHandlerId);
     }
 

huigou-xt/pom.xml

@@ -482,6 +482,7 @@
                 <dependency>
                     <groupId>com.huigou</groupId>
                     <artifactId>huigou-form</artifactId>
+                    <version>1.0.0-SNAPSHOT</version>
                 </dependency>
                 <dependency>
                     <groupId>com.huigou</groupId>

huigou-xt/src/main/webapp/system/configtool/editor/js/Format.js

@@ -5042,9 +5042,9 @@ PropertyPanel.prototype.init = function () {
                             var html = ['<div class="hg-form-row">'];
                             html.push('<div class="col-xs-4 col-sm-4"><label class="hg-form-label">' + formParameter.attrName + '</label></div>');
                             html.push('<div class="col-xs-8 col-white-bg col-sm-8">')
-                            html.push('<input type="checkbox" name="' + formParameter.attrCode + ':" value="readwrite" id="' + formParameter.attrCode + '_readwrite"><label for="' + formParameter.parmCode + '_readwrite" style="margin:0 5px 0 5px">读写</label>');
-                            html.push('<input type="checkbox" name="' + formParameter.attrCode + ':" value="readonly" id="' + formParameter.attrCode + '_readonly"><label for="' + formParameter.parmCode + '_readonly" style="margin:0 5px 0 5px">只读</label>');
-                            html.push('<input type="checkbox" name="' + formParameter.attrCode + ':" value="noaccess" id="' + formParameter.attrCode + '_noaccess"><label for="' + formParameter.parmCode + '_noaccess" style="margin:0 5px 0 5px">无权限</label>');
+                            html.push('<input type="checkbox" name="' + formParameter.attrCode + '" value="readwrite" id="' + formParameter.attrCode + '_readwrite"><label for="' + formParameter.parmCode + '_readwrite" style="margin:0 5px 0 5px">读写</label>');
+                            html.push('<input type="checkbox" name="' + formParameter.attrCode + '" value="readonly" id="' + formParameter.attrCode + '_readonly"><label for="' + formParameter.parmCode + '_readonly" style="margin:0 5px 0 5px">只读</label>');
+                            html.push('<input type="checkbox" name="' + formParameter.attrCode + '" value="noaccess" id="' + formParameter.attrCode + '_noaccess"><label for="' + formParameter.parmCode + '_noaccess" style="margin:0 5px 0 5px">无权限</label>');
                             html.push('</div>')
                             html.push('</div>');
                             rows.append(html.join(''));

pom.xml

@@ -47,7 +47,7 @@
         <freemarker.version>2.3.23</freemarker.version>
         <ehcache-spring-annotations.version>1.2.0</ehcache-spring-annotations.version>
         <gson.version>2.8.0</gson.version>
-        <guava.version>17.0</guava.version>
+        <guava.version>22.0</guava.version>
         <httpcomponents.version>4.5</httpcomponents.version>
         <httpcore.version>4.4.6</httpcore.version>
         <oro.version>2.0.7</oro.version>
@@ -166,7 +166,6 @@
          <fastjson.version>1.2.59</fastjson.version>
         <jstyleparser.version>3.5</jstyleparser.version>
         <mxgraph.version>4.1.0</mxgraph.version>
-        <huigou-form.version>1.0.0-SNAPSHOT</huigou-form.version>
         <lombok.version>1.18.12</lombok.version>
     </properties>
 
@@ -1994,11 +1993,6 @@
                 <artifactId>mxgraph-all</artifactId>
                 <version>${mxgraph.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.huigou</groupId>
-                <artifactId>huigou-form</artifactId>
-                <version>${huigou-form.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>