Merge pull request '更新 'src/main/resources/com/fr/plugin/showtype/web/show_types.js'' (#3) from dailer/demo-show-type:master into master

Reviewed-on: fanruan/demo-show-type#3

plugin.xml

@@ -5,18 +5,18 @@
     <active>yes</active>
     <version>1.0</version>
     <env-version>10.0</env-version>
-    <jartime>2020-08-24</jartime>
+    <jartime>2020-08-27</jartime>
     <vendor>finereport.mata</vendor>
     <description><![CDATA[新预览显示类型]]></description>
     <change-notes><![CDATA[
-        <p>[2020-08-24]新预览显示类型</p>
+        <p>[2020-08-27]新预览显示类型</p>
     ]]>
     </change-notes>
     <extra-core>
         <LocaleFinder class="com.fr.plugin.showtype.NewPreviewTypeLocaleFinder"/>
     </extra-core>
     <extra-decision>
-        <ShowTypeProvider class="com.fr.plugin.showtype.NewPreviewType"/>
+        <ShowTypeProvider class="com.fr.plugin.showtype.NewPreviewTypeProvider"/>
     </extra-decision>
     <function-recorder class="com.fr.plugin.showtype.NewPreviewType"/>
     <lifecycle-monitor class="com.fr.plugin.showtype.NewPreviewInitializeMonitor"/>

src/main/java/com/fr/plugin/showtype/NewPreviewType.java

@@ -1,38 +1,28 @@
 package com.fr.plugin.showtype;
 
-import com.fr.decision.fun.impl.AbstractShowTypeProvider;
-import com.fr.decision.web.DirectoryComponent;
+import com.fr.decision.authority.base.constant.type.show.ShowType;
 import com.fr.intelli.record.Focus;
 import com.fr.intelli.record.Original;
 import com.fr.record.analyzer.EnableMetrics;
-import com.fr.web.struct.Atom;
 
 /**
  * @Author Roger
- * @Date 2020/8/18 17:42
+ * @Date 2020/8/18 18:18
  * @Version 10.0
  */
 @EnableMetrics
-public class NewPreviewType extends AbstractShowTypeProvider {
+public class NewPreviewType extends ShowType {
 
-    @Override
-    public Atom attach() {
-        return DirectoryComponent.KEY;
-    }
+    public static final NewPreviewType KEY = new NewPreviewType();
 
     @Override
-    public Atom client() {
-        return NewPreviewComponent.KEY;
+    @Focus(id = "com.fr.plugin.showtype.v10", text = "Fine-Plugin_New_Preview_Type", source = Original.PLUGIN)
+    protected int getTypeValue() {
+        return 8;
     }
 
     @Override
-    public String typeName() {
+    public String getTypeName() {
         return "newPreview";
     }
-
-    @Override
-    @Focus(id = "com.fr.plugin.showtype.v10", text = "Fine-Plugin_New_Preview_Type", source = Original.PLUGIN)
-    public int typeValue() {
-        return 5;
-    }
 }

src/main/java/com/fr/plugin/showtype/NewPreviewTypeProvider.java

@@ -0,0 +1,34 @@
+package com.fr.plugin.showtype;
+
+import com.fr.decision.authority.base.constant.type.show.ShowType;
+import com.fr.decision.fun.impl.AbstractShowTypeProvider;
+import com.fr.decision.web.DirectoryComponent;
+import com.fr.web.struct.Atom;
+
+/**
+ * @Author Roger
+ * @Date 2020/8/18 17:42
+ * @Version 10.0
+ */
+public class NewPreviewTypeProvider extends AbstractShowTypeProvider {
+
+    @Override
+    public String nameForShowType() {
+        return "newPreview";
+    }
+
+    @Override
+    public ShowType registerShowType() {
+        return NewPreviewType.KEY;
+    }
+
+    @Override
+    public Atom attach() {
+        return DirectoryComponent.KEY;
+    }
+
+    @Override
+    public Atom client() {
+        return NewPreviewComponent.KEY;
+    }
+}

src/main/resources/com/fr/plugin/showtype/web/show_types.js

@@ -7,7 +7,7 @@
                     {
                         text: BI.i18nText("新预览"),
                         defaultValue: true,
-                        value: 5,
+                        value: 8,
                     },
                 ],
             },
@@ -22,7 +22,7 @@
                     {
                         text: BI.i18nText("新预览"),
                         defaultValue: true,
-                        value: 5,
+                        value: 8,
                     },
                 ],
             },