From 7e70a484a3b759059f4da6cef07a8477b1d2aafc Mon Sep 17 00:00:00 2001
From: RB <getrebuild@sina.com>
Date: Tue, 26 Nov 2024 13:32:46 +0800
Subject: [PATCH 1/5] be:AutoGenReport

---
 @rbv                                                     | 2 +-
 src/main/resources/web/assets/js/trigger/trigger-list.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/@rbv b/@rbv
index 8603157f4..1d45ff01d 160000
--- a/@rbv
+++ b/@rbv
@@ -1 +1 @@
-Subproject commit 8603157f44128a3fdebabd0fa3bd1969018231ef
+Subproject commit 1d45ff01d451fb79fcd8aadc729324b7a6c90bac
diff --git a/src/main/resources/web/assets/js/trigger/trigger-list.js b/src/main/resources/web/assets/js/trigger/trigger-list.js
index 7bd6651bd..f7d9cc269 100644
--- a/src/main/resources/web/assets/js/trigger/trigger-list.js
+++ b/src/main/resources/web/assets/js/trigger/trigger-list.js
@@ -225,7 +225,7 @@ class TriggerEdit extends ConfigFormDlg {
     $.get('/admin/robot/trigger/available-actions', (res) => {
       let actions = res.data || []
       if (!window.__BOSSKEY) {
-        actions = actions.filter((item) => !['PROXYTRIGGERACTION', 'AUTOGENREPORT', 'AUTOREVOKE'].includes(item[0]))
+        actions = actions.filter((item) => !['PROXYTRIGGERACTION', 'AUTOREVOKE'].includes(item[0]))
       }
 
       this.setState({ actions }, () => {

From ad16cde92d7c0da39094288dd4e9dddeac73dc56 Mon Sep 17 00:00:00 2001
From: RB <getrebuild@sina.com>
Date: Tue, 26 Nov 2024 22:43:38 +0800
Subject: [PATCH 2/5] be

---
 .../metadata/impl/DynamicMetadataFactory.java  | 18 ++++++++++--------
 .../core/service/general/OperatingContext.java |  2 +-
 .../trigger/impl/GroupAggregationRefresh.java  |  4 ++--
 .../web/assets/js/general/rb-assignshare.js    |  4 ++--
 .../web/assets/js/general/rb-forms.js          |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/rebuild/core/metadata/impl/DynamicMetadataFactory.java b/src/main/java/com/rebuild/core/metadata/impl/DynamicMetadataFactory.java
index 3a204e548..682a83380 100644
--- a/src/main/java/com/rebuild/core/metadata/impl/DynamicMetadataFactory.java
+++ b/src/main/java/com/rebuild/core/metadata/impl/DynamicMetadataFactory.java
@@ -90,12 +90,13 @@ private void appendConfig4Db(Document config) {
                     .addAttribute("deletable", "true");
 
             // 实体扩展配置
-            JSONObject extraAttrs;
+            JSONObject extraAttrs = null;
             if (StringUtils.isBlank((String) c[9])) {
-                extraAttrs = new JSONObject();
-            } else {
-                extraAttrs = JSON.parseObject((String) c[9]);
+                try {
+                    extraAttrs = new JSONObject();
+                } catch (Exception ignored){}
             }
+            if (extraAttrs == null) extraAttrs = new JSONObject();
 
             extraAttrs.put("metaId", c[4]);
             extraAttrs.put("comments", c[5]);
@@ -165,12 +166,13 @@ else if (dt == DisplayType.BARCODE) {
             }
 
             // 字段扩展配置
-            JSONObject extraAttrs;
+            JSONObject extraAttrs = null;
             if (JSONUtils.wellFormat((String) c[14])) {
-                extraAttrs = JSON.parseObject((String) c[14]);
-            } else {
-                extraAttrs = new JSONObject();
+                try {
+                    extraAttrs = JSON.parseObject((String) c[14]);
+                } catch (Exception ignored){}
             }
+            if (extraAttrs == null) extraAttrs = new JSONObject();
 
             extraAttrs.put("metaId", c[12]);
             extraAttrs.put("comments", c[13]);
diff --git a/src/main/java/com/rebuild/core/service/general/OperatingContext.java b/src/main/java/com/rebuild/core/service/general/OperatingContext.java
index 78880d088..e8eca1a93 100644
--- a/src/main/java/com/rebuild/core/service/general/OperatingContext.java
+++ b/src/main/java/com/rebuild/core/service/general/OperatingContext.java
@@ -83,7 +83,7 @@ public Record getAfterRecord() {
 
     /**
      * NOTE!!! 请注意当共享时得到的是共享实体 Record
-     * 如果是为了获取源纪录 ID 推荐使用 {@link #getFixedRecordId()}
+     * 如果是为了获取源记录 ID 推荐使用 {@link #getFixedRecordId()}
      *
      * @return
      */
diff --git a/src/main/java/com/rebuild/core/service/trigger/impl/GroupAggregationRefresh.java b/src/main/java/com/rebuild/core/service/trigger/impl/GroupAggregationRefresh.java
index 80eea4342..28afee58d 100644
--- a/src/main/java/com/rebuild/core/service/trigger/impl/GroupAggregationRefresh.java
+++ b/src/main/java/com/rebuild/core/service/trigger/impl/GroupAggregationRefresh.java
@@ -30,8 +30,8 @@
  *
  * 场景举例：
  * 1.1 新建记录：产品A + 仓库A分组（组合A+A）
- * 1.2 修改记录：仓库A > B（组合B+A），此时原（组合A+A）纪录不会触发更新
- * 2. 因此需要通过强制更新原纪录刷新原组合（组合A+A）记录
+ * 1.2 修改记录：仓库A > B（组合B+A），此时原（组合A+A）记录不会触发更新
+ * 2. 因此需要通过强制更新原记录刷新原组合（组合A+A）记录
  * 3. NOTE 如果组合值均为空，则无法匹配任何原目标记录，此时需要全量刷新（性能差）（可通过任一字段必填解决）
  * 4. NOTE 如果只有一个分组字段，因为无法获知之前的值，则需要全量刷新（性能差）
  *
diff --git a/src/main/resources/web/assets/js/general/rb-assignshare.js b/src/main/resources/web/assets/js/general/rb-assignshare.js
index b21e3e982..a838e2efa 100644
--- a/src/main/resources/web/assets/js/general/rb-assignshare.js
+++ b/src/main/resources/web/assets/js/general/rb-assignshare.js
@@ -397,11 +397,11 @@ class DlgTransform extends RbModalHandler {
             <div className="col-sm-7" style={{ paddingTop: 6 }}>
               <label className="custom-control custom-control-sm custom-radio custom-control-inline mb-1">
                 <input className="custom-control-input" type="radio" name="transType" checked={this.state.transType === 0} onChange={() => this.setState({ transType: 0 })} />
-                <span className="custom-control-label">{$L('新纪录')}</span>
+                <span className="custom-control-label">{$L('新记录')}</span>
               </label>
               <label className="custom-control custom-control-sm custom-radio custom-control-inline mb-1">
                 <input className="custom-control-input J_word4" type="radio" name="transType" checked={this.state.transType === 1} onChange={() => this.setState({ transType: 1 })} />
-                <span className="custom-control-label">{$L('已有纪录')}</span>
+                <span className="custom-control-label">{$L('已有记录')}</span>
               </label>
             </div>
           </div>
diff --git a/src/main/resources/web/assets/js/general/rb-forms.js b/src/main/resources/web/assets/js/general/rb-forms.js
index 889d3d6bf..96547db33 100644
--- a/src/main/resources/web/assets/js/general/rb-forms.js
+++ b/src/main/resources/web/assets/js/general/rb-forms.js
@@ -609,7 +609,7 @@ class RbForm extends React.Component {
   }
 
   componentDidMount() {
-    // 新纪录初始值
+    // 新记录初始值
     if (this.isNew || this.props.forceInitFieldValue) {
       this.props.children.map((child) => {
         let iv = child.props.value

From 1db42933a5d3c3625ffca3e671d5aeca4fbb7d71 Mon Sep 17 00:00:00 2001
From: RB <getrebuild@sina.com>
Date: Wed, 27 Nov 2024 14:41:40 +0800
Subject: [PATCH 3/5] fix: task loading

---
 .../web/project/ProjectTaskController.java        |  3 ++-
 .../resources/web/assets/js/project/task-view.js  | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/rebuild/web/project/ProjectTaskController.java b/src/main/java/com/rebuild/web/project/ProjectTaskController.java
index 6db124f98..7ba8e0d83 100644
--- a/src/main/java/com/rebuild/web/project/ProjectTaskController.java
+++ b/src/main/java/com/rebuild/web/project/ProjectTaskController.java
@@ -197,7 +197,8 @@ private String buildCustomPlanSql(String planKey, ID projectId) {
                 return baseSql + String.format("modifiedOn < '%s'", dtf.format(CalendarUtils.addDay(-14)));
             }
         } else if (planKey.equals("0-0")) {
-            return "1=1";
+            // 列表视图
+            return "projectId = '" + projectId + "'";
         }
 
         throw new InvalidParameterException(Language.L("无效请求参数 (%s=%s)", "id", planKey));
diff --git a/src/main/resources/web/assets/js/project/task-view.js b/src/main/resources/web/assets/js/project/task-view.js
index 472e94fb4..a3e478152 100644
--- a/src/main/resources/web/assets/js/project/task-view.js
+++ b/src/main/resources/web/assets/js/project/task-view.js
@@ -129,14 +129,19 @@ class TaskForm extends React.Component {
   }
 
   componentDidMount() {
-    __TaskViewer.setLoadingState(false)
-    this.fetch()
+    this.fetch(() => {
+      __TaskViewer.setLoadingState(false)
+    })
   }
 
-  fetch() {
+  fetch(cb) {
     $.get(`/project/tasks/details?task=${this.props.id}`, (res) => {
-      if (res.error_code === 0) this.setState({ ...res.data }, () => $(this._status).prop('checked', this.state.status === 1))
-      else RbHighbar.error(res.error_msg)
+      if (res.error_code === 0) {
+        this.setState({ ...res.data }, () => $(this._status).prop('checked', this.state.status === 1))
+      } else {
+        RbHighbar.error(res.error_msg)
+      }
+      typeof cb === 'function' && cb()
     })
   }
 

From 87584f093590ce4ebf159d43a86aa0562871cefc Mon Sep 17 00:00:00 2001
From: RB <getrebuild@sina.com>
Date: Wed, 27 Nov 2024 22:46:53 +0800
Subject: [PATCH 4/5] Update home.html

---
 src/main/resources/web/feeds/home.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/web/feeds/home.html b/src/main/resources/web/feeds/home.html
index b6f9709e1..11fcf9a03 100644
--- a/src/main/resources/web/feeds/home.html
+++ b/src/main/resources/web/feeds/home.html
@@ -36,14 +36,14 @@
                           </span>
                         </div>
                         <div class="input-group input-group-sm">
-                          <input type="text" class="form-control search J_date-begin" th:placeholder="${bundle.L('发布时间') + ' (' + bundle.L('起') + ')'}" />
+                          <input type="text" class="form-control search J_date-begin" th:placeholder="${bundle.L('发布日期') + ' (' + bundle.L('起') + ')'}" />
                           <span class="append">
                             <a><i class="icon zmdi zmdi-close"></i></a>
                             <i class="icon zmdi zmdi-calendar"></i>
                           </span>
                         </div>
                         <div class="input-group input-group-sm">
-                          <input type="text" class="form-control search J_date-end" th:placeholder="${bundle.L('发布时间') + ' (' + bundle.L('止') + ')'}" />
+                          <input type="text" class="form-control search J_date-end" th:placeholder="${bundle.L('发布日期') + ' (' + bundle.L('止') + ')'}" />
                           <span class="append">
                             <a><i class="icon zmdi zmdi-close"></i></a>
                             <i class="icon zmdi zmdi-calendar"></i>

From 1a010f628f6d0c9e95c28828094597255875f28a Mon Sep 17 00:00:00 2001
From: RB <getrebuild@sina.com>
Date: Wed, 27 Nov 2024 23:24:02 +0800
Subject: [PATCH 5/5] be: ann popup

---
 src/main/resources/web/assets/css/feeds.css        | 13 +++++++++++++
 .../resources/web/assets/js/feeds/announcement.js  | 14 ++++++++++++--
 src/main/resources/web/feeds/home.html             |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/web/assets/css/feeds.css b/src/main/resources/web/assets/css/feeds.css
index 182e9cdaa..de7ab8e09 100644
--- a/src/main/resources/web/assets/css/feeds.css
+++ b/src/main/resources/web/assets/css/feeds.css
@@ -725,3 +725,16 @@ See LICENSE and COMMERCIAL in the project root for license information.
   width: 24px;
   height: 24px;
 }
+
+.side-wrapper + .announcement-wrapper {
+  margin-top: 20px;
+}
+
+.side-wrapper + .announcement-wrapper > div + div {
+  margin-top: 5px;
+}
+
+.side-wrapper + .announcement-wrapper > div p {
+  white-space: unset !important;
+  max-height: 84px;
+}
diff --git a/src/main/resources/web/assets/js/feeds/announcement.js b/src/main/resources/web/assets/js/feeds/announcement.js
index a17c6db92..07fa8e473 100644
--- a/src/main/resources/web/assets/js/feeds/announcement.js
+++ b/src/main/resources/web/assets/js/feeds/announcement.js
@@ -89,8 +89,10 @@ const $showAnnouncement = function () {
   $.get('/commons/announcements', (res) => {
     if (res.error_code !== 0 || !res.data || res.data.length === 0) return
 
-    const shows = res.data.map((item) => {
+    let popup39 = []
+    const anShows = res.data.map((item) => {
       const stateClazz = item.readState === 1 ? 'read-state1' : typeof item.readState === 'string' ? 'read-state2' : null
+      if (item.readState === 1) popup39.push(`anno-${item.id}`)
       return (
         <div key={item.id} id={`anno-${item.id}`} className={`bg-warning ${stateClazz}`} title={$L('查看详情')} onClick={() => renderRbcomp(<AnnouncementModal {...item} />)}>
           <i className="icon zmdi zmdi-notifications-active" />
@@ -99,10 +101,18 @@ const $showAnnouncement = function () {
       )
     })
 
-    renderRbcomp(<RF>{shows}</RF>, $aw, function () {
+    renderRbcomp(<RF>{anShows}</RF>, $aw, function () {
       $(this)
         .find('p>a[href]')
         .on('click', (e) => e.stopPropagation())
+
+      // v3.9 弹窗
+      // 登录页不弹、已读不弹
+      if (location.pathname.includes('/login')) popup39 = []
+      if (location.pathname.includes('/feeds/home')) $('.side-wrapper').css('position', 'static')
+      setTimeout(() => {
+        popup39.forEach((p) => $('#' + p)[0].click())
+      }, 600)
     })
   })
 }
diff --git a/src/main/resources/web/feeds/home.html b/src/main/resources/web/feeds/home.html
index 11fcf9a03..d4c41d0fd 100644
--- a/src/main/resources/web/feeds/home.html
+++ b/src/main/resources/web/feeds/home.html
@@ -11,7 +11,6 @@
       <th:block th:replace="~{/_include/nav-top}" />
       <th:block th:replace="~{/_include/nav-left(active='nav_entity-Feeds')}" />
       <div class="rb-content">
-        <div class="announcement-wrapper"></div>
         <div class="main-content container container-smart">
           <div class="row">
             <div class="col-lg-8 col-12">
@@ -94,6 +93,7 @@
                   </div>
                 </div>
               </div>
+              <div class="announcement-wrapper"></div>
             </div>
           </div>
         </div>