diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/bar-bg-active.png b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/bar-bg-active.png new file mode 100644 index 000000000..e314e362f Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/bar-bg-active.png differ diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/bar-bg.png b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/bar-bg.png new file mode 100644 index 000000000..df936a9bb Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/bar-bg.png differ diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell-active.png b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell-active.png new file mode 100644 index 000000000..0dec1a077 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell-active.png differ diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell-current.png b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell-current.png new file mode 100644 index 000000000..29104cf2e Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell-current.png differ diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell.png b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell.png new file mode 100644 index 000000000..1a742a1ca Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/images/cell.png differ diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/steps.css b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/steps.css new file mode 100644 index 000000000..536879513 --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/steps.css @@ -0,0 +1,82 @@ +.step-body{ + position: relative; +} +.step-header{ + width: 100%; + margin: 0 auto; +} +.step-header ul{ + padding: 0; +} +.step-header li{ + list-style-type:none; + float: left; + position: relative; +} +.step-header li p{ + margin-top: 30px; + margin-bottom: 5px; + font-size: 14px; + color: #555555; +} +.step-header li .step-name{ + position: relative; + left: 35px; + font-size: 12px; + top: 0; + line-height: 25px; + background-color: #fff; + padding: 0 10px; +} +.step-header li a{ + position: absolute; + margin: 0 auto; + font-size: 12px; + color: #777; + height: 25px; + line-height: 25px; + background: url(./images/cell.png) center top no-repeat; + display: block; + background-color: #FFFFFF; + width: 45px; + left: 0; + top: 0; + text-decoration:none; + text-align: center; +} +.step-header li.step-active a{ + background: url(./images/cell-active.png) center top no-repeat ; + color: white; + background-color: #FFFFFF; +} +.step-header li.step-current a{ + background: url(./images/cell-current.png) center top no-repeat ; + color: white; + background-color: #FFFFFF; +} +.step-header li.step-active p{ + color: #58B7FF; +} +.step-bar,.step-bar-active{ + height: 13px; + border-radius: 12px; +} +.step-bar{ + background: url(./images/bar-bg.png) ; + position: relative; + border-radius: 12px; + z-index: -1; + height: 1px; + top: 12.5px; +} +.step-bar-active{ + width: 0; + background: url(./images/bar-bg-active.png) ; + height: 1px; + +} +.step-list{ + display: none; + clear: both; + margin-bottom: 30px; +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/steps.js b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/steps.js new file mode 100644 index 000000000..5f9e873cb --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/extend/steps/steps.js @@ -0,0 +1,106 @@ +layui.define(['jquery'], function (exports) { + "use strict"; + var $ = layui.$; + $.fn.step = function(options) { + var opts = $.extend({}, $.fn.step.defaults, options); + var size=this.find(".step-header li").length; + var barWidth=opts.initStep
"); + this.find(".step-list").eq(opts.initStep).show(); + if (size'+(i+1)+''); + } else if (i'); + }else{ + $(li).append(''+(i+1)+''); + } + }); + this.find(".step-header li").css({ + "width": 100/size+"%" + }); + this.find(".step-header").show(); + this.find(".step-bar-active").animate({ + "width": barWidth+"%"}, + opts.speed, function() { + + }); + + this.find(".jump-steps").on('click',function () { + var step_id = $(this).attr("data-step"); + steps.goStep(step_id); + }); + + this.nextStep=function() { + if (curPage>=size) { + return false; + } + var next_step_num = curPage == 0? 2: curPage+1 == size ? size+1 : curPage+1; + return this.goStep(next_step_num); + }; + + this.preStep=function() { + if (curPage<=1) { + return false; + } + var pre_step_num = curPage == 1? 1: curPage-1; + return this.goStep(pre_step_num); + }; + + this.goStep=function(page) { + if (page ==undefined || isNaN(page) || page<0) { + if(window.console&&window.console.error){ + console.error('the method goStep has a error,page:'+page); + } + return false; + } + curPage=parseInt(page); + this.find(".step-list").hide(); + this.find(".step-list").eq(curPage-1).show(); + this.find(".step-header li").each(function (i, li) { + var $li=$(li); + $li.removeClass('step-current') + .removeClass('step-active'); + $li.find("a").html(i+1); + if ((i+1) - diff --git a/ruoyi-generator/src/main/resources/templates/agile/genTable/add.html b/ruoyi-generator/src/main/resources/templates/agile/genTable/add.html index 9f13abe06..21039cff4 100644 --- a/ruoyi-generator/src/main/resources/templates/agile/genTable/add.html +++ b/ruoyi-generator/src/main/resources/templates/agile/genTable/add.html @@ -2,125 +2,141 @@ +
-
- -
- +
+
+
    +
  • + 选择表 +
  • +
  • + 基本信息 +
  • +
  • + 字段信息 +
  • +
  • + 生成信息 +
  • +
  • + 完成 +
  • +
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
待确认
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+