ibiz4j 发布系统代码

app_web/package.json

@@ -26,7 +26,7 @@
     "element-ui": "^2.13.0",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
-    "ibiz-gantt-elastic": "^1.0.16",
+    "ibiz-gantt-elastic": "^1.0.17",
     "ibiz-vue-lib": "^0.1.10",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",

app_web/src/components/app-form-group/app-form-group.vue

@@ -28,21 +28,25 @@
                             <dropdown-menu slot='list' v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
                                 <dropdown-item v-for="(detail,index) in (uiActionGroup.details)" :key="index" :name="detail.name">
                                     <span class='item' @click="doUIAction($event, detail)">
-                                        <template v-if="detail.icon && !Object.is(detail.icon, '')">
-                                             <i :class="detail.icon" ></i>
-                                        </template>
-                                        <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
-                                            <div v-if="detail.img && !Object.is(detail.img, '')">
-                                                <img :src="detail.img" />
-                                            </div>
+                                        <template v-if="detail.isShowIcon">
+                                            <template v-if="detail.icon && !Object.is(detail.icon, '')">
+                                                <i :class="detail.icon" ></i>
+                                            </template>
+                                            <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
+                                                <div v-if="detail.img && !Object.is(detail.img, '')">
+                                                    <img :src="detail.img" />
+                                                </div>
+                                            </template>
                                         </template>
                                         &nbsp;
                                         <span>
-                                            <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
-                                                {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
-                                            </template>
-                                            <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
-                                                {{detail.caption}}
+                                            <template v-if="detail.isShowCaption">
+                                                <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
+                                                    {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
+                                                </template>
+                                                <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
+                                                    {{detail.caption}}
+                                                </template>
                                             </template>
                                         </span>
                                     </span>
@@ -55,21 +59,25 @@
                                 <template v-if="uiActionGroup.details && Array.isArray(uiActionGroup.details)">
                                     <div v-for="(detail,index) in uiActionGroup.details" :key="index">
                                         <span class='item' @click="doUIAction($event, detail)">
-                                        <template v-if="detail.icon && !Object.is(detail.icon, '')">
-                                             <i :class="detail.icon" ></i>
-                                        </template>
-                                        <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
-                                            <div v-if="detail.img && !Object.is(detail.img, '')">
-                                                <img :src="detail.img" />
-                                            </div>
-                                        </template>
+                                            <template v-if="detail.isShowIcon">
+                                                <template v-if="detail.icon && !Object.is(detail.icon, '')">
+                                                    <i :class="detail.icon" ></i>
+                                                </template>
+                                                <template v-if="!(detail.icon && !Object.is(detail.icon, ''))">
+                                                    <div v-if="detail.img && !Object.is(detail.img, '')">
+                                                        <img :src="detail.img" />
+                                                    </div>
+                                                </template>
+                                            </template>
                                         &nbsp;
                                         <span>
-                                            <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
-                                                {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
-                                            </template>
-                                            <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
-                                                {{detail.caption}}
+                                            <template v-if="detail.isShowCaption">
+                                                <template v-if="uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, '')">
+                                                    {{$t(`${uiActionGroup.langbase}.uiactions.${detail.uiactiontag}`)}}
+                                                </template>
+                                                <template v-if="!(uiActionGroup.langbase && !Object.is(uiActionGroup.langbase, '') && detail.uiactiontag && !Object.is(detail.uiactiontag, ''))">
+                                                    {{detail.caption}}
+                                                </template>
                                             </template>
                                         </span>
                                     </span>

app_web/src/components/app-transfer/app-transfer.less

-.ivu-select-dropdown {
-    padding: 0px;
-    .hidden {
-      display: none;
-    }
-  }
+.transfer-select{
+  .ivu-select-dropdown {
+      padding: 0px;
+      .hidden {
+          display: none;
+      }
\ No newline at end of file
+      .el-transfer{
+          min-width: 100% !important;
+          display: flex;
+          justify-content: space-between;
+          .el-transfer-panel{
+              min-width: 25%;
+          }
+          .el-transfer__buttons{
+              align-self: center;
+          }
+      }
+  }
+}
+

app_web/yarn.lock

@@ -5238,10 +5238,10 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-ibiz-gantt-elastic@^1.0.16:
-  version "1.0.16"
-  resolved "https://registry.npm.taobao.org/ibiz-gantt-elastic/download/ibiz-gantt-elastic-1.0.16.tgz#e2de7e8d4bdb3c292cfbc97c4f970c8ecfe6c43b"
-  integrity sha1-4t5+jUvbPCks+8l8T5cMjs/mxDs=
+ibiz-gantt-elastic@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.17.tgz#447cce5db2e0127d2336c20370fc251992520c6f"
+  integrity sha512-AJOYXZGM020wafn60RJLM2yKmtT2BjCpBKkZ0PONcxdqW/kCyXOqEo3c3/PBtFEkJx/8KGTayB013BOdGI1+uQ==
   dependencies:
     dayjs "^1.8.16"
     resize-observer-polyfill "^1.5.1"

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -79,6 +80,7 @@ public class WFGroup extends EntityMP implements Serializable {
         this.name = name ;
         this.modify("groupname",name);
     }
+
     /**
      * 设置 [范围]
      */
@@ -87,6 +89,7 @@ public class WFGroup extends EntityMP implements Serializable {
         this.modify("groupscope",groupscope);
     }
 
+
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFHistory.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
 /**
  * [历史] 对象
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor
@@ -104,7 +104,16 @@ public class WFHistory extends EntityBase implements Serializable {
 
 
 
-
+    /**
+     * 格式化日期 [时间]
+     */
+    public String formatTime(){
+        if (this.time == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
+        return sdf.format(time);
+    }
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFMember.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -107,6 +108,7 @@ public class WFMember extends EntityMP implements Serializable {
         this.membername = membername ;
         this.modify("membername",membername);
     }
+
     /**
      * 设置 [组标识]
      */
@@ -114,6 +116,7 @@ public class WFMember extends EntityMP implements Serializable {
         this.groupid = groupid ;
         this.modify("groupid",groupid);
     }
+
     /**
      * 设置 [用户标识]
      */
@@ -122,6 +125,7 @@ public class WFMember extends EntityMP implements Serializable {
         this.modify("userid",userid);
     }
 
+
     /**
      * 获取 [组成员标识]
      */

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessDefinition.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -113,6 +114,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.definitionname = definitionname ;
         this.modify("definitionname",definitionname);
     }
+
     /**
      * 设置 [模型版本]
      */
@@ -120,6 +122,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.modelversion = modelversion ;
         this.modify("modelversion",modelversion);
     }
+
     /**
      * 设置 [模型是否启用]
      */
@@ -127,6 +130,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.modelenable = modelenable ;
         this.modify("modelenable",modelenable);
     }
+
     /**
      * 设置 [系统标识]
      */
@@ -134,6 +138,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.pssystemid = pssystemid ;
         this.modify("pssystemid",pssystemid);
     }
+
     /**
      * 设置 [TaskDefinitionKey]
      */
@@ -141,6 +146,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.taskprocessdefinitionkey = taskprocessdefinitionkey ;
         this.modify("taskdefinitionkey",taskprocessdefinitionkey);
     }
+
     /**
      * 设置 [校验]
      */
@@ -148,6 +154,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.md5check = md5check ;
         this.modify("md5check",md5check);
     }
+
     /**
      * 设置 [BPMN]
      */
@@ -155,6 +162,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.bpmnfile = bpmnfile ;
         this.modify("bpmnfile",bpmnfile);
     }
+
     /**
      * 设置 [DeployKey]
      */
@@ -163,6 +171,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.modify("deploykey",deploykey);
     }
 
+
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessInstance.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
 /**
  * [流程实例] 对象
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor
@@ -103,7 +103,26 @@ public class WFProcessInstance extends EntityBase implements Serializable {
 
 
 
-
+    /**
+     * 格式化日期 [启动时间]
+     */
+    public String formatStarttime(){
+        if (this.starttime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
+        return sdf.format(starttime);
+    }
+    /**
+     * 格式化日期 [结束时间]
+     */
+    public String formatEndtime(){
+        if (this.endtime == null) {
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("defieldFormatStr");
+        return sdf.format(endtime);
+    }
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessNode.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
 /**
  * [流程定义节点] 对象
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor
@@ -66,7 +66,6 @@ public class WFProcessNode extends EntityBase implements Serializable {
 
 
 
-
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFREModel.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
 /**
  * [流程模型] 对象
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor
@@ -57,7 +57,6 @@ public class WFREModel extends EntityBase implements Serializable {
 
 
 
-
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFSystem.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -64,6 +65,7 @@ public class WFSystem extends EntityMP implements Serializable {
         this.modify("pssystemname",pssystemname);
     }
 
+
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTask.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
 /**
  * [工作流任务] 对象
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor
@@ -82,7 +82,6 @@ public class WFTask extends EntityBase implements Serializable {
 
 
 
-
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTaskWay.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +26,6 @@ import org.springframework.data.annotation.Transient;
 /**
  * [操作路径] 对象
  */
-@Builder
 @Getter
 @Setter
 @NoArgsConstructor
@@ -96,7 +96,6 @@ public class WFTaskWay extends EntityBase implements Serializable {
 
 
 
-
 }
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFUser.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -72,6 +73,7 @@ public class WFUser extends EntityMP implements Serializable {
         this.firstname = firstname ;
         this.modify("username",firstname);
     }
+
     /**
      * 设置 [用户名称]
      */
@@ -80,6 +82,7 @@ public class WFUser extends EntityMP implements Serializable {
         this.modify("personname",displayname);
     }
 
+
 }
 
 

ibzwf-util/src/main/java/cn/ibizlab/util/security/SimpleTokenUtil.java

@@ -19,7 +19,7 @@ import java.util.Optional;
 import java.util.function.Function;
 
 @Component
-@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:UAATokenUtil}'.equals('SimpleTokenUtil')")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.token.util:UAATokenUtil}'.equals('SimpleTokenUtil')")
 public class SimpleTokenUtil implements AuthTokenUtil,Serializable {
 
     private static final long serialVersionUID = -3301605591108950415L;

ibzwf-util/src/main/java/cn/ibizlab/util/security/UAATokenUtil.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.function.Function;
 
 @Component
-@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:UAATokenUtil}'.equals('UAATokenUtil')")
+@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.token.util:UAATokenUtil}'.equals('UAATokenUtil')")
 public class UAATokenUtil implements AuthTokenUtil, Serializable {
 
     private static final long serialVersionUID = -3301605591108950415L;