修改apose控件

doc-transform-manager/doc-transform-manager.iml

@@ -145,7 +145,9 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.15.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.2.15.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
-    <orderEntry type="library" name="Maven: com.aspose.words:aspose-words:jdk16:19.2" level="project" />
+    <orderEntry type="library" name="Maven: com.aspose:aspose-words:jdk17:20.1" level="project" />
+    <orderEntry type="library" name="Maven: com.aspose:aspose-words:shaping-harfbuzz-plugin:20.1" level="project" />
+    <orderEntry type="library" name="Maven: com.aspose:aspose-words:javadoc:20.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-mock:2.0.8" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />

doc-transform-manager/pom.xml

@@ -139,12 +139,19 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.aspose.words</groupId>
+			<groupId>com.aspose</groupId>
 			<artifactId>aspose-words</artifactId>
-			<version>19.2</version>
-			<classifier>jdk16</classifier>
+			<version>20.1</version>
+			<classifier>jdk17</classifier>
 		</dependency>
 
+<!--		<dependency>-->
+<!--			<groupId>com.aspose.words</groupId>-->
+<!--			<artifactId>aspose-words</artifactId>-->
+<!--			<version>19.2</version>-->
+<!--			<classifier>jdk16</classifier>-->
+<!--		</dependency>-->
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>

doc-transform-manager/src/main/java/com/mortals/xhx/common/formdesign/ColumnsItem.java

@@ -77,6 +77,12 @@ public class ColumnsItem {
     @JSONField(name="range-separator")
     private String rangeSeparator;
 
+    @JSONField(name="start-placeholder")
+    private String startPlaceholder;
+
+    @JSONField(name="end-placeholder")
+    private String endPlaceholder;
+
     @JSONField(name="format")
     private String format;
 

doc-transform-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignCheckboxComponent.java

@@ -11,6 +11,7 @@ import com.mortals.xhx.common.formdesign.OptionsItem;
 import com.mortals.xhx.common.pdu.gen.component.ComponentCons;
 import com.mortals.xhx.common.utils.ExportDocUtil;
 import com.mortals.xhx.common.utils.StringUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,9 +68,15 @@ public class DesignCheckboxComponent extends DesignComponent {
         return columnsItem;
     }
 
+    /**
+     *  值格式 *党员-非党员-群众*
+     * @param cons
+     * @param columnsItem
+     */
     private void initDefaultCheckBoxValue(ComponentCons cons, ListItem columnsItem) {
-        if (cons.getLabel().indexOf("[") != -1) {
-            String cks = StringUtils.substringBetween(cons.getLabel(), "[", "]");
+        if (cons.getLabel().indexOf("*") != -1) {
+            String cks = StringUtils.substringBetween(cons.getLabel(), "*", "*");
+            if(ObjectUtils.isEmpty(cks))return;
             List<OptionsItem> optionsItemList = StrUtil.splitTrim(cks, "-", -1).stream().map(option -> {
                 OptionsItem options = new OptionsItem();
                 options.setLabel(option);
@@ -78,8 +85,8 @@ public class DesignCheckboxComponent extends DesignComponent {
             }).collect(Collectors.toList());
             columnsItem.setOptions(optionsItemList);
 
-            cons.setVal(cons.getVal().substring(0, cons.getVal().indexOf("[")));
-            cons.setLabel(cons.getLabel().substring(0, cons.getLabel().indexOf("[")));
+           // cons.setVal(cons.getVal().substring(0, cons.getVal().indexOf("[")));
+           // cons.setLabel(cons.getLabel().substring(0, cons.getLabel().indexOf("[")));
 
         }
     }

doc-transform-manager/src/main/java/com/mortals/xhx/common/formdesign/component/DesignDynamicTableComponent.java

@@ -57,11 +57,11 @@ public class DesignDynamicTableComponent extends DesignComponent {
                     //创建输入框出初始值
                     columnsItem.setId(item.getVal());
                     columnsItem.set_id(item.getVal());
-                    columnsItem.setCompType("el-input");
+                    columnsItem.setCompType("input");
                     columnsItem.setCompName("单行文本");
                     columnsItem.setCompIcon("input");
                     columnsItem.setViewType("text");
-                    columnsItem.setEle("input");
+                    columnsItem.setEle("el-input");
                     columnsItem.setConfig(true);
                     columnsItem.setShowLabel(true);
                     columnsItem.setLabel(item.getLabel());
@@ -77,6 +77,7 @@ public class DesignDynamicTableComponent extends DesignComponent {
                     columnsItem.setReadonly(false);
                     columnsItem.setStatus("normal");
                     columnsItem.setPrefixIcon("");
+                    columnsItem.setSuffixIcon("");
                     columnsItem.setValue("");
                     columnsItem.setRules(Lists.newArrayList());
                     columnsItem.setRulesType("default");
@@ -130,9 +131,18 @@ public class DesignDynamicTableComponent extends DesignComponent {
                     columnsItem.setMaxLength(50);
                     columnsItem.setGutter(15);
                     columnsItem.setSpan(12);
+                    columnsItem.setValue("");
+                    columnsItem.setClearable(true);
+                    columnsItem.setDisabled(false);
+                    columnsItem.setReadonly(false);
+//                    columnsItem.setRangeSeparator("-");
+//                    columnsItem.setFormat("yyyy-MM-dd");
+//                    columnsItem.setValueFormat("yyyy-MM-dd");
                     columnsItem.setRangeSeparator(" ");
                     columnsItem.setFormat("yyyy 年 MM 月 dd 日");
                     columnsItem.setValueFormat("yyyy 年 MM 月 dd 日");
+                    columnsItem.setStartPlaceholder("开始日期");
+                    columnsItem.setEndPlaceholder("结束日期");
                     columnsItem.setLayout("colItem");
                 }
                 return columnsItem;

doc-transform-manager/src/main/java/com/mortals/xhx/module/doc/baseinfo/service/impl/DocBaseinfoServiceImpl.java

@@ -104,7 +104,6 @@ public class DocBaseinfoServiceImpl extends AbstractCRUDServiceImpl<DocBaseinfoD
             docTemplateService.save(subEntity, context);
             //解析模板变量
             //docTemplateService.parseDocXml(subEntity, context);
-
             //TODO
             docTemplateService.parseDocxToJson(subEntity,context);
         }