瀏覽代碼

调整覆盖写入开关

AE86 1 年之前
父節點
當前提交
b9ef000869

+ 1 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -98,8 +98,7 @@ public class MappingChecker extends AbstractChecker {
         mapping.setReadNum(NumberUtil.toInt(params.get("readNum"), mapping.getReadNum()));
         mapping.setBatchNum(NumberUtil.toInt(params.get("batchNum"), mapping.getBatchNum()));
         mapping.setThreadNum(NumberUtil.toInt(params.get("threadNum"), mapping.getThreadNum()));
-        String forceUpdate = StringUtils.equals(mapping.getModel(), ModelEnum.FULL.getCode()) ? "forceUpdate4Full" : "forceUpdate";
-        mapping.setForceUpdate(StringUtil.isBlank(params.get(forceUpdate)));
+        mapping.setForceUpdate(StringUtil.isBlank(params.get("forceUpdate")));
 
         // 增量配置(日志/定时)
         String incrementStrategy = params.get("incrementStrategy");

+ 3 - 4
dbsyncer-web/src/main/resources/public/mapping/edit.html

@@ -117,15 +117,15 @@
                                 <div th:replace="mapping/editIncrement :: content"></div>
                             </div>
 
-                            <!-- 参数配置 -->
-                            <div th:replace="mapping/editParameter :: content"></div>
-
                             <!-- 过滤条件 -->
                             <div th:replace="mapping/editFilter :: content"></div>
 
                             <!-- 转换配置 -->
                             <div th:replace="mapping/editConvert :: content"></div>
 
+                            <!-- 策略配置 -->
+                            <div th:replace="mapping/editParameter :: content"></div>
+
                             <!-- 插件配置 -->
                             <div th:replace="mapping/editPlugin :: content"></div>
                         </div>
@@ -139,7 +139,6 @@
 </div>
 
 <script th:src="@{/js/mapping/edit.js}"></script>
-<script th:src="@{/js/mapping/editParam.js}"></script>
 <script th:src="@{/js/mapping/editFilterAndConvert.js}"></script>
 <script th:src="@{/js/mapping/editIncrement.js}"></script>
 </html>

+ 0 - 11
dbsyncer-web/src/main/resources/public/mapping/editFull.html

@@ -27,16 +27,5 @@
             </div>
         </div>
     </div>
-    <div class="form-group">
-        <div class="row">
-            <div class="col-md-4">
-                <label class="col-sm-3 control-label text-right">覆盖 <i class="fa fa-question-circle fa_gray" aria-hidden="true" title="[开启]-目标表不存在该条数据时, 会执行insert, 存在,会执行update; [关闭]-不生效"></i></label>
-                <div class="col-sm-9">
-                    <input name="forceUpdate" class="banEventSwitch" th:checked="${mapping?.forceUpdate}" type="checkbox">
-                </div>
-            </div>
-            <div class="col-md-8"></div>
-        </div>
-    </div>
 </div>
 </html>

+ 1 - 7
dbsyncer-web/src/main/resources/public/mapping/editIncrement.html

@@ -77,13 +77,7 @@
                     <input name="banDDL" class="banEventSwitch" th:checked="${mapping?.listener?.banDDL}" type="checkbox">
                 </div>
             </div>
-            <div class="col-md-4">
-                <label class="col-sm-3 control-label text-right">覆盖 <i class="fa fa-question-circle fa_gray" aria-hidden="true" title="[开启]-目标表不存在该条数据时, 会执行insert, 存在,会执行update; [关闭]-不生效"></i></label>
-                <div class="col-sm-9">
-                    <input name="forceUpdate" class="banEventSwitch" th:checked="${mapping?.forceUpdate}" type="checkbox">
-                </div>
-            </div>
-            <div class="col-md-4"></div>
+            <div class="col-md-8"></div>
         </div>
     </div>
     <!-- 定时配置 -->

+ 12 - 17
dbsyncer-web/src/main/resources/public/mapping/editParameter.html

@@ -2,32 +2,27 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org" lang="zh-CN">
 
-<div th:fragment="content" th:if="${'Oracle' eq mapping?.sourceConnector?.config?.connectorType}">
-    <p class="text-muted">参数配置</p>
+<div th:fragment="content">
+    <p class="text-muted">策略配置</p>
 
-    <div id="paramsList" class="form-group">
+    <div class="form-group">
         <div class="row">
             <div class="col-md-4">
-                <label class="col-sm-3 control-label text-right"><span title="区分Oracle增量同步数据字段,会将该字段设置为目标源唯一主键">ROWID</span></label>
+                <label class="col-sm-3 control-label text-right">覆盖 <i class="fa fa-question-circle fa_gray" aria-hidden="true" title="[支持]-目标表不存在该条数据时, 会执行insert, 存在,会执行update; [禁用]-不生效"></i></label>
                 <div class="col-sm-9">
-                    <select id="oracleRowId" name="ORACLE_ROW_ID" class="form-control select-control-default">
-                        <option value="" selected="selected">无</option>
-                        <!-- Mapping params -->
-                        <option th:if="${tableGroup} == null" th:each="c,s:${mapping?.targetColumn}" th:value="${c?.name}" th:text="${c?.name} +' (' + ${c?.typeName} +')'" th:selected="${c?.name eq mapping?.params?.get('ORACLE_ROW_ID')}"/>
-
-                        <!-- TableGroup params -->
-                        <option th:each="c,s:${tableGroup?.targetTable?.column}" th:value="${c?.name}" th:text="${c?.name} +' (' + ${c?.typeName} +')'" th:selected="${c?.name eq tableGroup?.params?.get('ORACLE_ROW_ID')}"/>
-                    </select>
+                    <input name="forceUpdate" class="banEventSwitch" th:checked="!${mapping?.forceUpdate}" type="checkbox">
+                </div>
+            </div>
+            <div class="col-md-4">
+                <label class="col-sm-3 control-label">扩展参数</label>
+                <div class="col-sm-9">
+                    <textarea id="extInfo" name="extInfo" class="form-control dbsyncer_textarea_resize_none" maxlength="512" rows="5">{"key": "test"}</textarea>
                 </div>
             </div>
-            <div class="col-md-8"></div>
+            <div class="col-md-4"></div>
         </div>
     </div>
 
-    <!-- 隐藏表单值 -->
-    <div class="form-group hidden">
-        <input id="params" name="params" class="form-control" type="text"/>
-    </div>
 </div>
 
 </html>

+ 0 - 26
dbsyncer-web/src/main/resources/static/js/mapping/editParam.js

@@ -1,26 +0,0 @@
-// 绑定高级配置参数配置
-function bingMappingParamsInputClick(){
-    var $paramsList = $("#paramsList");
-    var $select = $paramsList.find("select");
-    genMappingParams($select);
-    // 下拉切换事件
-    $select.change(function () {
-        genMappingParams($select);
-    });
-}
-
-// 生成参数配置
-function genMappingParams($select){
-    var params = {};
-    $select.each(function () {
-        if('' != $(this).val()){
-            params[$(this).attr("name")] = $(this).val();
-        }
-    })
-    $("#params").val(JSON.stringify(params));
-}
-
-$(function() {
-    // 绑定高级配置参数配置
-    bingMappingParamsInputClick();
-});