业务对象关联动态表单修改

dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationAdd.js

-
-layui.config({
-    base: basePath,
-    version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'form'], function (exports) {
-    winui.renderColor();
-    var index = parent.layer.getFrameIndex(window.name);
-    var $ = layui.$,
-        form = layui.form;
-    var rowNum = 1; // 表格的序号
-    var usetableTemplate = $("#usetableTemplate").html();
-
-    dsFormUtil.loadDsFormPageTypeByPId("firstTypeId", "0");
-    form.on('select(firstTypeId)', function(data) {
-        var thisRowValue = data.value;
-        dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", isNull(thisRowValue) ? "-" : thisRowValue);
-        form.render('select');
-    });
-
-    matchingLanguage();
-    form.render();
-    form.on('submit(formAddBean)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-            var rowTr = $("#useTable tr");
-            var formPageId = new Array();
-            $.each(rowTr, function(i, item) {
-                // 获取行编号
-                var rowNum = $(item).attr("trcusid").replace("tr", "");
-                formPageId.push($("#dsFormChooseList" + rowNum).attr("dataId"));
-            });
-
-            var params = {
-                title: $("#title").val(),
-                titleEn: $("#titleEn").val(),
-                codeNum: $("#codeNum").val(),
-                firstTypeId: $("#firstTypeId").val(),
-                secondTypeId: $("#secondTypeId").val(),
-                remark: $("#remark").val(),
-                dsFormPageIds: formPageId.join(",")
-            };
-            AjaxPostUtil.request({url: flowableBasePath + "dsFormObjectRelation002", params: params, type: 'json', method: "POST", callback: function (json) {
-                parent.layer.close(index);
-                parent.refreshCode = '0';
-            }});
-        }
-        return false;
-    });
-
-    // 新增行
-    $("body").on("click", "#addRow", function() {
-        addRow();
-    });
-
-    // 删除行
-    $("body").on("click", "#deleteRow", function() {
-        deleteRow();
-    });
-
-    // 新增行
-    function addRow() {
-        var par = {
-            id: "row" + rowNum.toString(), //checkbox的id
-            trId: "tr" + rowNum.toString(), //行的id
-            dsFormChooseList: "dsFormChooseList"  + rowNum.toString(), // 动态表单选择id
-            pageName: "pageName" + rowNum.toString() // 动态表单页面名称id
-        };
-        $("#useTable").append(getDataUseHandlebars(usetableTemplate, par));
-        form.render('checkbox');
-        rowNum++;
-
-        // 加载动添表单选择按钮的点击事件
-        var btnId = par.dsFormChooseList + "Btn";
-        $("body").on("click", "#" + btnId, function (e) {
-            dsFormUtil.chooseType = false; // 单选
-            dsFormUtil.openDsFormPageChoosePage(function (){
-                $("#" + par.dsFormChooseList).val(dsFormUtil.dsFormChooseMation.pageNum);
-                $("#" + par.dsFormChooseList).attr("dataId", dsFormUtil.dsFormChooseMation.id);
-                $("#" + par.pageName).html(dsFormUtil.dsFormChooseMation.pageName);
-            });
-        });
-    }
-
-    // 删除行
-    function deleteRow() {
-        var checkRow = $("#useTable input[type='checkbox'][name='tableCheckRow']:checked");
-        if(checkRow.length > 0) {
-            $.each(checkRow, function(i, item) {
-                $(item).parent().parent().remove();
-            });
-        } else {
-            winui.window.msg('请选择要删除的行', {icon: 2, time: 2000});
-        }
-    }
-
-    $("body").on("click", "#cancle", function() {
-        parent.layer.close(index);
-    });
-});
\ No newline at end of file

dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js

@@ -29,18 +29,6 @@ layui.config({
                 $("#pageName" + (rowNum - 1)).html(item.pageName);
             })
 
-            dsFormUtil.loadDsFormPageTypeByPId("firstTypeId", "0");
-            $("#firstTypeId").val(json.bean.firstTypeId);
-
-            dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", json.bean.firstTypeId);
-            $("#secondTypeId").val(json.bean.secondTypeId);
-
-            form.on('select(firstTypeId)', function(data) {
-                var thisRowValue = data.value;
-                dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", isNull(thisRowValue) ? "-" : thisRowValue);
-                form.render('select');
-            });
-
             matchingLanguage();
             form.render();
             form.on('submit(formEditBean)', function (data) {
@@ -54,12 +42,6 @@ layui.config({
                     });
 
                     var params = {
-                        title: $("#title").val(),
-                        titleEn: $("#titleEn").val(),
-                        codeNum: $("#codeNum").val(),
-                        firstTypeId: $("#firstTypeId").val(),
-                        secondTypeId: $("#secondTypeId").val(),
-                        remark: $("#remark").val(),
                         dsFormPageIds: formPageId.join(","),
                         id: parent.rowId
                     };

dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js

@@ -12,15 +12,6 @@ layui.config({
         form = layui.form,
         table = layui.table;
 
-    authBtn('1641693529159');
-
-    dsFormUtil.loadDsFormPageTypeByPId("firstTypeId", "0");
-    form.on('select(firstTypeId)', function(data) {
-        var thisRowValue = data.value;
-        dsFormUtil.loadDsFormPageTypeByPId("secondTypeId", isNull(thisRowValue) ? "-" : thisRowValue);
-        form.render('select');
-    });
-
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
@@ -33,13 +24,12 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'title', title: '中文名称', align: 'left', width: 120, templet: function (d) {
-                return '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
+            { field: 'serviceName', title: '服务名称', align: 'left', width: 120, templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.serviceName + '</a>';
             }},
-            { field: 'titleEn', title: '英文名称', align: 'left', width: 120 },
-            { field: 'code', title: '编码', align: 'left', width: 100 },
-            { field: 'firstTypeName', title: '一级分类', align: 'left', width: 120 },
-            { field: 'secondTypeName', title: '二级分类', align: 'left', width: 120 },
+            { field: 'className', title: '服务编码', align: 'left', width: 120 },
+            { field: 'appId', title: '应用ID', align: 'left', width: 120 },
+            { field: 'appName', title: '应用名称', align: 'left', width: 120 },
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
             { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
@@ -48,47 +38,24 @@ layui.config({
         ]],
         done: function(json) {
             matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入服务名称，服务编码", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
         }
     });
 
     table.on('tool(messageTable)', function (obj) {
         var data = obj.data;
         var layEvent = obj.event;
-        if(layEvent === 'delet'){ // 删除
-            delet(data);
-        } else if (layEvent === 'edit'){ // 编辑
-            edit(data);
+        if (layEvent === 'bindDsFormPage'){ // 绑定表单
+            bindDsFormPage(data);
         } else if (layEvent === 'details') { // 详情
             details(data);
         }
     });
 
-    // 添加
-    $("body").on("click", "#addBean", function() {
-        _openNewWindows({
-            url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationAdd.html",
-            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
-            pageId: "dsFormObjectRelationAdd",
-            area: ['90vw', '90vh'],
-            callBack: function (refreshCode) {
-                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-                loadTable();
-            }});
-    });
-
-    // 删除
-    function delet(data) {
-        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
-            layer.close(index);
-            AjaxPostUtil.request({url: flowableBasePath + "dsFormObjectRelation003", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {
-                winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
-                loadTable();
-            }});
-        });
-    }
-
-    // 编辑
-    function edit(data) {
+    // 绑定表单
+    function bindDsFormPage(data) {
         rowId = data.id;
         _openNewWindows({
             url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationEdit.html",
@@ -114,30 +81,17 @@ layui.config({
             }});
     }
 
-    // 刷新数据
+    form.render();
     $("body").on("click", "#reloadTable", function() {
         loadTable();
     });
 
-    form.render();
-    form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-            table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-        }
-        return false;
-    });
-
     function loadTable() {
         table.reloadData("messageTable", {where: getTableParams()});
     }
 
     function getTableParams() {
-        return {
-            title: $("#title").val(),
-            codeNum: $("#codeNum").val(),
-            firstTypeId: $("#firstTypeId").val(),
-            secondTypeId: $("#secondTypeId").val()
-        };
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
     }
 
     exports('dsFormObjectRelationList', {});

dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationAdd.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-    <div style="margin: 0 auto; padding: 20px;">
-        <form class="layui-form" action="" id="showForm" autocomplete="off">
-            <div class="layui-form-item layui-col-xs12">
-                <span class="hr-title">基本信息</span>
-                <hr>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">中文名称<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <input type="text" id="title" name="title" win-verify="required" placeholder="请输入中文名称" class="layui-input"/>
-                    <div class="layui-form-mid layui-word-aux">该名称不能重复且不区分父子级别。</div>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">英文名称<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <input type="text" id="titleEn" name="titleEn" win-verify="required" placeholder="请输入英文名称" class="layui-input"/>
-                    <div class="layui-form-mid layui-word-aux">该名称不能重复且不区分父子级别。</div>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">一级分类<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <select lay-filter="firstTypeId" lay-search="" win-verify="required" id="firstTypeId">
-                    </select>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">二级分类<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <select lay-filter="secondTypeId" lay-search="" win-verify="required" id="secondTypeId">
-                    </select>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">唯一编码<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <input type="text" id="codeNum" name="codeNum" win-verify="required" placeholder="请输入唯一编码，例如：CGDD" class="layui-input"/>
-                    <div class="layui-form-mid layui-word-aux">唯一编码不区分父子级别。</div>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">备注</label>
-                <div class="layui-input-block">
-                    <textarea id="remark" name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
-                </div>
-            </div>
-
-            <div class="layui-form-item layui-col-xs12">
-                <span class="hr-title">表单关联信息</span>
-                <hr>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">表单信息<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <div class="winui-toolbar">
-                        <div class="winui-tool" style="text-align: left;">
-                            <button id="addRow" class="winui-toolbtn" type="button"><i class="fa fa-plus" aria-hidden="true"></i>新增行</button>
-                            <button id="deleteRow" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>
-                        </div>
-                    </div>
-                    <table class="layui-table">
-                        <thead>
-                            <tr>
-                                <th style="width: 30px;"></th>
-                                <th style="width: 80px;">表单编号</th>
-                                <th style="width: 150px;">表单名称</th>
-                            </tr>
-                        </thead>
-                        <tbody id="useTable">
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <div class="layui-input-block">
-                    <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-                    <button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
-                </div>
-            </div>
-        </form>
-    </div>
-
-    <!-- usetableTemplate -->
-    <script type="text/x-handlebars-template" id="usetableTemplate">
-        <tr trcusid="{{trId}}">
-            <td><input type="checkbox" rowId="{{id}}" lay-filter="checkboxProperty" name="tableCheckRow"/></td>
-            <td>
-                <input type="text" id="{{dsFormChooseList}}" name="{{dsFormChooseList}}" placeholder="请选择表单" class="layui-input" win-verify="required" readonly="readonly"/>
-                <i class="fa fa-plus-circle input-icon" id="{{dsFormChooseList}}Btn" style="top: 12px;"></i>
-            </td>
-            <td id="{{pageName}}"></td>
-        </tr>
-    </script>
-
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/dsFormObjectRelation/'}).use('dsFormObjectRelationAdd');
-    </script>
-</body>
-</html>
\ No newline at end of file

dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationDetails.html

@@ -20,39 +20,27 @@
             <hr>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">中文名称：</label>
+            <label class="layui-form-label">服务名称：</label>
             <div class="layui-input-block ver-center">
-                {{title}}
+                {{serviceName}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">英文名称：</label>
+            <label class="layui-form-label">服务编码：</label>
             <div class="layui-input-block ver-center">
-                {{titleEn}}
+                {{className}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">一级分类：</label>
+            <label class="layui-form-label">应用ID：</label>
             <div class="layui-input-block ver-center">
-                {{firstTypeName}}
+                {{appId}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">二级分类：</label>
+            <label class="layui-form-label">应用名称：</label>
             <div class="layui-input-block ver-center">
-                {{secondTypeName}}
-            </div>
-        </div>
-        <div class="layui-form-item layui-col-xs12">
-            <label class="layui-form-label">唯一编码：</label>
-            <div class="layui-input-block ver-center">
-                {{code}}
-            </div>
-        </div>
-        <div class="layui-form-item layui-col-xs12">
-            <label class="layui-form-label">备注：</label>
-            <div class="layui-input-block ver-center">
-                {{remark}}
+                {{appName}}
             </div>
         </div>
 

dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationEdit.html

@@ -20,44 +20,27 @@
             <hr>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">中文名称<i class="red">*</i></label>
-            <div class="layui-input-block">
-                <input type="text" id="title" name="title" win-verify="required" placeholder="请输入中文名称" class="layui-input" value="{{title}}"/>
-                <div class="layui-form-mid layui-word-aux">该名称不能重复且不区分父子级别。</div>
+            <label class="layui-form-label">服务名称：</label>
+            <div class="layui-input-block ver-center">
+                {{serviceName}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">英文名称<i class="red">*</i></label>
-            <div class="layui-input-block">
-                <input type="text" id="titleEn" name="titleEn" win-verify="required" placeholder="请输入英文名称" class="layui-input" value="{{titleEn}}"/>
-                <div class="layui-form-mid layui-word-aux">该名称不能重复且不区分父子级别。</div>
+            <label class="layui-form-label">服务编码：</label>
+            <div class="layui-input-block ver-center">
+                {{className}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">一级分类<i class="red">*</i></label>
-            <div class="layui-input-block">
-                <select lay-filter="firstTypeId" lay-search="" win-verify="required" id="firstTypeId">
-                </select>
+            <label class="layui-form-label">应用ID：</label>
+            <div class="layui-input-block ver-center">
+                {{appId}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">二级分类<i class="red">*</i></label>
-            <div class="layui-input-block">
-                <select lay-filter="secondTypeId" lay-search="" win-verify="required" id="secondTypeId">
-                </select>
-            </div>
-        </div>
-        <div class="layui-form-item layui-col-xs12">
-            <label class="layui-form-label">唯一编码<i class="red">*</i></label>
-            <div class="layui-input-block">
-                <input type="text" id="codeNum" name="codeNum" win-verify="required" placeholder="请输入唯一编码，例如：CGDD" class="layui-input" value="{{code}}"/>
-                <div class="layui-form-mid layui-word-aux">唯一编码不区分父子级别。</div>
-            </div>
-        </div>
-        <div class="layui-form-item layui-col-xs12">
-            <label class="layui-form-label">备注</label>
-            <div class="layui-input-block">
-                <textarea id="remark" name="remark" placeholder="请输入备注" class="layui-textarea">{{remark}}</textarea>
+            <label class="layui-form-label">应用名称：</label>
+            <div class="layui-input-block ver-center">
+                {{appName}}
             </div>
         </div>
 

dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.html

@@ -7,49 +7,17 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-    <div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-        <form class="layui-form layui-form-pane" action="" autocomplete="off">
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label class="layui-form-label">名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="title" name="title" placeholder="请输入名称,支持中英文搜索" class="layui-input" />
-                    </div>
-                    <label class="layui-form-label">编码</label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="codeNum" name="codeNum" placeholder="请输入编码" class="layui-input" />
-                    </div>
-                    <label class="layui-form-label">一级分类</label>
-                    <div class="layui-input-inline">
-                        <select lay-filter="firstTypeId" lay-search="" id="firstTypeId">
-                        </select>
-                    </div>
-                    <label class="layui-form-label">二级分类</label>
-                    <div class="layui-input-inline">
-                        <select lay-filter="secondTypeId" lay-search="" id="secondTypeId">
-                        </select>
-                    </div>
-                    <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-                    <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-                </div>
-            </div>
-        </form>
-    </div>
     <div class="winui-toolbar">
         <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-            <button id="addBean" class="winui-toolbtn" auth="1641693529159"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
         </div>
     </div>
-    <div style="margin:auto 10px;">
+    <div style="margin: auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
         <script type="text/html" id="tableBar">
             {{# if(auth('1641693544770')){ }}
                 <a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
             {{# } }}
-            {{# if(auth('1641693554667')){ }}
-                <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delet"><language showName="com.skyeye.deleteBtn"></language></a>
-            {{# } }}
         </script>
     </div>
     <script src="../../assets/lib/layui/layui.js"></script>