merge-v3.7 (#769)

* Update @rbv

* feat: trigger when update-fields approve-nodes (#728)

* ** NEED TEST **

* Update metadata-conf.xml

* 3.7-dev

* bump: echarts v5

* COLOR_PALETTES

* be: DlgSpecFields into common

* feat: spec approval-node trigger

* feat: hasUpdateFields for all

* tmp: RobotSopConfig

* Update @rbv

* enh: TriggerByTimerJob 未完成也可重进 (#731)

* enh: TriggerByTimerJob 未完成也可重进

* enh: fileName use#698

* feat: UseDbFullText

* !!!@EnableAsync

---------

Co-authored-by: devezhao <[email protected]>

* feat: chart CNMAP  (#732)

* style: chart in datalist

* feat: CNMAP

* feat: Details auto imports 110 (#733)

* js: $.trim, $.isArray, click-on

* feat: details import auto

* enh: $type, select2

* Add lib react18

* bump lib

* Update lint.yml

---------

Co-authored-by: devezhao <[email protected]>

* Update @rbv

* Enh auto approval (#735)

* rbv: AutoApproval

* console: RBAPI ASSISTANT

* Update @rbv

* print Approval Node

* filter: op=HHH

* feat: AutoApproval

* be: use tags

* be: LastLogsViewer.renderLog

* Feat list3 card 100 (#737)

* style

* datalist conf

* feat: mode3

* mode23 style

* enh: datalist2

* fjs: openModal, getType

* Update @rbv

* bump: react18, jq (#738)

* js: $.trim, $.isArray, click-on

* feat: details import auto

* enh: $type, select2

* Add lib react18

* enh: js

* bump lib

* react18

* cnmap style

* actions

* loadmore style

---------

Co-authored-by: devezhao <[email protected]>

* feat: approval step users (#739)

* feat: approvalLastTime

* feat: approvalStepUsers

* img indicator

* Update @rbv

* be: filter

* submail attach

---------

Co-authored-by: devezhao <[email protected]>

* Notify use sms email (#741)

* feat: EmailDistributor, SmsDistributor

* feat: ApprovalStepNodeName

* isOceanBase

---------

Co-authored-by: devezhao <[email protected]>

* Update @rbv

* Update @rbv

* feat: Auto create task 119 (#742)

feat: CreateTask

feat:SMS/EmailDistributor

* be: save cb

* entity searchbox

* feat: REP

* Chart axis 120 (#743)


* style: CNMAP

* feat: Stack Bar

* feat: showHorizontal

* be

---------

Co-authored-by: devezhao <[email protected]>

* Approval expires 114 (#745)


* feat: expiresAuto

* be: approval copy

* be:entity view by code

* feat: tasks list (#746)

* style: icon of chart

* feat: project list tasks

* be: setEditableFields keep sort Gitee#I9EGJB

* be: executeLazy

* Nd trans (#747)

* enh: getDisksUsed

* be: link entity

* feat: ND trans

* style

* be: filter

* icon: zmdi-filter-list

* style: list badge 12px

* detailImports

* style project

* be: $multipleUploader

* feat: sop (#748)

* be

* be: trans 1>N

* enh: sql ver

* styles

* ps style

* feat: sop

* enh: useExecManual for all

---------

Co-authored-by: devezhao <[email protected]>

* Update forms.html

* Report use cond (#749)

* style

* be: sop

* feat: report useFilter

* field image _captureType

* TSID error

---------

Co-authored-by: devezhao <[email protected]>

* Feat datasync 94 (#750)

* be: ref-search pageSize=20

* feat: date W Gitee#I9I67Z

* style

* feat: bar3

* be: charts style

* feat: DataSyncer spec

* Enh extforms (#752)


* dock style

* enh: trigger edit code

* fix: guide

* trubo

* fix: Add no-rollback-for=RepeatedRecordsException

* 通过》已完成

* be: charts

* enh: .detail-form-table.fullscreen

* fix: Gitee#I9J3UR alibaba/easyexcel#3432

* ExcelClipboardData

* Update README.md

---------

Co-authored-by: devezhao <[email protected]>

* Update @rbv

* Feat excel clipboard data (#753)

* style

* feat: csvdata-rebuild

* enh: DataListCategory (Use tree)

* be: Nval duplicate

* Apidock (#754)

* TsetEntity

* theme color

* be: trigger on update

* rm: LazyWaitDetailsFinished

* apiman

* fix: ApprovalStepNodeName

* Enh charts (#755)

* enh: axis filter

* enh: FunnelChart

* feat: SendNotification email attach

* AutoGenReport

* enh: `_readonly ` for setReadonly

* be 3.7 (#756)


* be: nodeName

* url-safe

* md pdf

* $cleanNumbern

* be: text:关联记录>相关记录

* enh: 级联支持N2N字段

* entity-overview

* Dockerfile


* fix yj

* enh: AutoApproval revoke

* Update @rbv

---------

Co-authored-by: devezhao <[email protected]>

* feat: List cat ref (#757)

* be: DataListCategory

* fix: 审批返回上一步有分支节点时错误

* be: 清理备份错误提示

* oshi

* Be 3.7 2 (#759)

* Update MarkdownUtils.java

* be: filter N2N:User

* apiman pdf

* Be 3.7 3 (#760)

* fix

* be: webcam

* Update field-edit.html

* be

* Be 3.7 4 (#761)

* Update system-cfg.html

* ConcatIdFunction

* Update FieldWriteback.java

* be video

* Update media-capturer.js

* Update DataImportController.java

* lang

* be

* Update DataImportController.java

* Update RebuildWebConfigurer.java

* flatpickr

* Update rb-base.js

* handleChange lazy

* fix chart in datalist

* Update submail.js

* style

* Be 3.7 5 (#762)

* $hex2rgb

* be: checkRefDataFilter

* style: feeds

* style: file-icon

* fix: 记录转换 D>M+D

* be install

* be: tests

* feat: form-formula {NOW}

* fix: 日期短格式区间查询

* _readonly37

---------

Co-authored-by: devezhao <[email protected]>

* Be 3.7 6 (#764)


* form: __LAB_FORMACTION_105, __LAB_FORMACTION_103

* __LAB_MINUTESTEP

* fix: 字段更新清空时支持N2N

* be: Installer.java

* feat:  $dropUpload

* be: file RbPreview

* fix

* mde paste

* be dropUpload

* fix: 不触发 onClientProgress???

* Be 3.7 7 (#765)

* fix: num input

* style: NTEXT keep empty-line

* media-capturer.js

* fix: pdf 预览下载文件名不对

* feat: nform

* Update KnownExceptionConverter.java

* be

* Be 3.7 8 (#766)

* be NFORM

* Update form-design.js

* Update charts.js

* Update FormsManager.java

* Be 3.7 9 (#767)


* feat: speclayout

* feat: Gitee#I9UJ7N

* feat: easyaction

* useCode

* Be 3.7 10 (#768)

* v3.7-hide

* lang

* be: targetEntityMatchFields

* fix:

* _StartEntityTypeCode

* be

* Update README.md

---------

Co-authored-by: devezhao <[email protected]>

.deploy/fallstart-rebuild.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+RBHOME=/path/to/v-rebuild-standalone
+cd $RBHOME
+
+PID=$(ps -ef | grep $RBHOME | grep -v grep | awk '{ print $2 }')
+if [ -z "$PID" ]
+then
+  echo "Rebuild-Standalone is not running. Starting ..."
+  ./start-rebuild.sh
+else
+  echo "Rebuild-Standalone is running"
+fi

.deploy/restart-rebuild.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-JARFILE=rebuild-boot.jar
+JARFILE=/path/to/rebuild-boot.jar
 
 echo "Use jar file [ $JARFILE ]"
 

.eslintrc.js

@@ -56,6 +56,7 @@ module.exports = {
     $gotoSection: true,
     $createUploader: true,
     $initUploader: true,
+    $multipleUploader: true,
     $cleanMenu: true,
     $cleanMap: true,
     $pages: true,
@@ -65,6 +66,8 @@ module.exports = {
     $initReferenceSelect2: true,
     $keepModalOpen: true,
     renderRbcomp: true,
+    renderRbcomp18: true,
+    renderDlgcomp: true,
     RbSpinner: true,
     RbAlertBox: true,
     RbModal: true,
@@ -83,7 +86,6 @@ module.exports = {
     UserShow: true,
     DateShow: true,
     DeleteConfirm: true,
-    ApprovalProcessor: true,
     RbFormModal: true,
     DlgAssign: true,
     DlgShare: true,
@@ -100,7 +102,6 @@ module.exports = {
     $stopEvent: true,
     $addResizeHandler: true,
     $empty: true,
-    $emptyNum: true,
     $mp: true,
     $converEmoji: true,
     $throttle: true,
@@ -137,5 +138,12 @@ module.exports = {
     $removeHtml: true,
     $openWindow: true,
     MediaCapturer: true,
+    $cleanArray: true,
+    $trim: true,
+    $type: true,
+    $cleanNumber: true,
+    $hex2rgb: true,
+    $isImage: true,
+    $dropUpload: true,
   },
 }

.github/workflows/codeql.yml

@@ -1,14 +1,3 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
@@ -22,61 +11,25 @@ on:
 jobs:
   analyze:
     name: Analyze
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners
-    # Consider using larger runners for possible analysis time improvements.
     runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
     timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
-      # required for all workflows
       security-events: write
-
-      # only required for workflows in private repositories
       actions: read
       contents: read
-
     strategy:
       fail-fast: false
       matrix:
         language: [ 'java-kotlin', 'javascript-typescript' ]
-        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
-        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
-
-    # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
-    # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v3
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #     echo "Run, Build Application using script"
-    #     ./location_of_script_within_repo/buildscript.sh
-
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3
       with:

.gitignore

@@ -46,3 +46,4 @@ test.*
 # Build
 
 /.deploy/build/
+package-lock.json

Dockerfile

@@ -0,0 +1,13 @@
+FROM amazoncorretto:11-alpine
+
+RUN apk add ttf-dejavu
+
+EXPOSE 18080
+
+COPY ./target/rebuild.jar /app/rebuild/rebuild-boot.jar
+
+#COPY ./.deploy/SourceHanSansK-Regular.ttf /app/rebuild/
+
+WORKDIR /app/rebuild/
+
+CMD java -jar -Duser.timezone=Asia/Shanghai -DDataDirectory=/app/rebuild/.rebuild rebuild-boot.jar

README.md

@@ -9,24 +9,24 @@
 
 **_相较于同类产品，REBUILD 更侧重于业务需求实现，而非基础的技术框架或项目启动模板。_**
 
-「开放式设计」是 REBUILD 的重要设计理念！得益于研发团队成熟的 B 端产品经验，我们实现了对企业日常各类需求的可配置化管理，全图形化设计零代码搭建，所见即所得。
+「开放式设计」是 REBUILD 的重要设计理念！得益于团队成熟的企业管理系统经验，我们实现了对企业日常各类需求的可配置化管理，全图形化设计零代码搭建，所见即所得。
 
 更多详情介绍 [https://getrebuild.com/](https://getrebuild.com/)
 
 > **福利：加入 REBUILD VIP 用户 QQ 交流群 819865721 1013051587 GET 使用技能**
 
-## V3.6 新特性
+## V3.7 新特性
 
 本次更新为你带来众多功能增强与优化。
 
-1. [新增] 记录合并功能
-2. [新增] 明细复制功能
-3. [新增] 从 Excel 数据表导入实体和数据
-4. [新增] 字段类型支持转换
-5. [新增] 表单设计支持“只读”选项
+1. [新增] 限时审批
+2. [新增] 新建任务（触发器）
+3. [新增] 地图图表
+4. [新增] 自动明细记录导入（记录转换）
+5. [新增] 数据列表之卡片模式
 6. [新增] 多个 FrontJS 函数
-7. [优化] 首页仪表盘暗黑模式
-8. [优化] 多项安全性更新 
+7. [优化] 图表支持多轴显示、横向显示、显示背景
+8. [优化] 手机版全新列表搜索组件
 9. ...
 
 更多更新详情请参见 [更新日志](https://getrebuild.com/docs/dev/changelog)
@@ -39,17 +39,17 @@
 
 ## 使用
 
-开始使用 REBUILD 非常简单，不需要配置复杂的运行环境，零依赖快速部署，超简单！
+开始使用 REBUILD 非常简单，无需配置复杂的运行环境，零依赖快速部署！
 
 #### 1. 使用已发布版本
 
 _生产环境强烈推荐使用此方式 !!!_
 
 首先 [下载](https://getrebuild.com/download) 安装包，我们同时提供 `standalone` 与 `boot` 两种安装包。`standalone` 为集成安装包（推荐），`boot` 为 SpringBoot 的 `jar` 包，两种安装包在功能上没有区别。
 
-下载后解压（集成安装包），通过 `start-rebuild.bat` 或 `start-rebuild.sh` 启动， 打开浏览器输入 [http://localhost:18080/](http://localhost:18080/) 开始体验。
+下载后解压（集成安装包），通过 `start-rebuild.bat` 或 `start-rebuild.sh` 启动，然后打开浏览器输入 [http://localhost:18080/](http://localhost:18080/) 开始体验。
 
-更多详情请参见 [安装文档](https://getrebuild.com/docs/admin/install)
+更多详情请参见 [安装文档](https://getrebuild.com/learn/install)
 
 #### 2. 通过源码编译
 
@@ -66,7 +66,7 @@ mvn package
 java -jar target/rebuild.jar
 ```
 
-打开浏览器输入 [http://localhost:18080/](http://localhost:18080/) 开始体验。
+运行后打开浏览器输入 [http://localhost:18080/](http://localhost:18080/) 开始体验。
 
 ## 开发