From 4ff541e6264929fb6f4fb8abb8b2f2b22085167d Mon Sep 17 00:00:00 2001 From: XYC Date: Sun, 23 Apr 2023 11:59:39 +0800 Subject: [PATCH 01/15] =?UTF-8?q?publish=E6=8C=89=E9=92=AE=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/module/editor/editor.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/js/module/editor/editor.js b/src/js/module/editor/editor.js index 09b2000..efea33b 100644 --- a/src/js/module/editor/editor.js +++ b/src/js/module/editor/editor.js @@ -20,6 +20,7 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'a modelTree, fast_config = layui.fast_config, that = this, + leftMenu, econsole = layui.econsole; console.log(econsole, 'econsole') @@ -155,7 +156,8 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'a // utils.contextData.trees_settings[settings.elem.slice(1)] = settings; // }) // 新方法循环渲染右侧树 - sessionStorage.setItem('leftMenu', JSON.stringify(option.resource_trees_settings)) + // sessionStorage.setItem('leftMenu', JSON.stringify(option.resource_trees_settings)) + leftMenu = option.resource_trees_settings that = this let index = 0 sessionStorage.setItem('leftMenuIndex', index) @@ -190,7 +192,9 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'a editor.prototype.treeRefresh = function() { - let settings = JSON.parse(sessionStorage.getItem('leftMenu')) + // let settings = JSON.parse(sessionStorage.getItem('leftMenu')) + let settings = leftMenu + let index = sessionStorage.getItem('leftMenuIndex') resource_tree.render(settings[index]); utils.contextData.trees_settings[settings[index].elem.slice(1)] = settings[index]; -- Gitee From 820dac5321342d011b8c845127d4eaa07c014195 Mon Sep 17 00:00:00 2001 From: XYC Date: Sun, 23 Apr 2023 14:08:21 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=91=E5=BD=A2?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=87=E6=8D=A2=EF=BC=8Ctbs=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/module/editor/editor.js | 48 ++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/src/js/module/editor/editor.js b/src/js/module/editor/editor.js index efea33b..00a2b03 100644 --- a/src/js/module/editor/editor.js +++ b/src/js/module/editor/editor.js @@ -21,6 +21,7 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'a fast_config = layui.fast_config, that = this, leftMenu, + enav_setting, econsole = layui.econsole; console.log(econsole, 'econsole') @@ -156,7 +157,6 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'a // utils.contextData.trees_settings[settings.elem.slice(1)] = settings; // }) // 新方法循环渲染右侧树 - // sessionStorage.setItem('leftMenu', JSON.stringify(option.resource_trees_settings)) leftMenu = option.resource_trees_settings that = this let index = 0 @@ -168,8 +168,10 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'a // econsole.render({ // elem: 'console-content' // }) + enav_setting = option.enav_setting.elem - var enav_elem = option.enav_setting.elem; + that.handOfTbs() + // var enav_elem = option.enav_setting.elem; /** * 扩展_单击树监听器 @@ -177,32 +179,50 @@ layui.define(['element', 'edropdown', 'layer', 'util', 'form', 'fast_config', 'a * @param {*} treeId * @param {*} treeNode */ - function extention_resourceTreeClickListener(event, treeId, treeNode, option) { - //debugger - enav.render({ - elem: enav_elem, - data: treeNode.getPath() - }); - } - listener.registerResourceTreeClickListener('extention_resourceTreeClickListener', extention_resourceTreeClickListener); + // function extention_resourceTreeClickListener(event, treeId, treeNode, option) { + // console.log(event, treeId, treeNode, option, '99999'); + // //debugger + // enav.render({ + // elem: enav_elem, + // data: treeNode.getPath() + // }); + // } + // listener.registerResourceTreeClickListener('extention_resourceTreeClickListener', extention_resourceTreeClickListener); return new editor(option); } /* **手动刷新右侧树 */ editor.prototype.treeRefresh = function() { - - // let settings = JSON.parse(sessionStorage.getItem('leftMenu')) let settings = leftMenu let index = sessionStorage.getItem('leftMenuIndex') resource_tree.render(settings[index]); utils.contextData.trees_settings[settings[index].elem.slice(1)] = settings[index]; - + that.handOfTbs() } - //头部事件 + editor.prototype.handOfTbs = function() { + var enav_elem = enav_setting; + + /** + * 扩展_单击树监听器 + * @param {} event + * @param {*} treeId + * @param {*} treeNode + */ + function extention_resourceTreeClickListener(event, treeId, treeNode, option) { + console.log(event, treeId, treeNode, option, '99999'); + //debugger + enav.render({ + elem: enav_elem, + data: treeNode.getPath() + }); + } + listener.registerResourceTreeClickListener('extention_resourceTreeClickListener', extention_resourceTreeClickListener); + } + //头部事件 util.event('lay-header-event', { //左侧菜单事件 menuLeft: function(othis) { -- Gitee From fc70d98d25fe84bca8a7b23d08704c28faa2b378 Mon Sep 17 00:00:00 2001 From: XYC Date: Mon, 24 Apr 2023 16:52:15 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BF=AB=E9=80=9F?= =?UTF-8?q?=E5=BC=80=E5=8F=91=20=E5=B5=8C=E5=85=A5=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=20=E9=A6=96=E9=A1=B5=E5=BA=95=E9=83=A8=E9=BB=91?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/module/editor/resource_tabs.js | 117 +++++++++++++------------- 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/src/js/module/editor/resource_tabs.js b/src/js/module/editor/resource_tabs.js index bab37ff..44673bf 100644 --- a/src/js/module/editor/resource_tabs.js +++ b/src/js/module/editor/resource_tabs.js @@ -1,37 +1,37 @@ -layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { - "use strict"; - - /** - * Button component - * */ - var MOD_NAME = 'resource_tabs', - $ = layui.jquery, +layui.define(['element', 'tab', 'utils', 'resource_toolbar'], function(exports) { + "use strict"; + + /** + * Button component + * */ + var MOD_NAME = 'resource_tabs', + $ = layui.jquery, pearTab = layui.tab, utils = layui.utils, resource_tabs_obj, resource_toolbar = layui.resource_toolbar; - var resource_tabs = function(opt) { - this.option = opt; - }; + var resource_tabs = function(opt) { + this.option = opt; + }; - function resetContent(contentElem){ + function resetContent(contentElem) { var parent = $(contentElem).parent(); $(contentElem).remove(); - parent.append('
') + parent.append('
') } - function tabsRender(viewMode){ + function tabsRender(viewMode) { var pearBody; // 加载右侧 - if(viewMode === 'tabs'){ + if (viewMode === 'tabs') { $('#fast-body').hide() var tab_elem = 'content'; pearBody = pearTab.render({ - + elem: tab_elem, removeOtherClass: true, roll: true, @@ -49,9 +49,9 @@ layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { }, data: [{ id: 'dashbord', - mode:'dom', + mode: 'dom', // domContent:'
首页
', - domContent:'
', + domContent: '
', url: 'none', title: '首页', close: false @@ -59,7 +59,7 @@ layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { success: function(id) { // console.log(id,'ididid1111111') }, - refersh: function(id){ + refersh: function(id) { refresh(id) } }) @@ -68,17 +68,17 @@ layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { refresh(id); utils.setTreeNode(id) - console.log(id,'id') - - setTimeout(function(){ + console.log(id, 'id') + + setTimeout(function() { var treeId = sessionStorage.getItem("content-pear-tab-data-current") - treeId = treeId.slice(0,treeId.indexOf('_')) - var treeNode = JSON.parse(sessionStorage.getItem("content-pear-current-treeNode")) - if(treeId && treeNode){ - resource_toolbar.resource_toolbar_resourceTreeClickListener(null,treeId,treeNode) + treeId = treeId.slice(0, treeId.indexOf('_')) + var treeNode = JSON.parse(sessionStorage.getItem("content-pear-current-treeNode")) + if (treeId && treeNode) { + resource_toolbar.resource_toolbar_resourceTreeClickListener(null, treeId, treeNode) } - },600) - + }, 600) + // var currentTreeId = sessionStorage.getItem("currentTreeId") // var treeNode = $.fn.zTree.getZTreeObj(currentTreeId).getNodeByTId(id) // sessionStorage.setItem('content-pear-current-treeNode',JSON.stringify(treeNode)) @@ -96,15 +96,15 @@ layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { } /** - * Button start loading - * */ + * Button start loading + * */ resource_tabs.prototype.render = function(opt) { - - var option = { - elem: opt.elem, + + var option = { + elem: opt.elem, viewMode: opt.viewMode, - - } + + } //因刷新树时会清空你tab，所以该方法单独抽出。 @@ -114,52 +114,51 @@ layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { resource_tabs_obj = new resource_tabs(option); return resource_tabs_obj; - } + } /** * 增加tab * @param opt * @returns {*} */ - resource_tabs.prototype.addTab = function(opt){ + resource_tabs.prototype.addTab = function(opt) { //从opt中输入的配置 - var {id, title, data, contentFn} = opt; + var { id, title, data, contentFn } = opt; var option = this.option; var viewMode = option.viewMode; var pearBody = option.pearBody; - if(viewMode === 'tabs'){ + if (viewMode === 'tabs') { $('#fast-body').hide() $('#content').show() var domId = "treenode_" + id; pearBody.addTabOnly({ - mode: 'dom', - content: '
', - close: true, - title: title, - id: id - } - ) - sessionStorage.setItem( "content-pear-current-treeNode", JSON.stringify(data)); + mode: 'dom', + content: '
', + close: true, + title: title, + id: id + }) + sessionStorage.setItem("content-pear-current-treeNode", JSON.stringify(data)); } else { $('#fast-body').show() $('#content').hide() - $('#content .layui-tab-content .layui-tab-item').each(function(index){ - if(index !== 0){ + $('#content .layui-tab-content .layui-tab-item').each(function(index) { + if (index !== 0) { $(this).remove() } }) - $('#content .layui-tab-title li').each(function(index){ - if(index !== 0){ + $('#content .layui-tab-title li').each(function(index) { + if (index !== 0) { $(this).remove() } }) } var tabElem = utils.getTabElem(id); - if(!utils.contentDomIsExist(tabElem)){ - if(opt.viewMode === 'body'){ + if (!utils.contentDomIsExist(tabElem)) { + if (opt.viewMode === 'body') { resetContent(option.elem); } @@ -167,7 +166,7 @@ layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { contentFn.fn(contentFn.data); //缓存tabId所对应的内容渲染函数 - if(!option.tabIdContentFn){ + if (!option.tabIdContentFn) { option.tabIdContentFn = {}; } option.tabIdContentFn[tabElem] = contentFn; @@ -176,14 +175,14 @@ layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { return tabElem; } - function refresh(tabId){ + function refresh(tabId) { var tabElem = utils.getTabElem(tabId); resetContent(tabElem); var option = resource_tabs_obj.option; - if(option.tabIdContentFn){ + if (option.tabIdContentFn) { var contentFn = option.tabIdContentFn[tabElem]; - if(contentFn){ + if (contentFn) { //执行渲染tab内容 contentFn.fn(contentFn.data); } @@ -196,9 +195,9 @@ layui.define(['element', 'tab', 'utils','resource_toolbar'], function(exports) { * 刷新tab内容 * @param tabId */ - resource_tabs.prototype.refresh = function(tabId){ + resource_tabs.prototype.refresh = function(tabId) { refresh(tabId); } exports(MOD_NAME, new resource_tabs()); -}); +}); \ No newline at end of file -- Gitee From 742df138ba0424f60689db47cd0f8c48fcead82b Mon Sep 17 00:00:00 2001 From: XYC Date: Fri, 28 Apr 2023 15:17:39 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=90=8E=EF=BC=8C=E6=A0=91=E5=BD=A2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=A2=AB=E6=94=B6=E8=B5=B7=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gulpfile.js | 134 +++++----- src/index_gs.html | 162 ++++++------ src/js/module/editor/resource_tree.js | 341 +++++++++++++++----------- src/js/module/ztree.js | 12 +- 4 files changed, 337 insertions(+), 312 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 8220456..9399d24 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,15 +2,15 @@ const { src, dest, series, parallel, watch } = require('gulp'); const less = require('gulp-less'); const gulp = require('gulp'); const minifyCSS = require('gulp-csso'); //把css代码优化 -const concat = require('gulp-concat'); //合并代码 -const autoprefixer = require('gulp-autoprefixer'); //自动补全浏览器的前缀 -const babel = require('gulp-babel'); //将es6转换成es5 +const concat = require('gulp-concat'); //合并代码 +const autoprefixer = require('gulp-autoprefixer'); //自动补全浏览器的前缀 +const babel = require('gulp-babel'); //将es6转换成es5 const uglify = require('gulp-uglify'); //压缩js文件 const htmlMinify = require("gulp-html-minify"); //压缩html文件 const smushit = require('gulp-smushit'); //压缩图片 const livereload = require('gulp-livereload'); //修改代码自动编译 const connect = require('gulp-connect'); // 全自动 -const {createProxyMiddleware} = require('http-proxy-middleware') +const { createProxyMiddleware } = require('http-proxy-middleware') var browserify = require('browserify'); var babelify = require('babelify'); @@ -27,7 +27,7 @@ function css() { return src('src/less/*.less') .pipe(less()) .pipe(dest('src/css')) - //dest是指你输出文件的位置，如果你的项目内没有dist文件夹，将会帮你自动生成这个文件夹 + //dest是指你输出文件的位置，如果你的项目内没有dist文件夹，将会帮你自动生成这个文件夹 .pipe(connect.reload()); } @@ -44,115 +44,115 @@ function cssMinify() { } -function config(){ +function config() { const env = process.env.NODE_ENV || 'fast' - const config = 'src/config/application-'+env+'.yml'; + const config = 'src/config/application-' + env + '.yml'; return gulp.src(config) - .pipe(concat('application.yml')) + .pipe(concat('application.yml')) // .pipe(babel()) // .pipe(uglify({mangle: false, compress: {properties: false}, output: {quote_keys: true}})) .pipe(gulp.dest("dist/config")); } -function js(){ +function js() { // return src(['src/js/**/*.js']) return src(['src/js/fastDevelop.js']) - .pipe(concat('fastDevelop.js')) - .pipe(babel({ - presets: ['@babel/env'] - })) - .pipe(uglify()) - .pipe(dest(distPath + 'js')) - .pipe(connect.reload()); + .pipe(concat('fastDevelop.js')) + .pipe(babel({ + presets: ['@babel/env'] + })) + .pipe(uglify()) + .pipe(dest(distPath + 'js')) + .pipe(connect.reload()); } -function module(){ +function module() { return src('src/js/module/**') .pipe(dest(distPath + 'js/module')) } -function compoment(){ +function compoment() { return src('src/compoment/**') .pipe(dest(distPath + 'compoment')) } -function html(){ +function html() { return src('src/*.html') - // .pipe(htmlMinify()) - .pipe(dest(distPath)) - .pipe(connect.reload()); + // .pipe(htmlMinify()) + .pipe(dest(distPath)) + .pipe(connect.reload()); } -function image(){ +function image() { return src('src/image/**') - // .pipe(smushit()) + // .pipe(smushit()) .pipe(dest(distPath + 'image')) .pipe(connect.reload()); } -function amis(){ +function amis() { return src([ - './node_modules/amis/sdk/**' - ]) - .pipe(dest(distPath + 'compoment/amis')) + './node_modules/amis/sdk/**' + ]) + .pipe(dest(distPath + 'compoment/amis')) } -function jqgrid(){ +function jqgrid() { return src([ - './node_modules/pqgridf/**' + './node_modules/pqgridf/**' - ]) - .pipe(dest(distPath + 'compoment/jqgrid')) + ]) + .pipe(dest(distPath + 'compoment/jqgrid')) } -function layui(){ +function layui() { return src([ - './node_modules/layui/**' + './node_modules/layui/**' - ]) - .pipe(dest(distPath + 'compoment/layui')) + ]) + .pipe(dest(distPath + 'compoment/layui')) } -function ztree(){ +function ztree() { return src([ - './node_modules/@ztree/ztree_v3/**', - '!./node_modules/@ztree/ztree_v3/css/zTreeStyle/img/zTreeStandard.png' + './node_modules/@ztree/ztree_v3/**', + '!./node_modules/@ztree/ztree_v3/css/zTreeStyle/img/zTreeStandard.png' - ]) - .pipe(dest(distPath + 'compoment/@ztree/ztree_v3')) + ]) + .pipe(dest(distPath + 'compoment/@ztree/ztree_v3')) } -function jquery_ui(){ +function jquery_ui() { return src([ - './node_modules/jquery-ui-dist/**' + './node_modules/jquery-ui-dist/**' - ]) - .pipe(dest(distPath + 'compoment/jquery-ui')) + ]) + .pipe(dest(distPath + 'compoment/jquery-ui')) } -function jquery(){ +function jquery() { return src([ - './node_modules/jquery/dist/*' + './node_modules/jquery/dist/*' - ]) - .pipe(dest(distPath + 'compoment/jquery')) + ]) + .pipe(dest(distPath + 'compoment/jquery')) } -function ajax_hook(){ +function ajax_hook() { return src([ - './node_modules/ajax-hook/**' + './node_modules/ajax-hook/**' - ]) - .pipe(dest(distPath + 'compoment/ajax-hook')) + ]) + .pipe(dest(distPath + 'compoment/ajax-hook')) } // function fast_config(){ @@ -170,9 +170,9 @@ function fast_data() { -function watches(){ +function watches() { livereload.listen(); - watch(['src/less/*.less'], series(css,cssMinify)) + watch(['src/less/*.less'], series(css, cssMinify)) watch(['src/css/*.css'], series(cssMinify)) watch(['src/js/*.js'], parallel(js)) watch(['src/js/module/**'], parallel(module)) @@ -184,31 +184,32 @@ function watches(){ } -function server(){ +function server() { connect.server({ - root: 'dist/', //再dist文件夹下查找资源 + root: 'dist/', //再dist文件夹下查找资源 port: 8888, //浏览器内打开的端口号 livereload: true, //是否实时刷新 - middleware: function (connect, opt) { + middleware: function(connect, opt) { return [ createProxyMiddleware( - '/platform',{ + '/platform', { target: 'http://11.11.242.101:48680/' + // target: 'http://11.2.251.48:8111/' }), createProxyMiddleware( - '/builder',{ + '/builder', { // target: 'http://11.2.251.48:8211' target: 'http://11.2.251.48:8210' }), createProxyMiddleware( - '/api', { + '/api', { target: 'http://localhost:8080' }) ] } }) - watch(['src/less/*.less'], series(css,cssMinify)) + watch(['src/less/*.less'], series(css, cssMinify)) watch(['src/css/*.css'], series(cssMinify)) watch(['src/js/*.js'], parallel(js)) watch(['src/js/module/**'], parallel(module)) @@ -227,9 +228,6 @@ exports.cssMin = series(css, cssMinify); //series是让这两个任务串行执 exports.js = js exports.html = html exports.image = image -exports.default = parallel(this.cssMin,js,html,amis,jqgrid,jquery_ui,jquery,layui,ztree,module,fast_data,compoment,image,ajax_hook,config) -exports.watch = series(this.default,watches) -exports.server = series(this.default,server) - - - +exports.default = parallel(this.cssMin, js, html, amis, jqgrid, jquery_ui, jquery, layui, ztree, module, fast_data, compoment, image, ajax_hook, config) +exports.watch = series(this.default, watches) +exports.server = series(this.default, server) \ No newline at end of file diff --git a/src/index_gs.html b/src/index_gs.html index 6d7f5ae..269b7ee 100644 --- a/src/index_gs.html +++ b/src/index_gs.html @@ -45,16 +45,14 @@
- +
- +
@@ -67,8 +65,7 @@
- +
@@ -79,14 +76,9 @@
- {{# if(d.type.metaType === 'domain_file_field_primary_key'){ }} - - - {{# }else{ }} - - {{# } }} + {{# if(d.type.metaType === 'domain_file_field_primary_key'){ }} + {{# }else{ }} + {{# } }}
@@ -95,21 +87,18 @@
- {{# if(d.type.metaType === 'domain_file_field_primary_key'){ }} + {{# if(d.type.metaType === 'domain_file_field_primary_key'){ }} - - {{# }else{ }} + {{# }else{ }} - {{# } }} + {{# } }}
- {{# if(d.type.metaType === 'domain_file_field_primary_key'){ }} + {{# if(d.type.metaType === 'domain_file_field_primary_key'){ }} - - {{# }else{ }} + {{# }else{ }} - {{# } }} + {{# } }}
@@ -142,14 +128,9 @@
- {{# if(d.type.metaType === 'domain_file_field_primary_key'){ }} - - - {{# }else{ }} - - {{# } }} + {{# if(d.type.metaType === 'domain_file_field_primary_key'){ }} + {{# }else{ }} + {{# } }}
@@ -157,8 +138,7 @@
- +
@@ -173,8 +153,7 @@
- +
@@ -185,6 +164,7 @@ @@ -163,13 +166,13 @@ diff --git a/src/js/module/editor/publish.js b/src/js/module/editor/publish.js index e2c90d9..c327fc0 100644 --- a/src/js/module/editor/publish.js +++ b/src/js/module/editor/publish.js @@ -53,12 +53,10 @@ layui.define(['element', 'api','utils'], function(exports) { url: pushApi, async: true, success: function(data){ - layer.msg('操作成功'); layui.utils.amis_alert_success('操作成功'); layer.close(index); }, error: function (XMLHttpRequest, textStatus, errorThrown) { - console.log(4444,XMLHttpRequest) layer.close(index); // debugger if(XMLHttpRequest.responseJSON.msg){ @@ -66,13 +64,6 @@ layui.define(['element', 'api','utils'], function(exports) { }else{ layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.errorInfo); } - // layer.msg(textStatus); - // 状态码 - // console.log(XMLHttpRequest.status); - // 状态 - // console.log(XMLHttpRequest.readyState); - // 错误信息 - // console.log(textStatus); } }); }); diff --git a/src/js/module/utils.js b/src/js/module/utils.js index 8af1e4c..664e040 100644 --- a/src/js/module/utils.js +++ b/src/js/module/utils.js @@ -179,8 +179,8 @@ layui.define(['element', 'api', 'schema', 'fast_config',"amis"], function (expor }, init_amis: function () { - if(!$('#sub_app')){ - $("#app").append("
") + if(!$('#sub_app').length){ + $("#app").append("
") } amis.render({ elem: '#sub_app' , -- Gitee From 2d6725652d02cf1e96b408e494f1d70aff6cd3ea Mon Sep 17 00:00:00 2001 From: XYC Date: Thu, 15 Jun 2023 15:40:35 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E8=81=94=E8=B0=83=E7=94=B0=E8=B5=9B?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A2=86=E5=9F=9F=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E4=B8=AD=E4=BF=9D=E5=AD=98=E5=8A=9F=E8=83=BD=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/module/api.js | 111 ++++++++++++------ src/js/module/brms/brms_design.js | 3 +- src/js/module/domain/domain_design.js | 10 +- .../module/domain/domain_design_business.js | 1 + src/js/module/domain/domain_design_default.js | 1 + src/js/module/domain/domain_design_index.js | 1 + src/js/module/domain/domain_design_vo.js | 1 + src/js/module/editor/publish.js | 26 ++-- 8 files changed, 99 insertions(+), 55 deletions(-) diff --git a/src/js/module/api.js b/src/js/module/api.js index 3811936..3b6c770 100644 --- a/src/js/module/api.js +++ b/src/js/module/api.js @@ -1,4 +1,4 @@ -layui.define(['element', 'fast_config'], function(exports) { +layui.define(['element', 'fast_config'], function (exports) { "use strict"; /** @@ -23,23 +23,28 @@ layui.define(['element', 'fast_config'], function(exports) { var api = { - exec: function(opt) { - + exec: function (opt) { var defaultOpt = { url: "", async: false, - success: function(data) {}, - error: function(XMLHttpRequest, textStatus, errorThrown) { - // debugger - layer.msg(XMLHttpRequest.responseJSON.msg); - // layer.msg(textStatus); + success: function (data) { + layer.closeAll() + layui.utils.amis_alert_success('操作成功'); + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { // 状态码 - console.log(XMLHttpRequest.status); + // console.log(XMLHttpRequest.status); // 状态 - console.log(XMLHttpRequest.readyState); + // console.log(XMLHttpRequest.readyState); // 错误信息 - console.log(textStatus); + // console.log(textStatus); + layer.closeAll() + if (XMLHttpRequest.responseJSON.msg) { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.msg); + } else { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.errorInfo); + } } }; @@ -51,19 +56,28 @@ layui.define(['element', 'fast_config'], function(exports) { $.extend(defaultOpt, opt); $.ajax(defaultOpt); }, - get: function(opt) { + get: function (opt) { var defaultOpt = { type: "GET", url: "", async: false, - success: function(data) {}, - error: function(XMLHttpRequest, textStatus, errorThrown) { + success: function (data) { + layer.closeAll() + layui.utils.amis_alert_success('操作成功'); + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { // 状态码 - console.log(XMLHttpRequest.status); + // console.log(XMLHttpRequest.status); // 状态 - console.log(XMLHttpRequest.readyState); + // console.log(XMLHttpRequest.readyState); // 错误信息 - console.log(textStatus); + // console.log(textStatus); + layer.closeAll() + if (XMLHttpRequest.responseJSON.msg) { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.msg); + } else { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.errorInfo); + } } }; opt.url = getUrl(opt); @@ -71,19 +85,28 @@ layui.define(['element', 'fast_config'], function(exports) { $.extend(defaultOpt, opt); $.ajax(defaultOpt); }, - post: function(opt) { + post: function (opt) { var defaultOpt = { type: "POST", url: "", async: false, - success: function(data) {}, - error: function(XMLHttpRequest, textStatus, errorThrown) { + success: function (data) { + layer.closeAll() + layui.utils.amis_alert_success('操作成功'); + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { // 状态码 - console.log(XMLHttpRequest.status); + // console.log(XMLHttpRequest.status); // 状态 - console.log(XMLHttpRequest.readyState); + // console.log(XMLHttpRequest.readyState); // 错误信息 - console.log(textStatus); + // console.log(textStatus); + layer.closeAll() + if (XMLHttpRequest.responseJSON.msg) { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.msg); + } else { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.errorInfo); + } } }; opt.url = getUrl(opt); @@ -91,19 +114,28 @@ layui.define(['element', 'fast_config'], function(exports) { $.extend(defaultOpt, opt); $.ajax(defaultOpt); }, - put: function(opt) { + put: function (opt) { var defaultOpt = { type: "PUT", url: "", async: false, - success: function(data) {}, - error: function(XMLHttpRequest, textStatus, errorThrown) { + success: function (data) { + layer.closeAll() + layui.utils.amis_alert_success('操作成功'); + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { // 状态码 - console.log(XMLHttpRequest.status); + // console.log(XMLHttpRequest.status); // 状态 - console.log(XMLHttpRequest.readyState); + // console.log(XMLHttpRequest.readyState); // 错误信息 - console.log(textStatus); + // console.log(textStatus); + layer.closeAll() + if (XMLHttpRequest.responseJSON.msg) { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.msg); + } else { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.errorInfo); + } } }; opt.url = getUrl(opt); @@ -111,20 +143,29 @@ layui.define(['element', 'fast_config'], function(exports) { $.extend(defaultOpt, opt); $.ajax(defaultOpt); }, - delete: function(opt) { + delete: function (opt) { var defaultOpt = { type: "DELETE", url: "", headers: [], async: false, - success: function(data) {}, - error: function(XMLHttpRequest, textStatus, errorThrown) { + success: function (data) { + layer.closeAll() + layui.utils.amis_alert_success('操作成功'); + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { // 状态码 - console.log(XMLHttpRequest.status); + // console.log(XMLHttpRequest.status); // 状态 - console.log(XMLHttpRequest.readyState); + // console.log(XMLHttpRequest.readyState); // 错误信息 - console.log(textStatus); + // console.log(textStatus); + layer.closeAll() + if (XMLHttpRequest.responseJSON.msg) { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.msg); + } else { + layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.errorInfo); + } } }; opt.url = getUrl(opt); diff --git a/src/js/module/brms/brms_design.js b/src/js/module/brms/brms_design.js index bda7c6d..c4bd981 100644 --- a/src/js/module/brms/brms_design.js +++ b/src/js/module/brms/brms_design.js @@ -46,7 +46,8 @@ layui.define(['element', 'api', 'fast_config', 'fact_design', 'amis', 'utils'], data: JSON.stringify(formObject), contentType : 'application/json;charset=UTF-8', success: function(data){ - layer.msg('操作成功'); + // layer.msg('操作成功'); + layui.utils.amis_alert_success('操作成功'); if(option.callback && option.callback.reloadtree && typeof option.callback.reloadtree === 'function'){ option.callback.reloadtree(data); } diff --git a/src/js/module/domain/domain_design.js b/src/js/module/domain/domain_design.js index b39b47b..ac4c70c 100644 --- a/src/js/module/domain/domain_design.js +++ b/src/js/module/domain/domain_design.js @@ -24,7 +24,6 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain }; function saveDesign(option){ - // debugger var grid_domain_design_businessData = option.grid_domain_design_business.option.grid.getData(); var grid_domain_design_defaultData = option.grid_domain_design_default.option.grid.getData(); var domain_design_index_data = option.grid_domain_design_index.option.grid.getData(); @@ -54,14 +53,12 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain // for(var field of domain_design_index_data){ // indexNames.push(field["indexName"]); // } - + formObject["fieldList"] = grid_domain_design_businessData; formObject["defaultField"] = grid_domain_design_defaultData; formObject["indexList"] = domain_design_index_data; formObject["modelType"] = "domainmodel"; - - const listFieldLength=fieldNames.length,newFieldListLength=new Set(fieldNames.map(item=>item)).size; const listColumnLength=columnNames.length,newColumnListLength=new Set(columnNames.map(item=>item)).size; // const listIndexLength=fieldNames.length,newIndexListLength=new Set(indexNames.map(item=>item)).size; @@ -76,6 +73,7 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain }else if(grid_domain_design_defaultData.length<1){ layer.alert('请查看默认字段是否生成！'); }else{ + var optionApi = { enableRootPath:true, type: "POST", @@ -84,11 +82,11 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain data: JSON.stringify(formObject), contentType : 'application/json;charset=UTF-8', success: function(data){ - layer.msg('操作成功'); + layui.utils.amis_alert_success('操作成功'); if(option.callback && option.callback.reloadtree && typeof option.callback.reloadtree === 'function'){ option.callback.reloadtree(data); } - } + }, }; api.exec(optionApi) diff --git a/src/js/module/domain/domain_design_business.js b/src/js/module/domain/domain_design_business.js index 0c36b6f..8ecbec6 100644 --- a/src/js/module/domain/domain_design_business.js +++ b/src/js/module/domain/domain_design_business.js @@ -157,6 +157,7 @@ layui.define(['element', 'api', 'fast_config', 'utils', 'form'], function (expor * Button start loading * */ domain_design_business.prototype.render = function (opt) { + layui.utils.init_amis() var option = { elem: opt.elem, diff --git a/src/js/module/domain/domain_design_default.js b/src/js/module/domain/domain_design_default.js index edc85f0..59b23c8 100644 --- a/src/js/module/domain/domain_design_default.js +++ b/src/js/module/domain/domain_design_default.js @@ -20,6 +20,7 @@ layui.define(['element', 'api', 'fast_config'], function(exports) { * Button start loading * */ domain_design_default.prototype.render = function(opt) { + layui.utils.init_amis() var option = { elem: opt.elem, diff --git a/src/js/module/domain/domain_design_index.js b/src/js/module/domain/domain_design_index.js index d0f83fc..b9ce89c 100644 --- a/src/js/module/domain/domain_design_index.js +++ b/src/js/module/domain/domain_design_index.js @@ -20,6 +20,7 @@ layui.define(['element', 'api', 'fast_config', 'utils'], function (exports) { * Button start loading * */ domain_design_index.prototype.render = function (opt) { + layui.utils.init_amis() var option = { elem: opt.elem, diff --git a/src/js/module/domain/domain_design_vo.js b/src/js/module/domain/domain_design_vo.js index 6b49c5e..ae87da0 100644 --- a/src/js/module/domain/domain_design_vo.js +++ b/src/js/module/domain/domain_design_vo.js @@ -130,6 +130,7 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'amis', * Button start loading * */ domain_design_vo.prototype.render = function(opt) { + layui.utils.init_amis() var option = { elem: opt.elem, diff --git a/src/js/module/editor/publish.js b/src/js/module/editor/publish.js index c327fc0..ed4c9f8 100644 --- a/src/js/module/editor/publish.js +++ b/src/js/module/editor/publish.js @@ -52,19 +52,19 @@ layui.define(['element', 'api','utils'], function(exports) { enableRootPath: true, url: pushApi, async: true, - success: function(data){ - layui.utils.amis_alert_success('操作成功'); - layer.close(index); - }, - error: function (XMLHttpRequest, textStatus, errorThrown) { - layer.close(index); - // debugger - if(XMLHttpRequest.responseJSON.msg){ - layer.msg(XMLHttpRequest.responseJSON.msg); - }else{ - layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.errorInfo); - } - } + // success: function(data){ + // layui.utils.amis_alert_success('操作成功'); + // layer.close(index); + // }, + // error: function (XMLHttpRequest, textStatus, errorThrown) { + // layer.close(index); + // // debugger + // if(XMLHttpRequest.responseJSON.msg){ + // layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.msg); + // }else{ + // layui.utils.amis_alert_warning(XMLHttpRequest.responseJSON.errorInfo); + // } + // } }); }); -- Gitee From 3f8e4b5ee3010c26f2aa0774f57f7c7b639877dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=91=E4=BA=9A=E6=9D=83?= Date: Fri, 16 Jun 2023 21:09:54 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0tab=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E7=A7=92=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/module/domain/domain_design.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/js/module/domain/domain_design.js b/src/js/module/domain/domain_design.js index ac4c70c..481d642 100644 --- a/src/js/module/domain/domain_design.js +++ b/src/js/module/domain/domain_design.js @@ -83,9 +83,11 @@ layui.define(['element', 'api', 'fast_config', 'domain_design_business', 'domain contentType : 'application/json;charset=UTF-8', success: function(data){ layui.utils.amis_alert_success('操作成功'); - if(option.callback && option.callback.reloadtree && typeof option.callback.reloadtree === 'function'){ - option.callback.reloadtree(data); - } + setTimeout(function(){ + if(option.callback && option.callback.reloadtree && typeof option.callback.reloadtree === 'function'){ + option.callback.reloadtree(data); + } + },1000) }, }; -- Gitee