Browse Source

update

master
zhaohe 6 months ago
parent
commit
0a464bebf9
  1. 28
      src/main/java/iflytop/app/extui/zextui/ExtUIPageMenuRegister.java
  2. 25
      src/main/java/iflytop/app/extui/zextui/page/SubDeviceDriverTestPage.java
  3. 13
      src/main/java/iflytop/app/service/backgroud/SensorReportPreAnalysis.java
  4. 38
      src/main/java/iflytop/app/utils/CoordinateCalculator.java
  5. 5
      src/main/java/iflytop/zeui/controler/EngineerRootPageControler.java
  6. 8
      src/main/java/iflytop/zeui/service/RootMgrService.java
  7. 2
      src/main/java/iflytop/zeui/type/EngineerPage.java
  8. 2
      src/main/java/iflytop/zeui/type/display/Icon.java
  9. 11
      src/main/java/iflytop/zeui/type/display/Remark.java
  10. 2
      src/main/java/iflytop/zeui/type/features/ActionButton.java
  11. 4
      src/main/java/iflytop/zeui/type/features/DropDownButton.java
  12. 2
      src/main/java/iflytop/zeui/type/features/Nav.java
  13. 2
      src/main/java/iflytop/zeui/type/features/ServiceContainer.java
  14. 4
      src/main/java/iflytop/zeui/type/form/Form.java
  15. 4
      src/main/java/iflytop/zeui/type/form/FormItem.java
  16. 2
      src/main/java/iflytop/zeui/type/form/InputNumber.java
  17. 2
      src/main/java/iflytop/zeui/type/form/InputText.java
  18. 2
      src/main/java/iflytop/zeui/type/form/Select.java
  19. 2
      src/main/java/iflytop/zeui/type/layout/Flex.java
  20. 8
      src/main/java/iflytop/zeui/type/layout/Page.java
  21. 8
      src/main/java/iflytop/zeui/type/layout/Tabs.java
  22. 5
      src/main/java/iflytop/zeui/type/options/Align.java
  23. 2
      src/main/java/iflytop/zeui/type/options/Position.java
  24. 5
      src/main/java/iflytop/zeui/type/options/Shape.java
  25. 5
      src/main/java/iflytop/zeui/type/options/Size.java
  26. 5
      src/main/java/iflytop/zeui/type/options/Trigger.java
  27. 35
      src/main/java/iflytop/zextui/controler/ExtApiControler.java
  28. 10
      src/main/java/iflytop/zextui/controler/ExtApiControllerAdvice.java
  29. 8
      src/main/java/iflytop/zextui/mgr/ExtApiPageGroupCfgMgr.java
  30. 4
      src/main/java/iflytop/zextui/mgr/ExtApiPageMgr.java
  31. 2
      src/main/java/iflytop/zextui/type/ExApiPage.java
  32. 2
      src/main/java/iflytop/zextui/type/ExUIFunction.java
  33. 2
      src/main/java/iflytop/zextui/type/ExUIParam.java
  34. 2
      src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType1.java
  35. 2
      src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType2.java
  36. 2
      src/main/java/iflytop/zextui/type/ExtApiFn.java
  37. 2
      src/main/java/iflytop/zextui/type/ExtApiStatu.java
  38. 4
      src/main/java/iflytop/zextui/type/ExtUIPageCfg.java
  39. 2
      src/main/java/iflytop/zextui/type/ExtUITab.java
  40. 2
      src/main/java/iflytop/zextui/type/ExtUiTable.java
  41. 2
      src/main/java/iflytop/zextui/type/TabCfg.java
  42. 2
      src/main/java/iflytop/zextui/type/param/ExtUIFile.java
  43. 2
      src/main/java/iflytop/zextui/type/ret/EngineerUIRet.java
  44. 2
      src/main/java/iflytop/zextui/type/ret/ExtApiCurve.java
  45. 2
      src/main/java/iflytop/zextui/type/ret/ExtUIDownloadTasks.java
  46. 2
      src/main/java/iflytop/zextui/type/ret/FileToBeDownload.java
  47. 2
      src/main/java/iflytop/zextui/utils/FieldUtils.java
  48. 5
      src/main/java/iflytoplib/amiseui/type/options/Align.java
  49. 5
      src/main/java/iflytoplib/amiseui/type/options/Shape.java
  50. 5
      src/main/java/iflytoplib/amiseui/type/options/Size.java
  51. 5
      src/main/java/iflytoplib/amiseui/type/options/Trigger.java
  52. 70
      ui/zextui/src/App.vue

28
src/main/java/iflytop/app/extui/zextui/ExtUIPageMenuRegister.java

@ -0,0 +1,28 @@
package iflytop.app.extui.zextui;
import iflytop.app.extui.zextui.page.SubDeviceDriverTestPage;
import iflytop.app.utils.ZList;
import iflytop.zextui.mgr.ExtApiPageGroupCfgMgr.*;
import iflytop.zextui.mgr.ExtApiPageGroupCfgMgr;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Component;
@Component
public class ExtUIPageMenuRegister {
@Resource
ExtApiPageGroupCfgMgr groupCfgMgr;
public void pushMenu(Menu label) {
groupCfgMgr.pushMenu(label);
}
@PostConstruct
void init() {
pushMenu(new Menu("硬件测试", ZList.of(
new Menu(SubDeviceDriverTestPage.class, "串口通道测试")
)));
}
}

25
src/main/java/iflytop/app/extui/zextui/page/SubDeviceDriverTestPage.java

@ -0,0 +1,25 @@
package iflytop.app.extui.zextui.page;
import iflytop.zextui.mgr.ExtApiPageMgr;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Component;
@Component
public class SubDeviceDriverTestPage {
@Resource
ExtApiPageMgr extApiPageMgr;
public void start() {
}
@PostConstruct
public void init() {
var page = extApiPageMgr.newPage(this);
page.newGroup("设备控制");
page.addFunction("开始", this::start);
extApiPageMgr.addPage(page);
}
}

13
src/main/java/iflytop/app/service/backgroud/SensorReportPreAnalysis.java

@ -1,9 +1,11 @@
package iflytop.app.service.backgroud;
import iflytop.app.config.AppConstantConfig;
import iflytop.app.driver.SubDeviceDriver;
import iflytop.app.type.XYPoint;
import iflytop.app.type.protocol.TPMIPacket;
import iflytop.app.type.protocol.TPMISensorValReport;
import iflytop.app.utils.CoordinateCalculator;
import iflytop.app.utils.ZList;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
@ -34,9 +36,18 @@ public class SensorReportPreAnalysis {
if (report == null)
return;
log.info("report: {}", report);
Integer arm0Angle = report.getArm0Angle();
Integer arm1Angle = report.getArm1Angle();
Double arm0rad = arm0Angle * 1.0 / AppConstantConfig.ENCODER_ACCURACY * 2 * Math.PI;
Double arm1rad = arm1Angle * 1.0 / AppConstantConfig.ENCODER_ACCURACY * 2 * Math.PI;
var xypoint = CoordinateCalculator.calculator(AppConstantConfig.SENSOR_ARM0_LENGTH_MM, arm0rad, AppConstantConfig.SENSOR_ARM1_LENGTH_MM, arm1rad);
// xyPoints.add(new XYPoint(report.x, report.y));
}

38
src/main/java/iflytop/app/utils/CoordinateCalculator.java

@ -1,6 +1,8 @@
package iflytop.app.utils;
import iflytop.app.config.AppConstantConfig;
import iflytop.app.type.XYPoint;
import iflytop.app.type.protocol.TPMISensorValReport;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.Assert;
@ -10,6 +12,24 @@ import static java.lang.Math.abs;
@Slf4j
public class CoordinateCalculator {
static public XYPoint calculator(Double arm0Length, Double arm0Rad, Double arm1Length, Double arm1Rad) {
XYPoint xyPoint = new XYPoint(); double lval = calculateThirdSide(arm0Length, arm1Length, Math.PI - arm1Rad); if (lval < 0.000001) {
xyPoint.x = 0.0; xyPoint.y = 0.0;
} else {
double rad0 = calculateAngle(arm0Length, lval, arm1Length); double lrad = 0.0; if (arm1Rad > 0) {
lrad = arm0Rad + rad0;
} else {
lrad = arm0Rad - rad0;
} xyPoint.x = lval * Math.sin(lrad); xyPoint.y = lval * Math.cos(lrad);
} return xyPoint;
}
//
// PRIVATE
//
public static double calculateThirdSide(double a, double b, double angleInRadians) {
// 计算第三条边的平方
double cSquared = a * a + b * b - 2 * a * b * Math.cos(angleInRadians);
@ -38,18 +58,9 @@ public class CoordinateCalculator {
} return ret;
}
static public XYPoint calculator(Double arm0Length, Double arm0Rad, Double arm1Length, Double arm1Rad) {
XYPoint xyPoint = new XYPoint(); double lval = calculateThirdSide(arm0Length, arm1Length, Math.PI - arm1Rad); if (lval < 0.000001) {
xyPoint.x = 0.0; xyPoint.y = 0.0;
} else {
double rad0 = calculateAngle(arm0Length, lval, arm1Length); double lrad = 0.0; if (arm1Rad > 0) {
lrad = arm0Rad + rad0;
} else {
lrad = arm0Rad - rad0;
} xyPoint.x = lval * Math.sin(lrad); xyPoint.y = lval * Math.cos(lrad);
} return xyPoint;
}
//
// TEST
//
static void testCalculateThirdSide(double a, double b, double angleInRadians, double expected) {
double c = calculateThirdSide(a, b, angleInRadians);
@ -62,7 +73,6 @@ public class CoordinateCalculator {
String.format("testcalculateAngle: side1=%+.4f,side2=%+.4f,oppositeSide=%+.4f --> angle=%+.4f(%+.4f)", side1, side2, oppositeSide, angle, Math.toDegrees(angle)));
}
static void testCalculator(double arm0Length, double arm0Rad, double arm1Length, double arm1Rad, double expectedX, double expectedY) {
XYPoint xyPoint = calculator(arm0Length, arm0Rad, arm1Length, arm1Rad);
Assert.isTrue(abs(xyPoint.x - expectedX) < 0.0001 && abs(xyPoint.y - expectedY) < 0.0001,
@ -70,7 +80,7 @@ public class CoordinateCalculator {
}
public static void main(String[] args) {
CoordinateCalculator.testCalculateThirdSide(1, 1, 0,0.0);
CoordinateCalculator.testCalculateThirdSide(1, 1, 0, 0.0);
CoordinateCalculator.testCalculateThirdSide(1, 1, Math.PI / 4, 0.7654);
CoordinateCalculator.testCalculateThirdSide(1, 1, Math.PI / 2, 1.4142);
CoordinateCalculator.testCalculateThirdSide(1, 1, Math.PI * 3 / 4, 1.8478);

5
src/main/java/iflytoplib/amiseui/controler/EngineerRootPageControler.java → src/main/java/iflytop/zeui/controler/EngineerRootPageControler.java

@ -1,8 +1,7 @@
package iflytoplib.amiseui.controler;
package iflytop.zeui.controler;
import iflytop.app.type.exception.AppException;
import iflytoplib.amiseui.service.RootMgrService;
import iflytoplib.amiseui.service.RootMgrService;
import iflytop.zeui.service.RootMgrService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;

8
src/main/java/iflytoplib/amiseui/service/RootMgrService.java → src/main/java/iflytop/zeui/service/RootMgrService.java

@ -1,8 +1,8 @@
package iflytoplib.amiseui.service;
package iflytop.zeui.service;
import iflytoplib.amiseui.type.EngineerPage;
import iflytoplib.amiseui.type.features.Nav;
import iflytoplib.amiseui.type.layout.Page;
import iflytop.zeui.type.EngineerPage;
import iflytop.zeui.type.features.Nav;
import iflytop.zeui.type.layout.Page;
import org.springframework.stereotype.Component;
import java.util.ArrayList;

2
src/main/java/iflytoplib/amiseui/type/EngineerPage.java → src/main/java/iflytop/zeui/type/EngineerPage.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type;
package iflytop.zeui.type;
public class EngineerPage {
public String groupName;

2
src/main/java/iflytoplib/amiseui/type/display/Icon.java → src/main/java/iflytop/zeui/type/display/Icon.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.display;
package iflytop.zeui.type.display;
import com.fasterxml.jackson.annotation.JsonInclude;

11
src/main/java/iflytoplib/amiseui/type/display/Remark.java → src/main/java/iflytop/zeui/type/display/Remark.java

@ -1,12 +1,9 @@
package iflytoplib.amiseui.type.display;
package iflytop.zeui.type.display;
import com.fasterxml.jackson.annotation.JsonInclude;
import iflytoplib.amiseui.type.options.Position;
import iflytoplib.amiseui.type.options.Shape;
import iflytoplib.amiseui.type.options.Trigger;
import iflytoplib.amiseui.type.options.Position;
import iflytoplib.amiseui.type.options.Shape;
import iflytoplib.amiseui.type.options.Trigger;
import iflytop.zeui.type.options.Position;
import iflytop.zeui.type.options.Shape;
import iflytop.zeui.type.options.Trigger;
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Remark {

2
src/main/java/iflytoplib/amiseui/type/features/ActionButton.java → src/main/java/iflytop/zeui/type/features/ActionButton.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.features;
package iflytop.zeui.type.features;
import com.fasterxml.jackson.annotation.JsonInclude;

4
src/main/java/iflytoplib/amiseui/type/features/DropDownButton.java → src/main/java/iflytop/zeui/type/features/DropDownButton.java

@ -1,7 +1,7 @@
package iflytoplib.amiseui.type.features;
package iflytop.zeui.type.features;
import com.fasterxml.jackson.annotation.JsonInclude;
import iflytoplib.amiseui.type.options.Trigger;
import iflytop.zeui.type.options.Trigger;
import java.util.List;

2
src/main/java/iflytoplib/amiseui/type/features/Nav.java → src/main/java/iflytop/zeui/type/features/Nav.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.features;
package iflytop.zeui.type.features;
import com.fasterxml.jackson.annotation.JsonInclude;

2
src/main/java/iflytoplib/amiseui/type/features/ServiceContainer.java → src/main/java/iflytop/zeui/type/features/ServiceContainer.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.features;
package iflytop.zeui.type.features;
import com.fasterxml.jackson.annotation.JsonInclude;

4
src/main/java/iflytoplib/amiseui/type/form/Form.java → src/main/java/iflytop/zeui/type/form/Form.java

@ -1,7 +1,7 @@
package iflytoplib.amiseui.type.form;
package iflytop.zeui.type.form;
import com.fasterxml.jackson.annotation.JsonInclude;
import iflytoplib.amiseui.type.options.Align;
import iflytop.zeui.type.options.Align;
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Form {

4
src/main/java/iflytoplib/amiseui/type/form/FormItem.java → src/main/java/iflytop/zeui/type/form/FormItem.java

@ -1,7 +1,7 @@
package iflytoplib.amiseui.type.form;
package iflytop.zeui.type.form;
import com.fasterxml.jackson.annotation.JsonInclude;
import iflytoplib.amiseui.type.options.Align;
import iflytop.zeui.type.options.Align;
import java.util.List;

2
src/main/java/iflytoplib/amiseui/type/form/InputNumber.java → src/main/java/iflytop/zeui/type/form/InputNumber.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.form;
package iflytop.zeui.type.form;
import com.fasterxml.jackson.annotation.JsonInclude;

2
src/main/java/iflytoplib/amiseui/type/form/InputText.java → src/main/java/iflytop/zeui/type/form/InputText.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.form;
package iflytop.zeui.type.form;
import com.fasterxml.jackson.annotation.JsonInclude;

2
src/main/java/iflytoplib/amiseui/type/form/Select.java → src/main/java/iflytop/zeui/type/form/Select.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.form;
package iflytop.zeui.type.form;
import com.fasterxml.jackson.annotation.JsonInclude;

2
src/main/java/iflytoplib/amiseui/type/layout/Flex.java → src/main/java/iflytop/zeui/type/layout/Flex.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.layout;
package iflytop.zeui.type.layout;
import com.fasterxml.jackson.annotation.JsonInclude;

8
src/main/java/iflytoplib/amiseui/type/layout/Page.java → src/main/java/iflytop/zeui/type/layout/Page.java

@ -1,10 +1,8 @@
package iflytoplib.amiseui.type.layout;
package iflytop.zeui.type.layout;
import com.fasterxml.jackson.annotation.JsonInclude;
import iflytoplib.amiseui.type.display.Remark;
import iflytoplib.amiseui.type.options.Position;
import iflytoplib.amiseui.type.display.Remark;
import iflytoplib.amiseui.type.options.Position;
import iflytop.zeui.type.display.Remark;
import iflytop.zeui.type.options.Position;
@JsonInclude(JsonInclude.Include.NON_NULL)

8
src/main/java/iflytoplib/amiseui/type/layout/Tabs.java → src/main/java/iflytop/zeui/type/layout/Tabs.java

@ -1,10 +1,8 @@
package iflytoplib.amiseui.type.layout;
package iflytop.zeui.type.layout;
import com.fasterxml.jackson.annotation.JsonInclude;
import iflytoplib.amiseui.type.display.Icon;
import iflytoplib.amiseui.type.options.Position;
import iflytoplib.amiseui.type.display.Icon;
import iflytoplib.amiseui.type.options.Position;
import iflytop.zeui.type.display.Icon;
import iflytop.zeui.type.options.Position;
import java.util.List;

5
src/main/java/iflytop/zeui/type/options/Align.java

@ -0,0 +1,5 @@
package iflytop.zeui.type.options;
public enum Align {
left, right
}

2
src/main/java/iflytoplib/amiseui/type/options/Position.java → src/main/java/iflytop/zeui/type/options/Position.java

@ -1,4 +1,4 @@
package iflytoplib.amiseui.type.options;
package iflytop.zeui.type.options;
public enum Position {
left, right, top, bottom

5
src/main/java/iflytop/zeui/type/options/Shape.java

@ -0,0 +1,5 @@
package iflytop.zeui.type.options;
public enum Shape {
circle, square
}

5
src/main/java/iflytop/zeui/type/options/Size.java

@ -0,0 +1,5 @@
package iflytop.zeui.type.options;
public enum Size {
xs,sm,md,lg
}

5
src/main/java/iflytop/zeui/type/options/Trigger.java

@ -0,0 +1,5 @@
package iflytop.zeui.type.options;
public enum Trigger {
hover, focus
}

35
src/main/java/iflytoplib/zextui/controler/ExtApiControler.java → src/main/java/iflytop/zextui/controler/ExtApiControler.java

@ -1,14 +1,14 @@
package iflytoplib.zextui.controler;
package iflytop.zextui.controler;
import iflytop.app.utils.SpringBootBeanUtil;
import iflytoplib.zextui.mgr.ExtApiPageGroupCfgMgr;
import iflytoplib.zextui.mgr.ExtApiPageMgr;
import iflytoplib.zextui.type.ExUIParam;
import iflytoplib.zextui.type.ExtApiStatu;
import iflytoplib.zextui.type.ExtUIPageCfg;
import iflytoplib.zextui.type.param.ExtUIFile;
import iflytoplib.zextui.type.ret.EngineerUIRet;
import iflytop.zextui.mgr.ExtApiPageGroupCfgMgr;
import iflytop.zextui.mgr.ExtApiPageMgr;
import iflytop.zextui.type.ExUIParam;
import iflytop.zextui.type.ExtApiStatu;
import iflytop.zextui.type.ExtUIPageCfg;
import iflytop.zextui.type.param.ExtUIFile;
import iflytop.zextui.type.ret.EngineerUIRet;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
@ -16,7 +16,7 @@ import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import iflytoplib.zextui.type.ExUIFunction;
import iflytop.zextui.type.ExUIFunction;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@ -42,23 +42,6 @@ public class ExtApiControler {
@PostMapping("/api/service-config/service-list")
@ResponseBody
public EngineerUIRet services() {
// List<Map<String, Object>> services = new ArrayList<>();
// var classes = SpringBootBeanUtil.getBeans();
// for (var clazz : classes) {
// var cfg = extApiPageGroupCfgMgr.getCfg(clazz);
// if (cfg == null) {
// continue;
// }
// if (!cfg.display) {
// continue;
// }
// Map<String, Object> service = new HashMap<>();
// service.put("key", clazz.getSimpleName());
// service.put("name", cfg.getChName());
// service.put("order", cfg.getIndex());
// services.add(service);
// }
// log.info("services:{}", services);
return EngineerUIRet.success(extApiPageGroupCfgMgr.getMenuList());
}

10
src/main/java/iflytoplib/zextui/controler/ExtApiControllerAdvice.java → src/main/java/iflytop/zextui/controler/ExtApiControllerAdvice.java

@ -1,21 +1,21 @@
package iflytoplib.zextui.controler;
package iflytop.zextui.controler;
import a8k.extui.type.ret.AppRetV1;
import iflytop.zextui.type.ret.EngineerUIRet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
@ControllerAdvice(value = "a8k.extui.controler")
@ControllerAdvice(value = "iflytop.zextui.controler")
public class ExtApiControllerAdvice {
Logger logger = LoggerFactory.getLogger(ExtApiControllerAdvice.class);
@ResponseBody
@ExceptionHandler(value = Exception.class)
public AppRetV1 controllerExceptionHandler(Exception e) {
public EngineerUIRet controllerExceptionHandler(Exception e) {
logger.info("捕获到异常 : ", e);
return AppRetV1.fail(e);
return EngineerUIRet.fail(e);
}
}

8
src/main/java/iflytoplib/zextui/mgr/ExtApiPageGroupCfgMgr.java → src/main/java/iflytop/zextui/mgr/ExtApiPageGroupCfgMgr.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.mgr;
package iflytop.zextui.mgr;
import jakarta.annotation.PostConstruct;
import org.springframework.stereotype.Component;
@ -51,17 +51,13 @@ public class ExtApiPageGroupCfgMgr {
List<Menu> menuList = new ArrayList<>();
void pushMenu(Menu label) {
public void pushMenu(Menu label) {
menuList.add(label);
}
@PostConstruct
void init() {
////////////////////////////////////////////////////////////////////////////////////////////
}

4
src/main/java/iflytoplib/zextui/mgr/ExtApiPageMgr.java → src/main/java/iflytop/zextui/mgr/ExtApiPageMgr.java

@ -1,6 +1,6 @@
package iflytoplib.zextui.mgr;
package iflytop.zextui.mgr;
import iflytoplib.zextui.type.ExtUIPageCfg;
import iflytop.zextui.type.ExtUIPageCfg;
import org.springframework.stereotype.Component;
import java.util.ArrayList;

2
src/main/java/iflytoplib/zextui/type/ExApiPage.java → src/main/java/iflytop/zextui/type/ExApiPage.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
public class ExApiPage {
String chName;

2
src/main/java/iflytoplib/zextui/type/ExUIFunction.java → src/main/java/iflytop/zextui/type/ExUIFunction.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.springframework.util.Assert;

2
src/main/java/iflytoplib/zextui/type/ExUIParam.java → src/main/java/iflytop/zextui/type/ExUIParam.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
public class ExUIParam {
public String keyName;

2
src/main/java/iflytoplib/zextui/type/ExUIParamGetInitValFnType1.java → src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType1.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
@FunctionalInterface
public interface ExUIParamGetInitValFnType1 {

2
src/main/java/iflytoplib/zextui/type/ExUIParamGetInitValFnType2.java → src/main/java/iflytop/zextui/type/ExUIParamGetInitValFnType2.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
@FunctionalInterface
public interface ExUIParamGetInitValFnType2 {

2
src/main/java/iflytoplib/zextui/type/ExtApiFn.java → src/main/java/iflytop/zextui/type/ExtApiFn.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

2
src/main/java/iflytoplib/zextui/type/ExtApiStatu.java → src/main/java/iflytop/zextui/type/ExtApiStatu.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

4
src/main/java/iflytoplib/zextui/type/ExtUIPageCfg.java → src/main/java/iflytop/zextui/type/ExtUIPageCfg.java

@ -1,7 +1,7 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
import a8k.extui.utils.FieldUtils;
import com.fasterxml.jackson.annotation.JsonIgnore;
import iflytop.zextui.utils.FieldUtils;
import org.springframework.util.Assert;
import java.io.Serializable;

2
src/main/java/iflytoplib/zextui/type/ExtUITab.java → src/main/java/iflytop/zextui/type/ExtUITab.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/iflytoplib/zextui/type/ExtUiTable.java → src/main/java/iflytop/zextui/type/ExtUiTable.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
import com.fasterxml.jackson.annotation.JsonIgnore;

2
src/main/java/iflytoplib/zextui/type/TabCfg.java → src/main/java/iflytop/zextui/type/TabCfg.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type;
package iflytop.zextui.type;
import lombok.Data;

2
src/main/java/iflytoplib/zextui/type/param/ExtUIFile.java → src/main/java/iflytop/zextui/type/param/ExtUIFile.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type.param;
package iflytop.zextui.type.param;
import java.util.Base64;
public class ExtUIFile {
public byte[] bytes;

2
src/main/java/iflytoplib/zextui/type/ret/EngineerUIRet.java → src/main/java/iflytop/zextui/type/ret/EngineerUIRet.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type.ret;
package iflytop.zextui.type.ret;
import lombok.Getter;
public class EngineerUIRet {
// 错误信息

2
src/main/java/iflytoplib/zextui/type/ret/ExtApiCurve.java → src/main/java/iflytop/zextui/type/ret/ExtApiCurve.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type.ret;
package iflytop.zextui.type.ret;
import java.util.List;

2
src/main/java/iflytoplib/zextui/type/ret/ExtUIDownloadTasks.java → src/main/java/iflytop/zextui/type/ret/ExtUIDownloadTasks.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type.ret;
package iflytop.zextui.type.ret;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/iflytoplib/zextui/type/ret/FileToBeDownload.java → src/main/java/iflytop/zextui/type/ret/FileToBeDownload.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.type.ret;
package iflytop.zextui.type.ret;
public class FileToBeDownload {
public String url;

2
src/main/java/iflytoplib/zextui/utils/FieldUtils.java → src/main/java/iflytop/zextui/utils/FieldUtils.java

@ -1,4 +1,4 @@
package iflytoplib.zextui.utils;
package iflytop.zextui.utils;
import java.lang.invoke.SerializedLambda;
import java.lang.reflect.Field;

5
src/main/java/iflytoplib/amiseui/type/options/Align.java

@ -1,5 +0,0 @@
package iflytoplib.amiseui.type.options;
public enum Align {
left, right
}

5
src/main/java/iflytoplib/amiseui/type/options/Shape.java

@ -1,5 +0,0 @@
package iflytoplib.amiseui.type.options;
public enum Shape {
circle, square
}

5
src/main/java/iflytoplib/amiseui/type/options/Size.java

@ -1,5 +0,0 @@
package iflytoplib.amiseui.type.options;
public enum Size {
xs,sm,md,lg
}

5
src/main/java/iflytoplib/amiseui/type/options/Trigger.java

@ -1,5 +0,0 @@
package iflytoplib.amiseui.type.options;
public enum Trigger {
hover, focus
}

70
ui/zextui/src/App.vue

@ -70,8 +70,6 @@ async function mounted() {
menuItems.value = services;
activeServiceKey.value = null;
setupEventWebSocket();
setupStateUpdateWebSocket();
}
// handle menu item click
@ -82,75 +80,7 @@ function actionMenuItemClick(event) {
}
// handle open change
function handleOpenChange(keys) {
openKeys.value = keys.length ? [keys[keys.length - 1]] : [];
}
function setupEventWebSocket() {
let ws = createWebSocket('event');
ws.onmessage = (event) => {
let report = JSON.parse(event.data);
console.info(report);
if (report.data.typeName === "AppPromptEvent") {
Modal.info({
title: 'PROMPT',
content: h(VueJsonPretty, { data: report.data.prompt, deep: 2 }),
width: 600,
});
} else {
Modal.info({
title: 'WebSocket Event',
content: h(VueJsonPretty, { data: report, deep: 2 }),
width: 600,
});
}
};
// ws.onclose = () => {
// setTimeout(() => {
// ws.connect();
// }, 1000);
// };
}
function setupStateUpdateWebSocket() {
let ws = createWebSocket('state');
ws.onmessage = (event) => {
const data = JSON.parse(event.data);
if (data.messageType === 'Report' && data.dataType === 'MessageBoxState') {
const time = new Date(data.data.topMessage.time).toLocaleString();
message.value = `${time} - ${data.data.topMessage.message}`;
messageBoxList.value = data.data.messageBoxList;
switch (data.data.topMessage.messageLevel) {
case 'Info':
messageColor.value = 'blue';
break;
case 'Warn':
messageColor.value = 'orange';
break;
case 'Error':
messageColor.value = 'red';
break;
default:
messageColor.value = 'black';
}
}
};
// ws.onclose = () => {
// setTimeout(() => {
// ws = createWebSocket('state');
// }, 1000);
// };
}
function createWebSocket(type) {
const url = process.env.NODE_ENV === 'production' ? `ws://${window.location.host}:80/api/v1/app/ws/${type}`
: `ws://localhost:80/api/v1/app/ws/${type}`;
return new WebSocket(url);
}
function showMessageBoxList() {
const listItems = messageBoxList.value.map(item => {

Loading…
Cancel
Save