executeJsObject(Frame frame, String name) {
+ return Optional.ofNullable(frame.executeJavaScript(name));
+ }
+
+ /**
+ * 执行js脚本并返回,使用范围包含{@link JxUIPane#executeJavaScript(String)},可以代替使用
+ *
+ * @param name 变量命名
+ * @return js对象
+ */
+ public Optional
executeJS(String name) {
+ if (browser != null) {
+ Optional frame = browser.mainFrame();
+ if (frame.isPresent()) {
+ return Optional.ofNullable(frame.get().executeJavaScript(name));
+ }
+ }
+ return Optional.empty();
+ }
+
+ /**
+ * 由于自定义scheme目前走的是url，因此路径会被自动转化，比如windows路径下对冒号问题
+ * C:\\abc 变成 /C/abc，这里对冒号进行编码转义
+ */
+ private static String encodeWindowsPath(String path) {
+ if (OperatingSystem.isWindows() && path.startsWith(EMB_TAG + SCHEME_HEADER)) {
+ String s = path.split(EMB_TAG + SCHEME_HEADER)[1];
+ return EMB_TAG + SCHEME_HEADER + s.replace(COLON, COLON_ESCAPE);
+ }
+ return path;
+ }
+
+ /**
+ * JxUIPane 的建造者
+ *
+ * @param 参数
+ */
+ public static class Builder extends ModernUIPane.Builder {
+ private String namespace;
+ private String variable;
+ private String expression;
+ private InjectJsCallback callback;
+
+ private Pair listenerPair;
+ private final Map namespacePropertyMap;
+ private final Map propertyMap;
+
+ private final Map buildPropertyMap;
+ private Object variableProperty;
+ private Map parameterMap;
+ private AssembleComponent component;
+ private String url;
+ private String html;
+
+ public Builder() {
+ // 为了兼容继承关系，但又不允许创建，用这个方式先处理一下
+ super((ModernUIPane) null);
+ this.namespace = DEFAULT_NAMESPACE;
+ this.variable = DEFAULT_VARIABLE;
+ this.expression = DEFAULT_EXPRESSION;
+ this.callback = null;
+ this.listenerPair = null;
+ this.namespacePropertyMap = new HashMap<>();
+ this.propertyMap = new HashMap<>();
+ this.buildPropertyMap = new HashMap<>();
+ this.variableProperty = null;
+ this.parameterMap = null;
+ this.component = null;
+ this.url = StringUtils.EMPTY;
+ this.html = StringUtils.EMPTY;
+ }
+
+ /**
+ * 注入一个回调，回调的js会在初始化进行执行
+ *
+ * @param callback 回调
+ * @return builder
+ */
+ public Builder prepare(InjectJsCallback callback) {
+ this.callback = callback;
+ return this;
+ }
+
+ @Override
+ public Builder prepareForV6(ScriptContextListener contextListener) {
+ return this;
+ }
+
+ @Override
+ public Builder prepareForV6(LoadListener loadListener) {
+ return this;
+ }
+
+ @Override
+ public JxUIPane.Builder prepareForV7(InjectJsCallback callback) {
+ prepare(callback);
+ return this;
+ }
+
+ @Override
+ public JxUIPane.Builder prepareForV7(Class event, Observer listener) {
+ listenerPair = new Pair<>(event, listener);
+ return this;
+ }
+
+ /**
+ * 加载jar包中的资源
+ *
+ * @param path 资源路径
+ */
+ public JxUIPane.Builder withEMB(final String path) {
+ this.url = EMB_TAG + SCHEME_HEADER + path;
+ return this;
+ }
+
+ /**
+ * 加载jar包中的资源
+ *
+ * @param path 资源路径
+ */
+ public JxUIPane.Builder withEMB(final String path, Map map) {
+ this.parameterMap = map;
+ this.url = EMB_TAG + SCHEME_HEADER + path;
+ return this;
+ }
+
+ /**
+ * 加载url指向的资源
+ *
+ * @param url 文件的地址
+ */
+ public JxUIPane.Builder withURL(final String url) {
+ this.url = url;
+ return this;
+ }
+
+ /**
+ * 加载url指向的资源
+ *
+ * @param url 文件的地址
+ */
+ public JxUIPane.Builder withURL(final String url, Map map) {
+ this.parameterMap = map;
+ this.url = url;
+ return this;
+ }
+
+ /**
+ * 加载Atom组件
+ *
+ * @param component Atom组件
+ */
+ public JxUIPane.Builder withComponent(AssembleComponent component) {
+ return withComponent(component, null);
+ }
+
+ /**
+ * 加载Atom组件
+ *
+ * @param component Atom组件
+ */
+ public JxUIPane.Builder withComponent(AssembleComponent component, Map map) {
+ this.parameterMap = map;
+ this.component = component;
+ this.url = COMPONENT_TAG;
+ return this;
+ }
+
+
+ /**
+ * 加载html文本内容
+ *
+ * @param html 要加载html文本内容
+ */
+ public JxUIPane.Builder withHTML(String html) {
+ this.html = html;
+ return this;
+ }
+
+ /**
+ * 设置该前端页面做数据交换所使用的对象
+ * 相当于：
+ * const namespace = "Pool";
+ * 调用：
+ * window[namespace];
+ * 默认下结构如：
+ * window.Pool
+ *
+ * @param namespace 对象名
+ */
+ public JxUIPane.Builder namespace(String namespace) {
+ this.namespace = namespace;
+ return this;
+ }
+
+ /**
+ * java端往js端传数据时使用的变量名字
+ * 默认值为 data
+ * 相当于：
+ * const variable = "data";
+ * 调用：
+ * window[namespace][variable];
+ * 默认下结构如：
+ * window.Pool.data
+ *
+ * @param name 变量的名字
+ */
+ public JxUIPane.Builder variable(String name) {
+ this.variable = name;
+ return this;
+ }
+
+ /**
+ * js端往java端传数据时执行的函数表达式
+ *
+ * @param expression 函数表达式
+ */
+ public JxUIPane.Builder expression(String expression) {
+ this.expression = expression;
+ return this;
+ }
+
+ /**
+ * 注入一个java对象到js中，绑定在全局变量window的指定变量variable。
+ * variable 可由 {@link #namespace(String)} 设置，默认值为 data
+ * 这个方法仅在在加载的网页上执行 JavaScript 之前注入
+ * 相当于：
+ * window[namespace][property] = javaObject
+ * 默认下：
+ * window.Pool[property] = javaObject
+ *
+ * @param obj java对象
+ * @return 链式对象
+ */
+ public JxUIPane.Builder bindNamespace(String property, @Nullable Object obj) {
+ this.namespacePropertyMap.put(property, obj);
+ return this;
+ }
+
+ /**
+ * 注入一个java对象到js中，绑定在全局变量window的指定变量variable。
+ * variable 可由 {@link #variable(String)} 设置，默认值为 data
+ * 这个方法仅在在加载的网页上执行 JavaScript 之前注入
+ * 相当于：
+ * window[namespace][variable] = javaObject
+ * 默认下：
+ * window.Pool.data = javaObject
+ *
+ * @param obj java对象
+ * @return 链式对象
+ */
+ public JxUIPane.Builder bindVariable(@NotNull Object obj) {
+ this.variableProperty = obj;
+ return this;
+ }
+
+ /**
+ * 注入一个java对象到js中,绑定在全局变量 window的
+ * property指定的变量。这个方法仅在在加载的网页上执
+ * 行 JavaScript 之前注入
+ * 相当于：
+ * window[property] = javaObject
+ *
+ * @param property 属性
+ * @param obj java对象
+ * @return 链式对象
+ * @see #bindWindow(String, PropertyBuild)
+ */
+ public JxUIPane.Builder bindWindow(String property, @Nullable Object obj) {
+ this.propertyMap.put(property, obj);
+ return this;
+ }
+
+ /**
+ * 注入一个java对象到js中。绑定在全局变量 window的property指定的变量。
+ * PropertyBuild用于动态生成绑定属性。个方法仅在在加载的网页上执行
+ * JavaScript 之前注入
+ * 相当于：
+ * window[property] = javaObject
+ *
+ * @param property 属性构建器
+ * @param obj java对象
+ * @return 链式对象
+ * @see #bindWindow(String, Object)
+ */
+ public JxUIPane.Builder bindWindow(String property, PropertyBuild obj) {
+ buildPropertyMap.put(property, obj);
+ return this;
+ }
+
+ /**
+ * 构建
+ */
+ public JxUIPane build() {
+ JxUIPane pane = new JxUIPane<>();
+ pane.namespace = namespace;
+ pane.variable = variable;
+ pane.expression = expression;
+ pane.setMap(parameterMap);
+ pane.setComponent(component);
+ pane.initialize();
+ injectJs(pane);
+ if (!Objects.isNull(listenerPair)) {
+ pane.browser.navigation().on(listenerPair.getFirst(), listenerPair.getSecond());
+ }
+ if (StringUtils.isNotEmpty(this.url)) {
+ pane.browser.navigation().loadUrl(encodeWindowsPath(this.url));
+ } else if (StringUtils.isNotEmpty(this.html)) {
+ pane.browser.mainFrame().ifPresent(f -> f.loadHtml(html));
+ }
+ return pane;
+ }
+
+ /**
+ * 由于 InjectJsCallback 的回调机制，在初始化期间，只有
+ * 在 InjectJsCallback 中 putProperty 才能生效。
+ * 因此，嵌套回调分别做默认初始化、putProperty、外置初始化
+ */
+ private void injectJs(JxUIPane pane) {
+ pane.initInjectJs(params -> {
+ Frame frame = params.frame();
+ if (!propertyMap.isEmpty()) {
+ propertyMap.forEach((key, value) ->
+ executeJsObject(frame, WINDOW)
+ .ifPresent(window -> window.putProperty(key, value)));
+ }
+ if (!buildPropertyMap.isEmpty()) {
+ buildPropertyMap.forEach((key, value) ->
+ executeJsObject(frame, WINDOW)
+ .ifPresent(window -> window.putProperty(key, value.build(window))));
+ }
+ if (!namespacePropertyMap.isEmpty()) {
+ namespacePropertyMap.forEach((key, value) ->
+ executeJsObject(frame, WINDOW + DOT + namespace)
+ .ifPresent(pool -> pool.putProperty(key, value)));
+ }
+ if (variableProperty != null) {
+ executeJsObject(frame, WINDOW + DOT + namespace)
+ .ifPresent(pool -> pool.putProperty(variable, variableProperty));
+ }
+ if (callback != null) {
+ return callback.on(params);
+ }
+ return InjectJsCallback.Response.proceed();
+ });
+ }
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java b/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java
new file mode 100644
index 0000000000..654de0d729
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/jxbrowser/MimeType.java
@@ -0,0 +1,112 @@
+package com.fr.design.jxbrowser;
+
+import com.fr.stable.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * jxbrowser 使用的一些媒体类型
+ *
+ * @author vito
+ * @since 11.0
+ * Created on 2023/6/13
+ */
+public enum MimeType {
+ /**
+ * html 格式
+ */
+ HTML(".html", "text/html"),
+ /**
+ * CSS 格式
+ */
+ CSS(".css", "text/css"),
+ /**
+ * js 格式
+ */
+ JS(".js", "text/javascript"),
+ /**
+ * svg 格式
+ */
+ SVG(".svg", "image/svg+xml"),
+ /**
+ * png 格式
+ */
+ PNG(".png", "image/png"),
+
+ /**
+ * jpg 格式
+ */
+ JPG(".jpg", "image/jpeg"),
+
+ /**
+ * jpeg 格式
+ */
+ JPEG(".jpeg", "image/jpeg"),
+
+ /**
+ * gif 格式
+ */
+ GIF(".gif", "image/gif"),
+ /**
+ * woff 字体格式
+ */
+ WOFF(".woff", "font/woff"),
+ /**
+ * ttf 字体格式
+ */
+ TTF(".ttf", "truetype"),
+
+ /**
+ * MS 嵌入式开放字体
+ */
+ EOT(".eot", "embedded-opentype");
+
+ private final String suffix;
+ private final String mimeType;
+
+ MimeType(String suffix, String mimeType) {
+ this.suffix = suffix;
+ this.mimeType = mimeType;
+ }
+
+ public String getMimeType() {
+ return mimeType;
+ }
+
+ /**
+ * 获取指定路径对应的 mimetype，优先匹配常量中的类型
+ * 如果没有，尝试使用 Files.probeContentType 检测
+ * 如果没有，默认返回 text/html
+ *
+ * @param resourcePath 资源路径
+ * @return MimeType
+ */
+ public static String parseMimeType(String resourcePath) {
+ if (StringUtils.isBlank(resourcePath)) {
+ return HTML.mimeType;
+ }
+ Optional mimeType = Arrays.stream(values())
+ .filter(type -> resourcePath.endsWith(type.suffix))
+ .findFirst();
+ if (mimeType.isPresent()) {
+ return mimeType.get().mimeType;
+ } else {
+ return getFileMimeType(resourcePath);
+ }
+ }
+
+ private static String getFileMimeType(String finalPath) {
+ Path file = new File(finalPath).toPath();
+ try {
+ String s = Files.probeContentType(file);
+ return StringUtils.isEmpty(s) ? HTML.mimeType : s;
+ } catch (IOException e) {
+ return HTML.mimeType;
+ }
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/NxInterceptRequestCallback.java b/designer-base/src/main/java/com/fr/design/jxbrowser/NxInterceptRequestCallback.java
new file mode 100644
index 0000000000..58d45a61f2
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/jxbrowser/NxInterceptRequestCallback.java
@@ -0,0 +1,183 @@
+package com.fr.design.jxbrowser;
+
+import com.fr.base.TemplateUtils;
+import com.fr.design.ui.ModernRequestClient;
+import com.fr.design.ui.ModernUIConstants;
+import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.EncodeConstants;
+import com.fr.stable.StringUtils;
+import com.fr.web.struct.AssembleComponent;
+import com.fr.web.struct.AtomBuilder;
+import com.fr.web.struct.PathGroup;
+import com.fr.web.struct.category.ScriptPath;
+import com.fr.web.struct.category.StylePath;
+import com.teamdev.jxbrowser.net.HttpHeader;
+import com.teamdev.jxbrowser.net.HttpStatus;
+import com.teamdev.jxbrowser.net.UrlRequest;
+import com.teamdev.jxbrowser.net.UrlRequestJob;
+import com.teamdev.jxbrowser.net.callback.InterceptUrlRequestCallback;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import static com.fr.design.ui.ModernUIConstants.COMPONENT_TAG;
+
+/**
+ * jxbrowser7 自定义 scheme 处理回调
+ *
+ * @author vito
+ * @since 11.0
+ * Created on 2023/6/8
+ */
+public class NxInterceptRequestCallback implements InterceptUrlRequestCallback {
+
+ private static final String COLON_DECODE_ESCAPE = "/:";
+ private static final String SCHEME_SPLIT = ":/";
+ private Supplier component;
+
+ private Supplier> renderParameterBuild;
+
+ public NxInterceptRequestCallback(Supplier> renderParameterBuild) {
+ this.renderParameterBuild = renderParameterBuild;
+ }
+
+ public NxInterceptRequestCallback(Supplier component,
+ Supplier> renderParameterBuild) {
+ this.component = component;
+ this.renderParameterBuild = renderParameterBuild;
+ }
+
+ /**
+ * 主要包括 atom 和 emb协议的文件链接处理，
+ * 去掉file文件协议的支持，因此jxbrowser 7之后不支持覆盖内置协议，详细见
+ * {@link com.teamdev.jxbrowser.net.internal.NonInterceptableScheme}
+ *
+ * @param params 参数
+ * @return 响应
+ */
+ @Override
+ public Response on(Params params) {
+ UrlRequest urlRequest = params.urlRequest();
+ String path = urlRequest.url().replace(COLON_DECODE_ESCAPE, JxUIPane.COLON);
+ Optional urlRequestJobOptional;
+ if (path.startsWith(COMPONENT_TAG)) {
+ String text = htmlText(renderParameterBuild.get());
+ urlRequestJobOptional = generateBasicUrlRequestJob(params,
+ "text/html", text.getBytes(StandardCharsets.UTF_8));
+ } else {
+ urlRequestJobOptional = generateFileProtocolUrlRequestJob(params, path);
+ }
+ return urlRequestJobOptional
+ .map(Response::intercept)
+ .orElseGet(Response::proceed);
+ }
+
+ protected Optional generateFileProtocolUrlRequestJob(Params params, String path) {
+ try {
+ String resourcePath = getResourcePath(path);
+ InputStream inputStream = getResourceStream(resourcePath);
+ String mimeType = MimeType.parseMimeType(resourcePath);
+ byte[] bytes;
+ if (isHtml(mimeType)) {
+ String text = IOUtils.inputStream2String(inputStream, EncodeConstants.ENCODING_UTF_8);
+ text = TemplateUtils.renderParameter4Tpl(text, renderParameterBuild.get());
+ bytes = text.getBytes(StandardCharsets.UTF_8);
+ } else {
+ bytes = IOUtils.inputStream2Bytes(inputStream);
+ }
+ return generateBasicUrlRequestJob(params, mimeType, bytes);
+ } catch (Exception e) {
+ FineLoggerFactory.getLogger().error(e.getMessage(), e);
+ }
+ return Optional.empty();
+ }
+
+ /**
+ * 获取资源文件流
+ *
+ * @param path 文件路径
+ * @return 输入流
+ * @throws Exception IO异常
+ */
+ private InputStream getResourceStream(String path) {
+ return IOUtils.readResource(path);
+ }
+
+ private static String getResourcePath(String path) throws UnsupportedEncodingException {
+ int index = path.indexOf("=");
+ if (index > 0) {
+ path = path.substring(index + 1);
+ } else {
+ // jxbrowser 7之后，协议会自动补齐双斜杠//
+ int i = path.indexOf(SCHEME_SPLIT);
+ path = path.substring(i + SCHEME_SPLIT.length());
+ // 通过自定义协议之后的url会自动encode一些中文字符，这里做一个decode，否则会导致路径访问失败
+ path = URLDecoder.decode(path, StandardCharsets.UTF_8.name());
+ }
+ return path;
+ }
+
+ private boolean isHtml(String mimeType) {
+ return MimeType.HTML.getMimeType().equals(mimeType);
+ }
+
+ private Optional generateBasicUrlRequestJob(Params params, String mimeType, byte[] bytes) {
+ if (StringUtils.isEmpty(mimeType)) {
+ return Optional.empty();
+ }
+ UrlRequestJob.Options options = UrlRequestJob.Options
+ .newBuilder(HttpStatus.OK)
+ .addHttpHeader(HttpHeader.of("Content-Type", mimeType))
+ .build();
+ UrlRequestJob urlRequestJob = params.newUrlRequestJob(options);
+ urlRequestJob.write(bytes);
+ urlRequestJob.complete();
+ return Optional.of(urlRequestJob);
+ }
+
+ private String htmlText(Map map) {
+ return component.get() == null ?
+ StringUtils.EMPTY :
+ parseComponent(component.get(), map);
+ }
+
+ @NotNull
+ private static String parseComponent(AssembleComponent component, Map map) {
+ PathGroup pathGroup = AtomBuilder.create().buildAssembleFilePath(ModernRequestClient.KEY, component);
+ StylePath[] stylePaths = pathGroup.toStylePathGroup();
+ StringBuilder styleText = new StringBuilder();
+ for (StylePath path : stylePaths) {
+ if (StringUtils.isNotBlank(path.toFilePath())) {
+ styleText.append("");
+ }
+ }
+ String result = ModernUIConstants.HTML_TPL.replaceAll("##style##", styleText.toString());
+ ScriptPath[] scriptPaths = pathGroup.toScriptPathGroup();
+ StringBuilder scriptText = new StringBuilder();
+ for (ScriptPath path : scriptPaths) {
+ if (StringUtils.isNotBlank(path.toFilePath())) {
+ scriptText.append("");
+ }
+ }
+ result = result.replaceAll("##script##", scriptText.toString());
+ if (map != null) {
+ for (Map.Entry entry : map.entrySet()) {
+ String key = entry.getKey();
+ String value = entry.getValue();
+ result = result.replaceAll("\\$\\{" + key + "}", value);
+ }
+ }
+ return result;
+ }
+}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/jxbrowser/PropertyBuild.java b/designer-base/src/main/java/com/fr/design/jxbrowser/PropertyBuild.java
new file mode 100644
index 0000000000..ca82ca2475
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/jxbrowser/PropertyBuild.java
@@ -0,0 +1,20 @@
+package com.fr.design.jxbrowser;
+
+import com.teamdev.jxbrowser.js.JsObject;
+
+/**
+ * 属性构建器
+ *
+ * @author vito
+ * @since 11.0
+ * Created on 2023/6/8
+ */
+public interface PropertyBuild {
+ /**
+ * 构建属性
+ *
+ * @param window js环境的window对象
+ * @return 待注入java对象
+ */
+ Object build(JsObject window);
+}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/BbsRegisterMark.java b/designer-base/src/main/java/com/fr/design/locale/impl/BbsRegisterMark.java
index afe1c8eef3..dfa425a3c0 100644
--- a/designer-base/src/main/java/com/fr/design/locale/impl/BbsRegisterMark.java
+++ b/designer-base/src/main/java/com/fr/design/locale/impl/BbsRegisterMark.java
@@ -1,13 +1,8 @@
package com.fr.design.locale.impl;
-import com.fr.general.CloudCenter;
-import com.fr.general.GeneralContext;
+import com.fr.design.i18n.LocaleLinkProvider;
import com.fr.general.locale.LocaleMark;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
/**
* @author hades
* @version 10.0
@@ -15,24 +10,19 @@ import java.util.Map;
*/
public class BbsRegisterMark implements LocaleMark {
- private final Map map = new HashMap<>();
- private static final String BBS_REGISTER_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "https://id.fanruan.com/register/register.php?clueSource=activityfr");
- private static final String BBS_REGISTER_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "https://id.fanruan.com/register/register.php?clueSource=activityfr");
- private static final String BBS_REGISTER_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
- private static final String BBS_REGISTER_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
- private static final String BBS_REGISTER_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
+ /**
+ * 云中心新账户中心链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_New_Account_Center";
- public BbsRegisterMark() {
- map.put(Locale.CHINA, BBS_REGISTER_CN);
- map.put(Locale.KOREA, BBS_REGISTER_KR);
- map.put(Locale.JAPAN, BBS_REGISTER_JP);
- map.put(Locale.US, BBS_REGISTER_EN);
- map.put(Locale.TAIWAN, BBS_REGISTER_TW);
- }
+ /**
+ * 云中心新账户中心链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_New_Account_Center_Default";
+ public BbsRegisterMark() {}
@Override
public String getValue() {
- String result = map.get(GeneralContext.getLocale());
- return result == null ? BBS_REGISTER_EN : result;
+ return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
}
}
diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/BbsResetMark.java b/designer-base/src/main/java/com/fr/design/locale/impl/BbsResetMark.java
index 27db28e416..49092d4f25 100644
--- a/designer-base/src/main/java/com/fr/design/locale/impl/BbsResetMark.java
+++ b/designer-base/src/main/java/com/fr/design/locale/impl/BbsResetMark.java
@@ -1,13 +1,8 @@
package com.fr.design.locale.impl;
-import com.fr.general.CloudCenter;
-import com.fr.general.GeneralContext;
+import com.fr.design.i18n.LocaleLinkProvider;
import com.fr.general.locale.LocaleMark;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
/**
* @author hades
* @version 10.0
@@ -15,24 +10,21 @@ import java.util.Map;
*/
public class BbsResetMark implements LocaleMark {
- private final Map map = new HashMap<>();
- private static final String BBS_RESET_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "https://id.fanruan.com/forget/forget.php?clue=activityfr");
- private static final String BBS_RESET_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "https://id.fanruan.com/forget/forget.php?clue=activityfr");
- private static final String BBS_RESET_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
- private static final String BBS_RESET_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
- private static final String BBS_RESET_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
- public BbsResetMark() {
- map.put(Locale.CHINA, BBS_RESET_CN);
- map.put(Locale.KOREA, BBS_RESET_KR);
- map.put(Locale.JAPAN, BBS_RESET_JP);
- map.put(Locale.US, BBS_RESET_EN);
- map.put(Locale.TAIWAN, BBS_RESET_TW);
- }
+ /**
+ * 云中心老账户中心链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Account_Center";
+
+ /**
+ * 云中心老账户中心链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Account_Center_Default";
+
+ public BbsResetMark() {}
@Override
public String getValue() {
- String result = map.get(GeneralContext.getLocale());
- return result == null ? BBS_RESET_EN : result;
+ return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
}
}
diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/BbsSpaceMark.java b/designer-base/src/main/java/com/fr/design/locale/impl/BbsSpaceMark.java
index 999c732845..a0b21d271a 100644
--- a/designer-base/src/main/java/com/fr/design/locale/impl/BbsSpaceMark.java
+++ b/designer-base/src/main/java/com/fr/design/locale/impl/BbsSpaceMark.java
@@ -1,13 +1,8 @@
package com.fr.design.locale.impl;
-import com.fr.general.CloudCenter;
-import com.fr.general.GeneralContext;
+import com.fr.design.i18n.LocaleLinkProvider;
import com.fr.general.locale.LocaleMark;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
/**
* @author hades
* @version 10.0
@@ -15,25 +10,20 @@ import java.util.Map;
*/
public class BbsSpaceMark implements LocaleMark {
- private final Map map = new HashMap<>();
- private static final String BBS_SPACE_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.default", "http://bbs.fanruan.com/home.php?mod=space&do=pm");
- private static final String BBS_SPACE_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.default", "http://bbs.fanruan.com/home.php?mod=space&do=pm");
- private static final String BBS_SPACE_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US", "https://community.finereport.com/home.php?mod=space&do=pm");
- private static final String BBS_SPACE_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US", "https://community.finereport.com/home.php?mod=space&do=pm");
- private static final String BBS_SPACE_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US", "https://community.finereport.com/home.php?mod=space&do=pm");
+ /**
+ * 云中心帆软社区消息中心链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Message_Center";
- public BbsSpaceMark() {
- map.put(Locale.CHINA, BBS_SPACE_CN);
- map.put(Locale.KOREA, BBS_SPACE_KR);
- map.put(Locale.JAPAN, BBS_SPACE_JP);
- map.put(Locale.US, BBS_SPACE_EN);
- map.put(Locale.TAIWAN, BBS_SPACE_TW);
- }
+ /**
+ * 云中心帆软社区消息中心链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Message_Center_Default";
+
+ public BbsSpaceMark() {}
@Override
public String getValue() {
- String result = map.get(GeneralContext.getLocale());
- return result == null ? BBS_SPACE_EN : result;
+ return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
}
-
}
diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/DataMaskMark.java b/designer-base/src/main/java/com/fr/design/locale/impl/DataMaskMark.java
new file mode 100644
index 0000000000..11312657b9
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/locale/impl/DataMaskMark.java
@@ -0,0 +1,30 @@
+package com.fr.design.locale.impl;
+
+import com.fr.design.i18n.LocaleLinkProvider;
+import com.fr.general.locale.LocaleMark;
+
+
+/**
+ * 根据图片信息生成获取国际化服务器图标工具
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2023/4/19
+ */
+public class DataMaskMark implements LocaleMark {
+
+ /**
+ * 云中心数据脱敏帮助链接链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Data_Mask";
+
+ /**
+ * 云中心数据脱敏默认帮助链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design_Report_Desensitization_Help_Document_Url";
+
+ @Override
+ public String getValue() {
+ return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/LineEngineMark.java b/designer-base/src/main/java/com/fr/design/locale/impl/LineEngineMark.java
new file mode 100644
index 0000000000..ebb5fd09a3
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/locale/impl/LineEngineMark.java
@@ -0,0 +1,28 @@
+package com.fr.design.locale.impl;
+
+import com.fr.design.i18n.LocaleLinkProvider;
+import com.fr.general.locale.LocaleMark;
+
+/**
+ * 根据国际化获取启用行式引擎执行层式报表帮助文档链接
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2023/4/19
+ */
+public class LineEngineMark implements LocaleMark {
+
+ /**
+ * 云中心启用行式引擎执行层式报表帮助链接链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Line_Engine";
+
+ /**
+ * 云中心启用行式引擎执行层式报表默认帮助链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Line_Engine_Default";
+ @Override
+ public String getValue() {
+ return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/locale/impl/VideoMark.java b/designer-base/src/main/java/com/fr/design/locale/impl/VideoMark.java
index 2521c82c23..571c5e02e9 100644
--- a/designer-base/src/main/java/com/fr/design/locale/impl/VideoMark.java
+++ b/designer-base/src/main/java/com/fr/design/locale/impl/VideoMark.java
@@ -16,7 +16,7 @@ public class VideoMark implements LocaleMark {
private Map map = new HashMap<>();
private static final String VIDEO_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.video.en_US", "http://www.finereport.com/en/Learning-path");
- private static final String VIDEO_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.video.zh_CN", "https://edu.fanruan.com/video?class1=16&class2=0");
+ private static final String VIDEO_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.video.zh_CN", "https://home.fanruan.com/finereport/video");
private static final String VIDEO_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.video.zh_TW", "http://www.finereport.com/tw/video");
public VideoMark() {
diff --git a/designer-base/src/main/java/com/fr/design/lock/LockFileReSaveEnum.java b/designer-base/src/main/java/com/fr/design/lock/LockFileReSaveEnum.java
new file mode 100644
index 0000000000..3feeb0a0b5
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/lock/LockFileReSaveEnum.java
@@ -0,0 +1,64 @@
+package com.fr.design.lock;
+
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.file.TemplateTreePane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.utils.TemplateUtils;
+import com.fr.file.FileNodeFILE;
+import com.fr.file.filetree.FileNode;
+import com.fr.stable.StableUtils;
+import com.fr.stable.project.ProjectConstants;
+
+/**
+ * 被锁住的文件重新保存副本时的处理枚举类
+ *
+ * @author Roger
+ * @since 11.0
+ * Created on 2023/12/21
+ */
+public enum LockFileReSaveEnum {
+
+ /**
+ * 保存目录树里面的模板副本
+ */
+ TEMPLATE_TREE() {
+ @Override
+ public void action() {
+ FileNode node = TemplateTreePane.getInstance().getFileNode();
+ if (node == null) {
+ return;
+ }
+ final String selectedFilePath = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, TemplateTreePane.getInstance().getFilePath());
+ TemplateUtils.createAndReOpenTemplate(
+ Toolkit.i18nText("Fine_Design_Template_Lock_Copy"),
+ new FileNodeFILE(new FileNode(selectedFilePath, false)),
+ false,
+ true);
+ }
+ },
+
+ /**
+ * 保存设计器里面已经打开的模板副本
+ */
+ HISTORY_TEMPLATE_CACHE() {
+ @Override
+ public void action() {
+ JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+ if (JTemplate.isValid(template)) {
+ TemplateUtils.createAndOpenTemplate(
+ Toolkit.i18nText("Fine_Design_Template_Backup"),
+ new FileNodeFILE(new FileNode(template.getPath(), false)),
+ true,
+ true,
+ //另存之后需要关闭的模板
+ template);
+ }
+ }
+ };
+
+ /**
+ * 如何保存模板副本
+ */
+ public abstract void action();
+}
diff --git a/designer-base/src/main/java/com/fr/design/lock/LockInfoDialog.java b/designer-base/src/main/java/com/fr/design/lock/LockInfoDialog.java
index 003215ca6c..c183dac2e9 100644
--- a/designer-base/src/main/java/com/fr/design/lock/LockInfoDialog.java
+++ b/designer-base/src/main/java/com/fr/design/lock/LockInfoDialog.java
@@ -8,15 +8,14 @@ import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrameFileDealerPane;
-import com.fr.design.utils.TemplateUtils;
import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.file.FileNodeFILE;
-import com.fr.file.filetree.FileNode;
import com.fr.general.IOUtils;
-import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
-import com.fr.stable.project.ProjectConstants;
import com.fr.workspace.base.UserInfo;
+
+import javax.swing.BorderFactory;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.FlowLayout;
@@ -24,9 +23,6 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import javax.swing.BorderFactory;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
/**
* @author hades
@@ -37,8 +33,11 @@ public class LockInfoDialog extends JDialog {
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm");
- public LockInfoDialog(UserInfo userInfo) {
+ private final LockFileReSaveEnum saveEnum;
+
+ public LockInfoDialog(UserInfo userInfo, LockFileReSaveEnum saveEnum) {
super(DesignerContext.getDesignerFrame());
+ this.saveEnum = saveEnum;
JPanel panel = new JPanel(new BorderLayout());
panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
panel.add(createContentPane(userInfo), BorderLayout.CENTER);
@@ -94,16 +93,7 @@ public class LockInfoDialog extends JDialog {
@Override
public void actionPerformed(ActionEvent e) {
dispose();
- FileNode node = TemplateTreePane.getInstance().getFileNode();
- if (node == null) {
- return;
- }
- final String selectedFilePath = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, TemplateTreePane.getInstance().getFilePath());
- TemplateUtils.createAndOpenTemplate(
- Toolkit.i18nText("Fine_Design_Template_Lock_Copy"),
- new FileNodeFILE(new FileNode(selectedFilePath, false)),
- false,
- true);
+ saveEnum.action();
}
});
cancelButton.addActionListener(new ActionListener() {
@@ -118,9 +108,25 @@ public class LockInfoDialog extends JDialog {
}
+ /**
+ * 显示模板被人锁住了的弹窗信息
+ *
+ * @param userInfo 拥有锁的用户信息
+ */
public static void show(UserInfo userInfo) {
DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(TemplateTreePane.getInstance().getFileNode());
- new LockInfoDialog(userInfo);
+ new LockInfoDialog(userInfo, LockFileReSaveEnum.TEMPLATE_TREE);
+ }
+
+ /**
+ * 显示模板被人锁住了的弹窗信息,并以指定方式保存副本模板
+ *
+ * @param userInfo 拥有锁的用户信息
+ * @param saveEnum 指定保存副本模板的处理方式
+ */
+ public static void show(UserInfo userInfo, LockFileReSaveEnum saveEnum) {
+ DesignerFrameFileDealerPane.getInstance().refreshRightToolBarBy(TemplateTreePane.getInstance().getFileNode());
+ new LockInfoDialog(userInfo, saveEnum);
}
}
diff --git a/designer-base/src/main/java/com/fr/design/lock/TemplateLockInfoReSave.java b/designer-base/src/main/java/com/fr/design/lock/TemplateLockInfoReSave.java
new file mode 100644
index 0000000000..f1f927abb1
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/lock/TemplateLockInfoReSave.java
@@ -0,0 +1,56 @@
+package com.fr.design.lock;
+
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
+import com.fr.log.FineLoggerFactory;
+import com.fr.report.lock.LockInfoOperator;
+import com.fr.stable.collections.CollectionUtils;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.Workspace;
+import com.fr.workspace.WorkspaceEvent;
+
+import java.util.List;
+
+/**
+ * 更新模板锁信息
+ *
+ * @author Roger
+ * @since 11.0
+ * Created on 2023/12/11
+ */
+public class TemplateLockInfoReSave {
+
+ private static Listener listener = new Listener() {
+ @Override
+ public void on(Event event, Workspace workspace) {
+ List> templates = HistoryTemplateListCache.getInstance().getHistoryList();
+ if (CollectionUtils.isEmpty(templates)) {
+ return;
+ }
+ String[] paths = templates.stream().map(JTemplate::getPath).toArray(String[]::new);
+ String[] lockedPath = WorkContext.getCurrent().get(LockInfoOperator.class).lockTemplates(paths);
+ FineLoggerFactory.getLogger().warn("template lock failed:{}", String.join(";", lockedPath));
+ }
+ };
+
+ /**
+ * 启动监听
+ */
+ public static void startListener() {
+ if (!WorkContext.getCurrent().isLocal()) {
+ EventDispatcher.listen(WorkspaceEvent.ConnectSuccess, listener);
+ }
+ }
+
+ /**
+ * 停止事件监听
+ */
+ public static void stopListener() {
+ if (!WorkContext.getCurrent().isLocal()) {
+ EventDispatcher.stopListen(listener);
+ }
+ }
+}
diff --git a/designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java b/designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java
index 4d0ba8a41c..ad7d180552 100644
--- a/designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java
+++ b/designer-base/src/main/java/com/fr/design/login/DesignerLoginBridge.java
@@ -5,10 +5,11 @@ import com.fr.design.bridge.exec.JSCallback;
import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ilable.ActionLabel;
import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.LocaleLinkProvider;
import com.fr.design.i18n.Toolkit;
+import com.fr.design.jxbrowser.BrowserExecutor;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.locale.impl.BbsResetMark;
-import com.fr.design.login.executor.DesignerLoginBrowserExecutor;
import com.fr.design.login.executor.DesignerLoginExecutor;
import com.fr.design.login.executor.DesignerSendCaptchaExecutor;
import com.fr.design.login.executor.DesignerSmsLoginExecutor;
@@ -20,40 +21,58 @@ import com.fr.general.CloudCenter;
import com.fr.general.locale.LocaleCenter;
import com.fr.general.locale.LocaleMark;
import com.fr.log.FineLoggerFactory;
-import com.teamdev.jxbrowser.chromium.Browser;
-import com.teamdev.jxbrowser.chromium.JSFunction;
-import com.teamdev.jxbrowser.chromium.JSObject;
+import com.teamdev.jxbrowser.js.JsAccessible;
+import com.teamdev.jxbrowser.js.JsFunction;
+import com.teamdev.jxbrowser.js.JsObject;
+
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.net.URI;
import java.util.Map;
import java.util.Set;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
/**
+ * 设计器登录通行证js-java桥
+ *
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
+@JsAccessible
public class DesignerLoginBridge {
- private Map params;
+ /**
+ * 云中心组件商城模板在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Market_Template";
+
+ /**
+ * 云中心组件商城模板默认链接在配置文件中对应的配置文件key
+ */
+ private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Market_Template_Default";
- public static DesignerLoginBridge getBridge(Browser browser, Map params) {
- return new DesignerLoginBridge(browser, params);
+ private final Map params;
+
+ /**
+ * 获取 js-java bridge
+ *
+ * @param window 全局环境
+ * @return bridge
+ */
+ public static DesignerLoginBridge getBridge(JsObject window, Map params) {
+ return new DesignerLoginBridge(window, params);
}
- private JSObject window;
+ private final JsObject window;
- private DesignerLoginBridge(Browser browser, Map params) {
+ private DesignerLoginBridge(JsObject window, Map params) {
this.params = params;
- this.window = browser.executeJavaScriptAndReturnValue("window").asObject();
+ this.window = window;
Set> entries = params.entrySet();
for (Map.Entry entry : entries) {
- this.window.setProperty(entry.getKey(), entry.getValue());
+ this.window.putProperty(entry.getKey(), entry.getValue());
}
}
@@ -71,7 +90,7 @@ public class DesignerLoginBridge {
getHyperlinkPane(
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Guide_Login_Success_Title"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Guide_Login_Success_Hyperlink_Text"),
- CloudCenter.getInstance().acquireUrlByKind("designer.premium.template", "https://market.fanruan.com/template")
+ LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT)
)
);
} else if (source == DesignerLoginSource.BBS_JUMP) {
@@ -171,9 +190,9 @@ public class DesignerLoginBridge {
* @param callback 回调函数
*/
@JSBridge
- public void normalLogin(String username, String password, final JSFunction callback) {
+ public void normalLogin(String username, String password, final JsFunction callback) {
DesignerLoginTaskWorker worker = new DesignerLoginTaskWorker<>(
- new JSCallback(DesignerLoginBrowserExecutor.create(window, callback)),
+ new JSCallback(BrowserExecutor.create(window, callback)),
new DesignerLoginExecutor(username, password));
worker.execute();
}
@@ -186,9 +205,9 @@ public class DesignerLoginBridge {
* @param callback 回调函数
*/
@JSBridge
- public void sendCaptcha(String regionCode, String phone, final JSFunction callback) {
+ public void sendCaptcha(String regionCode, String phone, final JsFunction callback) {
DesignerLoginTaskWorker worker = new DesignerLoginTaskWorker<>(
- new JSCallback(DesignerLoginBrowserExecutor.create(window, callback)),
+ new JSCallback(BrowserExecutor.create(window, callback)),
new DesignerSendCaptchaExecutor(regionCode, phone));
worker.execute();
}
@@ -202,9 +221,9 @@ public class DesignerLoginBridge {
* @param callback 回调函数
*/
@JSBridge
- public void smsLogin(String regionCode, String phone, String code, final JSFunction callback) {
+ public void smsLogin(String regionCode, String phone, String code, final JsFunction callback) {
DesignerLoginTaskWorker worker = new DesignerLoginTaskWorker<>(
- new JSCallback(DesignerLoginBrowserExecutor.create(window, callback)),
+ new JSCallback(BrowserExecutor.create(window, callback)),
new DesignerSmsLoginExecutor(regionCode, phone, code));
worker.execute();
}
@@ -219,9 +238,9 @@ public class DesignerLoginBridge {
* @param callback 回调函数
*/
@JSBridge
- public void smsRegister(String regionCode, String phone, String password, String regToken, final JSFunction callback) {
+ public void smsRegister(String regionCode, String phone, String password, String regToken, final JsFunction callback) {
DesignerLoginTaskWorker worker = new DesignerLoginTaskWorker<>(
- new JSCallback(DesignerLoginBrowserExecutor.create(window, callback)),
+ new JSCallback(BrowserExecutor.create(window, callback)),
new DesignerSmsRegisterExecutor(regionCode, phone, password, regToken));
worker.execute();
}
@@ -263,13 +282,10 @@ public class DesignerLoginBridge {
private JPanel getHyperlinkPane(String title, String hyperlinkText, String hyperlink) {
ActionLabel actionLabel = new ActionLabel(hyperlinkText);
- actionLabel.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- try {
- Desktop.getDesktop().browse(new URI(hyperlink));
- } catch (Exception ignore) {
- }
+ actionLabel.addActionListener(e -> {
+ try {
+ Desktop.getDesktop().browse(new URI(hyperlink));
+ } catch (Exception ignore) {
}
});
JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
diff --git a/designer-base/src/main/java/com/fr/design/login/DesignerLoginPane.java b/designer-base/src/main/java/com/fr/design/login/DesignerLoginPane.java
index be5df3a84d..73811c0c83 100644
--- a/designer-base/src/main/java/com/fr/design/login/DesignerLoginPane.java
+++ b/designer-base/src/main/java/com/fr/design/login/DesignerLoginPane.java
@@ -2,21 +2,23 @@ package com.fr.design.login;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.BasicPane;
+import com.fr.design.jxbrowser.JxUIPane;
import com.fr.design.login.utils.DesignerLoginUtils;
-import com.fr.design.ui.ModernUIPane;
-import com.teamdev.jxbrowser.chromium.JSValue;
-import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
-import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
+
import java.awt.BorderLayout;
import java.util.Map;
/**
+ * 设计器登录通行证面板
+ *
* @author Lanlan
* @version 10.0
* Created by Lanlan on 2021/5/21
*/
public class DesignerLoginPane extends BasicPane {
+ private static final String DESIGNER_LOGIN_HELPER = "DesignerLoginHelper";
+
@Override
protected String title4PopupWindow() {
return "DESIGNER_LOGIN";
@@ -27,14 +29,8 @@ public class DesignerLoginPane extends BasicPane {
params.put("lastLoginType", String.valueOf(DesignerEnvManager.getEnvManager().getLastLoginType().getType()));
params.put("lastLoginAccount", DesignerEnvManager.getEnvManager().getLastLoginAccount());
setLayout(new BorderLayout());
- ModernUIPane