删除多余功能

common/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationDetails.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;
-
-    showGrid({
-        id: "showForm",
-        url: reqBasePath + "dsFormObjectRelation004",
-        params: {id: parent.rowId},
-        pagination: false,
-        method: 'GET',
-        template: $("#beanTemplate").html(),
-        ajaxSendLoadBefore: function (hdb) {
-        },
-        ajaxSendAfter: function (json) {
-            matchingLanguage();
-            form.render();
-        }
-    });
-});
\ No newline at end of file

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

-
-
-// todo 待删除
-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();
-
-    showGrid({
-        id: "showForm",
-        url: reqBasePath + "dsFormObjectRelation004",
-        params: {id: parent.rowId},
-        pagination: false,
-        method: 'GET',
-        template: $("#beanTemplate").html(),
-        ajaxSendLoadBefore: function (hdb) {
-        },
-        ajaxSendAfter: function (json) {
-            if (!isNull(json.bean.dsFormPageMations)) {
-                $.each(json.bean.dsFormPageMations, function (i, item) {
-                    addRow();
-                    $("#dsFormChooseList" + (rowNum - 1)).val(item.numCode);
-                    $("#dsFormChooseList" + (rowNum - 1)).attr("dataId", item.id);
-                    $("#name" + (rowNum - 1)).html(item.name);
-                })
-            } else {
-                addRow();
-            }
-
-            matchingLanguage();
-            form.render();
-            form.on('submit(formEditBean)', 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 = {
-                        dsFormPageIds: formPageId.join(","),
-                        id: parent.rowId
-                    };
-                    AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation005", params: params, type: 'json', method: "PUT", 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
-            name: "name" + rowNum.toString() // 动态表单页面名称id
-        };
-        $("#useTable").append(getDataUseHandlebars(usetableTemplate, par));
-        form.render('checkbox');
-        rowNum++;
-
-        // 加载动添表单选择按钮的点击事件
-        var btnId = par.dsFormChooseList + "Btn";
-        $("body").on("click", "#" + btnId, function (e) {
-            // todo 待删除
-            // dsFormUtil.chooseType = false; // 单选
-            // dsFormUtil.openDsFormPageChoosePage(function () {
-            //     $("#" + par.dsFormChooseList).val(dsFormUtil.dsFormChooseMation.numCode);
-            //     $("#" + par.dsFormChooseList).attr("dataId", dsFormUtil.dsFormChooseMation.id);
-            //     $("#" + par.name).html(dsFormUtil.dsFormChooseMation.name);
-            // });
-        });
-    }
-
-    // 删除行
-    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

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

-
-var rowId = "";
-
-layui.config({
-    base: basePath,
-    version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
-    winui.renderColor();
-    var $ = layui.$,
-        form = layui.form,
-        table = layui.table;
-
-    table.render({
-        id: 'messageTable',
-        elem: '#messageTable',
-        method: 'post',
-        url: reqBasePath + 'dsFormObjectRelation001',
-        where: getTableParams(),
-        even: true,
-        page: true,
-        limits: getLimits(),
-        limit: getLimit(),
-        cols: [[
-            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'serviceName', title: '服务名称', align: 'left', width: 120, templet: function (d) {
-                return '<a lay-event="details" class="notice-title-click">' + d.serviceName + '</a>';
-            }},
-            { field: 'className', title: '服务编码', align: 'left', width: 400 },
-            { field: 'appId', title: '应用ID', align: 'left', width: 240 },
-            { 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 },
-            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
-            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
-        ]],
-        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 === 'bindDsFormPage'){ // 绑定表单
-            bindDsFormPage(data);
-        } else if (layEvent === 'details') { // 详情
-            details(data);
-        }
-    });
-
-    // 绑定表单
-    function bindDsFormPage(data) {
-        rowId = data.id;
-        _openNewWindows({
-            url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationEdit.html",
-            title: '绑定表单',
-            pageId: "dsFormObjectRelationEdit",
-            area: ['90vw', '90vh'],
-            callBack: function (refreshCode) {
-                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-                loadTable();
-            }});
-    }
-
-    // 详情
-    function details(data) {
-        rowId = data.id;
-        _openNewWindows({
-            url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationDetails.html",
-            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
-            pageId: "dsFormObjectRelationDetails",
-            area: ['90vw', '90vh'],
-            callBack: function (refreshCode) {
-            }});
-    }
-
-    form.render();
-    $("body").on("click", "#reloadTable", function() {
-        loadTable();
-    });
-
-    function loadTable() {
-        table.reloadData("messageTable", {where: getTableParams()});
-    }
-
-    function getTableParams() {
-        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
-    }
-
-    exports('dsFormObjectRelationList', {});
-});

common/src/main/resources/template/js/dsFormPage/simpleTableDesign.js

+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'jquery', 'winui', 'form', 'soulTable', 'table'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table,
+        soulTable = layui.soulTable;
+    var selOption = getFileContent('tpl/template/select-option.tpl');
+
+    matchingLanguage();
+    form.render();
+    form.on('submit(formWriteBean)', function (data) {
+        if (winui.verifyForm(data.elem)) {
+            var params = {
+                id: isNull(parent.rowId) ? '' : parent.rowId,
+                name: $("#name").val(),
+                remark: $("#remark").val(),
+                type: $("#type").val(),
+                className: parent.objectId
+            };
+            AjaxPostUtil.request({url: reqBasePath + "writeDsFormPage", params: params, type: 'json', method: "POST", callback: function (json) {
+                parent.layer.close(index);
+                parent.refreshCode = '0';
+            }});
+        }
+        return false;
+    });
+
+    $("body").on("click", "#cancle", function() {
+        parent.layer.close(index);
+    });
+});
\ No newline at end of file

common/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationDetails.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">
-
-        </form>
-    </div>
-
-    <script type="text/x-handlebars-template" id="beanTemplate">
-        {{#bean}}
-        <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">服务名称：</label>
-            <div class="layui-input-block ver-center">
-                {{serviceName}}
-            </div>
-        </div>
-        <div class="layui-form-item layui-col-xs6">
-            <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">应用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">应用名称：</label>
-            <div class="layui-input-block ver-center">
-                {{appName}}
-            </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">表单信息：</label>
-            <div class="layui-input-block">
-                <table class="layui-table">
-                    <thead>
-                    <tr>
-                        <th style="width: 80px;">表单编号</th>
-                        <th style="width: 150px;">表单名称</th>
-                    </tr>
-                    </thead>
-                    <tbody id="useTable">
-                    {{#each dsFormPageMations}}
-                    <tr>
-                        <td>{{pageNum}}</td>
-                        <td>{{pageName}}</td>
-                    </tr>
-                    {{/each}}
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        {{/bean}}
-    </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('dsFormObjectRelationDetails');
-    </script>
-</body>
-</html>
\ No newline at end of file

common/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationEdit.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">
-
-        </form>
-    </div>
-
-    <script type="text/x-handlebars-template" id="beanTemplate">
-        {{#bean}}
-        <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">服务名称：</label>
-            <div class="layui-input-block ver-center">
-                {{serviceName}}
-            </div>
-        </div>
-        <div class="layui-form-item layui-col-xs6">
-            <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">应用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">应用名称：</label>
-            <div class="layui-input-block ver-center">
-                {{appName}}
-            </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="formEditBean"><language showName="com.skyeye.save"></language></button>
-            </div>
-        </div>
-        {{/bean}}
-    </script>
-
-    <!-- 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="{{name}}"></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('dsFormObjectRelationEdit');
-    </script>
-</body>
-</html>
\ No newline at end of file

common/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.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 class="winui-toolbar">
-        <div class="winui-tool">
-            <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;">
-        <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="bindDsFormPage">绑定表单</a>
-            {{# } }}
-        </script>
-    </div>
-    <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('dsFormObjectRelationList');
-    </script>
-</body>
-</html>
\ No newline at end of file

common/src/main/resources/template/tpl/dsFormPage/simpleTableDesign.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" />
+    <style>
+        .layui-table-cell {
+            height: auto;
+            text-overflow: inherit;
+            overflow: visible;
+            white-space: normal;
+            word-wrap: break-word;
+        }
+
+        .layui-table-cell .layui-anim {
+            height: 180px;
+        }
+
+        .place-holder {
+            height: 200px;
+        }
+    </style>
+</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" id="tableBox">
+                <label class="layui-form-label">表格属性<i class="red">*</i></label>
+                <div class="layui-input-block">
+                    <div class="winui-tip alert-info">
+                        拖拽表格行可修改顺序。
+                    </div>
+                    <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>
+                    <table class="layui-table" id="messageTable">
+
+                    </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="formWriteBean"><language showName="com.skyeye.save"></language></button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/dsFormPage/'}).use('writePage');
+    </script>
+</body>
+</html>
\ No newline at end of file

web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js

@@ -76,9 +76,9 @@ var dsFormUtil = {
             dsFormObjectRelationCode: isNull(code) ? "" : code,
             dsFormObjectRelationId: isNull(dsFormObjectRelationId) ? "" : dsFormObjectRelationId
         };
-        AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation006", params: params, method: "GET", type: 'json', callback: function(json) {
-            dsFormUtil.loadAddDsFormItem(showBoxId, json);
-        }, async: false});
+        // AjaxPostUtil.request({url: reqBasePath + "dsFormObjectRelation006", params: params, method: "GET", type: 'json', callback: function(json) {
+        //     dsFormUtil.loadAddDsFormItem(showBoxId, json);
+        // }, async: false});
     },
 
     loadAddDsFormItem: function(showBoxId, json) {
@@ -233,7 +233,8 @@ var dsFormUtil = {
             dsFormPageSequenceList: JSON.stringify(result),
             objectId: objectId
         }
-        AjaxPostUtil.request({url: flowableBasePath + "dsformpage014", params: params, type: 'json', method: "POST", callback: function(json) {
+        // todo 待修改
+        AjaxPostUtil.request({url: flowableBasePath + "", params: params, type: 'json', method: "POST", callback: function(json) {
         }, async: false});
     },
 
@@ -309,7 +310,8 @@ var dsFormUtil = {
      * @param objectId 绑定的objectId
      */
     loadPageShowDetailsByObjectId: function(showBoxId, objectId) {
-        AjaxPostUtil.request({url: flowableBasePath + "dsformpage015", params: {objectId: objectId}, method: "GET", type: 'json', callback: function(json) {
+        // todo 待修改
+        AjaxPostUtil.request({url: flowableBasePath + "", params: {objectId: objectId}, method: "GET", type: 'json', callback: function(json) {
             $.each(json.rows, function(j, bean) {
                 var customBoxId = bean.dsFormPage.id;
                 $("#" + showBoxId).append(getDataUseHandlebars(dsFormUtil.customDsFormBox, bean));
@@ -434,7 +436,8 @@ var dsFormUtil = {
      * @param objectId 绑定的objectId
      */
     loadPageToEditByObjectId: function(showBoxId, objectId) {
-        AjaxPostUtil.request({url: flowableBasePath + "dsformpage015", params: {objectId: objectId}, method: "GET", type: 'json', callback: function (json) {
+        // todo 待修改
+        AjaxPostUtil.request({url: flowableBasePath + "", params: {objectId: objectId}, method: "GET", type: 'json', callback: function (json) {
             dsFormUtil.loadEditDsFormItem(showBoxId, json);
         }, async: false});
     },