Merge branch 'master' into develop

src/main/java/com/rebuild/core/service/dataimport/RecordCheckout.java

@@ -59,7 +59,7 @@ import java.util.Set;
 @Slf4j
 public class RecordCheckout {
 
-    private static final String MVAL_SPLIT = "[,，;；]";
+    public static final String MVAL_SPLIT = "[,，;；]";
 
     final private List<String> traceLogs = new ArrayList<>();
 

src/main/java/com/rebuild/core/service/trigger/impl/FieldWriteback.java

@@ -460,7 +460,7 @@ public class FieldWriteback extends FieldAggregation {
                                 value = StringUtils.EMPTY;
                             }
                         } else if (isMultiField) {
-                            // v3.6: 目标值为多引用时保持 `ID[]`
+                            // v3.5.5: 目标值为多引用时保持 `ID[]`
                             if (easyVarField.getDisplayType() == DisplayType.N2NREFERENCE
                                     && targetFieldEasy.getDisplayType() == DisplayType.N2NREFERENCE) {
                                 value = StringUtils.join((ID[]) value, MultiValue.MV_SPLIT);
@@ -543,7 +543,7 @@ public class FieldWriteback extends FieldAggregation {
                 id = id.trim();
                 if (ID.isId(id)) idsSet.add(ID.valueOf(id));
             }
-            // v3.6: 目标值为多引用时保持 `ID[]`
+            // v3.5.5: 目标值为多引用时保持 `ID[]`
             newValue = idsSet.toArray(new ID[0]);
 
         } else if (dt == DisplayType.BOOL) {

src/main/java/com/rebuild/core/support/RebuildConfiguration.java

@@ -34,7 +34,7 @@ import java.util.List;
 public class RebuildConfiguration extends KVStorage {
 
     /**
-     * 获取数据目录下的文件（或目录）
+     * 获取 RB 数据目录下的文件（或目录）
      *
      * @param filepath
      * @return
@@ -69,7 +69,7 @@ public class RebuildConfiguration extends KVStorage {
     }
 
     /**
-     * 获取临时文件（或目录）。注意临时文件会定时删除
+     * 获取 RB 临时文件（或目录）。此目录与 JAVA 临时目录不同，同时注意此临时目录文件会定时删除
      *
      * @param filepath
      * @return

src/main/resources/web/assets/js/admin/approval-design.js

@@ -36,7 +36,7 @@ $(document).ready(() => {
 let isCanvasMounted = false
 // 节点类型
 const NTs = {
-  start: ['start', $L('发起人'), $L('记录所属用户')],
+  start: ['start', $L('发起人'), $L('所有人')],
   approver: ['approver', $L('审批人'), $L('自选审批人')],
   cc: ['cc', $L('抄送人'), $L('自选抄送人')],
 }
@@ -129,7 +129,7 @@ class NodeGroupSpec extends React.Component {
 
   renderNodes() {
     return (this.state.nodes || []).map((item) => {
-      const props = { ...item, key: 'kn-' + item.nodeId, $$$parent: this }
+      const props = { ...item, key: `kn-${item.nodeId}`, $$$parent: this }
       if (item.type === 'condition') return <ConditionNode {...props} />
       else return <SimpleNode {...props} />
     })
@@ -335,10 +335,10 @@ class ConditionBranch extends NodeGroupSpec {
         </div>
         {this.renderNodes()}
         {this.state.isLast && (
-          <React.Fragment>
+          <RF>
             <div className="top-right-cover-line" />
             <div className="bottom-right-cover-line" />
-          </React.Fragment>
+          </RF>
         )}
       </div>
     )
@@ -482,7 +482,7 @@ const hideDlgAddNode = function () {
 class StartNodeConfig extends RbFormHandler {
   constructor(props) {
     super(props)
-    this.state.users = (props.users || ['OWNS'])[0]
+    this.state.users = (props.users || ['ALL'])[0]
     if (!UTs[this.state.users]) this.state.users = 'SPEC'
     this.state.selfSelecting = props.selfSelecting !== false
     this.state.submitFilter = props.filter || null
@@ -913,7 +913,7 @@ class RbFlowCanvas extends NodeGroupSpec {
             <i className="zmdi zmdi-minus" />
           </a>
         </div>
-        <div className={'box-scale' + (wpc.preview ? ' preview' : '')} style={this.state.zoomStyle}>
+        <div className={`box-scale ${wpc.preview ? 'preview' : ''}`} style={this.state.zoomStyle}>
           <SimpleNode type="start" $$$parent={this} nodeId="ROOT" ref={(c) => (this._root = c)} />
           {this.renderNodes()}
           <div className="end-node">
@@ -1052,7 +1052,7 @@ class DlgCopy extends ConfigFormDlg {
 
   renderFrom() {
     return (
-      <React.Fragment>
+      <RF>
         <div className="form-group row">
           <label className="col-sm-3 col-form-label text-sm-right">{$L('新名称')}</label>
           <div className="col-sm-7">
@@ -1067,7 +1067,7 @@ class DlgCopy extends ConfigFormDlg {
             </label>
           </div>
         </div>
-      </React.Fragment>
+      </RF>
     )
   }
 

src/main/resources/web/error/server-status.html

@@ -35,7 +35,7 @@
       </div>
     </div>
     <div class="container">
-      <h5 class="text-bold mt-5">[[${bundle.L('快速检查')}]]</h5>
+      <h5 class="text-bold mt-5 text-uppercase">[[${bundle.L('快速检查')}]]</h5>
       <table class="table table-bordered table-sm table-hover">
         <tbody>
           <tr>
@@ -67,7 +67,7 @@
         </tbody>
       </table>
       <th:block th:if="${isAdminVerified || !ok}">
-        <h5 class="text-bold mt-5">[[${bundle.L('系统信息')}]]</h5>
+        <h5 class="text-bold mt-5 text-uppercase">[[${bundle.L('系统信息')}]]</h5>
         <table class="table table-bordered table-sm table-hover">
           <tbody>
             <tr>
@@ -100,7 +100,7 @@
             </tr>
             <tr>
               <th>Temp Directory</th>
-              <td>[[${T(com.rebuild.core.support.RebuildConfiguration).getFileOfTemp("/")}]]</td>
+              <td>[[${T(org.apache.commons.io.FileUtils).getTempDirectoryPath()}]]</td>
             </tr>
           </tbody>
         </table>