表单相关：版本信息、自动拓展、设置更新状态

blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

@@ -149,10 +149,7 @@ public class FormulaUtils {
         test(fd);
         System.out.println(fd.getEName());
     }*/
-    public static void  test(FormData fd){
-        fd.setEName("22222");
-        fd.getValues().add(new ElementData(2,2,2));
-    }
+
 
 
     public  static void write(FormData fd, Object data,Boolean nullOrBlank ){
@@ -160,6 +157,10 @@ public class FormulaUtils {
             /*无定位信息不写入*/
             return;
         }
+        /*一个单元格且存在多张，全部设置为自动拓展 20230816*/
+        if(fd.getCoordsList().size()==1&&fd.getValues().size()>1&&fd.getFormula()!=null){
+               fd.getFormula().setOutm(Formula.FULL);
+        }
         /*写入前清空内容*/
         fd.getValues().forEach(t->t.setValue(null));
         if(data instanceof List){
@@ -215,7 +216,7 @@ public class FormulaUtils {
                 fd.getValues().get(0).setValue(data);
             }
         }
-     //   fd.setUpdate(1);
+        fd.setUpdate(1);
     }
     public static  List<TableInfo> getTableInfoList(JSONArray dataArray) {
         if (dataArray != null && !dataArray.isEmpty()) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -30,6 +30,7 @@ import org.springblade.manager.entity.*;
 import org.springblade.manager.enums.ExecuteType;
 import org.springblade.manager.formula.KeyMapper;
 import org.springblade.manager.formula.impl.CompositeDataAccess;
+import org.springblade.manager.formula.impl.StartupTimeListener;
 import org.springblade.manager.service.*;
 import org.springblade.manager.service.impl.FormulaServiceImpl;
 import org.springblade.manager.vo.AppWbsTreeContractVO;
@@ -41,6 +42,9 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.FileNotFoundException;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -452,7 +456,9 @@ public class FormulaController {
     @GetMapping("/log")
     public R<Object> log(Long pkeyId) {
         Map<String, Object> result = new HashMap<>();
-        result.put("版本信息", "202303161800");
+        Instant startupTime = StartupTimeListener.getStartupTime();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
+        result.put("版本信息", "Application started at:" + formatter.format(startupTime));
         if (Func.isNotEmpty(pkeyId)) {
             result.put("执行情况", this.jdbcTemplate.queryForList("select * from m_formula_log where id=" + pkeyId));
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/StartupTimeListener.java

@@ -0,0 +1,26 @@
+package org.springblade.manager.formula.impl;
+
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+import java.time.Instant;
+
+/**
+ * @author yangyj
+ * @Date 2023/8/16 11:57
+ * @description 查看发版时间
+ */
+@Component
+public class StartupTimeListener implements ApplicationListener<ApplicationReadyEvent> {
+    private static Instant startupTime;
+
+    @Override
+    public void onApplicationEvent(ApplicationReadyEvent event) {
+        startupTime = Instant.now();
+    }
+
+    public static Instant getStartupTime() {
+        return startupTime;
+    }
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1123,8 +1123,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     }
 
     public  void write(FormData fd,Object data){
-        /*如果需要向额外元素或对象输出数据，在此处修改*/
-               fd.setUpdate(1);
+               /*如果需要向额外元素或对象输出数据，在此处修改*/
                FormulaUtils.write(fd,data,false);
     }