diff --git a/plugin/admin/app/controller/Crud.php b/plugin/admin/app/controller/Crud.php index c16117b..a1bdf9f 100755 --- a/plugin/admin/app/controller/Crud.php +++ b/plugin/admin/app/controller/Crud.php @@ -117,7 +117,7 @@ class Crud extends Base $vo = $this->model->whereIn('id',$request->get('ids'))->find(); } - return view('',[ + return view(null,[ 'row' => $vo ]); } diff --git a/plugin/admin/app/view/index/index.html b/plugin/admin/app/view/index/index.html index c85ccd7..0d87e00 100755 --- a/plugin/admin/app/view/index/index.html +++ b/plugin/admin/app/view/index/index.html @@ -242,10 +242,10 @@ - {if Request()->header('host') === env_get('server.domain','')} - + {if Config('site.admin_debug') == '1'} + {else /} - + {/if} diff --git a/plugin/admin/app/view/layout.html b/plugin/admin/app/view/layout.html index 6ba9f6d..3e0405f 100755 --- a/plugin/admin/app/view/layout.html +++ b/plugin/admin/app/view/layout.html @@ -14,7 +14,7 @@ var _c = {$config| json_encode=JSON_UNESCAPED_UNICODE|raw}; window.Config = _c; _c['cdnurl']=""; - _c['version'] = Math.random(); + //_c['version'] = Math.random(); var require = { config:_c }; @@ -24,8 +24,8 @@
{__CONTENT__}
-{if Request()->header('host') === env_get('server.domain','')} - +{if Config('site.admin_debug') == '1'} + {else /} {/if} diff --git a/plugin/admin/public/js/default.js b/plugin/admin/public/js/default.js index a65f8f9..279f546 100755 --- a/plugin/admin/public/js/default.js +++ b/plugin/admin/public/js/default.js @@ -1,54 +1,53 @@ requirejs.config({ - //urlArgs: "v=" + (new Date()).getTime(), - urlArgs: "v=" + (location.host != window.Config.domain ? (new Date()).getTime() : window.Config.version), + urlArgs: "v=" + (require.s.contexts._.config.config.admin_debug=='1' ? (new Date()).getTime() : window.Config.version), baseUrl: window.Config.cdnurl+window.Config.admin_path+'/js/', packages: [{ name: 'moment', - location: window.Config.admin_path+'/libs/moment', + location: 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/moment', main: 'moment' }], paths: { - 'fast': '../libs/fast', - 'upload': '../libs/require-upload', - 'form': '../libs/require-form', - 'dropzone': '../libs/dropzone/dropzone.min', - 'table': '../libs/require-table', - 'jquery': '../libs/jquery.min', - 'bootstrap': '../libs/bootstrap.min', - 'bootstrap-table': '../libs/bootstrap-table/bootstrap-table', - 'bootstrap-table-export': '../libs/bootstrap-table/extensions/export/bootstrap-table-export.min', - 'bootstrap-table-fixed-columns': '../libs/bootstrap-table/extensions/fixed-columns/bootstrap-table-fixed-columns.min', - 'bootstrap-table-mobile': '../libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile', - 'bootstrap-table-lang': '../libs/bootstrap-table/locale/bootstrap-table-zh-CN', - 'bootstrap-table-jumpto': '../libs/bootstrap-table/extensions/page-jump-to/bootstrap-table-page-jump-to.min', - 'bootstrap-datepicker': '../libs/bootstrap-datepicker/bootstrap-datepicker', - 'bootstrap-datetimepicker': '../libs/bootstrap-datetimepicker/bootstrap-datetimepicker', - 'bootstrap-colorpicker': '../libs/bootstrap-colorpicker/bootstrap-colorpicker.min', - 'bootstrap-table-template': '../libs/bootstrap-table-template', - 'tableexport': '../libs/tableExport.jquery.plugin/tableExport.min', - 'validator': '../libs/nice-validator-1.1.5/jquery.validator', - 'dragsort': '../libs/jquery.dragsort', - //'layer': '../libs/layer/dist/layer', - 'layer': '../libs/layer.2.11.0/layer', - 'moment': '../libs/moment/dist/moment', - 'template': '../libs/art-template/dist/template-native', - 'bootstrap-table-treegrid': '../libs/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min', - 'treegrid': '../libs/jquery-treegrid/jquery.treegrid.min', - 'tagsinput': '../libs/jquery-tags-input/jquery.tagsinput.min', - 'froala_lang':'../libs/froala/js/languages', - 'froala-editor':'../libs/froala/js/froala_editor.pkgd.min', - 'cxselect': '../libs/cxselect/js/jquery.cxselect.min', - 'selectpage': '../libs/selectpage/selectpage', - 'bootstrap-select': '../libs/bootstrap-select/dist/js/bootstrap-select.min', - 'bootstrap-select-lang': '../libs/bootstrap-select/dist/js/i18n/defaults-zh_CN', - 'yntree': '../libs/yntree/yntree', - 'multitabs':'../libs/bootstrap-multitabs/multitabs', - 'qrcode':'../libs/jquery.qrcode.min' + 'fast': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/fast', + 'upload': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/require-upload', + 'form': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/require-form', + 'dropzone': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/dropzone/dropzone.min', + 'table': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/require-table', + 'jquery': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/jquery.min', + 'bootstrap': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap.min', + 'bootstrap-table': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-table/bootstrap-table', + 'bootstrap-table-export': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-table/extensions/export/bootstrap-table-export.min', + 'bootstrap-table-fixed-columns': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-table/extensions/fixed-columns/bootstrap-table-fixed-columns.min', + 'bootstrap-table-mobile': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile', + 'bootstrap-table-lang': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-table/locale/bootstrap-table-zh-CN', + 'bootstrap-table-jumpto': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-table/extensions/page-jump-to/bootstrap-table-page-jump-to.min', + 'bootstrap-datepicker': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-datepicker/bootstrap-datepicker', + 'bootstrap-datetimepicker': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-datetimepicker/bootstrap-datetimepicker', + 'bootstrap-colorpicker': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-colorpicker/bootstrap-colorpicker.min', + 'bootstrap-table-template': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-table-template', + 'tableexport': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/tableExport.jquery.plugin/tableExport.min', + 'validator': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/nice-validator-1.1.5/jquery.validator', + 'dragsort': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/jquery.dragsort', + //'layer': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/layer/dist/layer', + 'layer': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/layer.2.11.0/layer', + 'moment': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/moment/dist/moment', + 'template': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/art-template/dist/template-native', + 'bootstrap-table-treegrid': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-table/extensions/treegrid/bootstrap-table-treegrid.min', + 'treegrid': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/jquery-treegrid/jquery.treegrid.min', + 'tagsinput': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/jquery-tags-input/jquery.tagsinput.min', + 'froala_lang':'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/froala/js/languages', + 'froala-editor':'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/froala/js/froala_editor.pkgd.min', + 'cxselect': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/cxselect/js/jquery.cxselect.min', + 'selectpage': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/selectpage/selectpage', + 'bootstrap-select': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-select/dist/js/bootstrap-select.min', + 'bootstrap-select-lang': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-select/dist/js/i18n/defaults-zh_CN', + 'yntree': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/yntree/yntree', + 'multitabs':'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-multitabs/multitabs', + 'qrcode':'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/jquery.qrcode.min' }, map: { '*': { - 'css': window.Config.admin_path+'/libs/require-css.min.js' // or whatever the path to require-css is + 'css': 'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/require-css.min.js' // or whatever the path to require-css is } }, shim: { @@ -58,12 +57,12 @@ requirejs.config({ 'tagsinput': { deps: [ 'jquery', - 'css!'+window.Config.admin_path+'/libs/jquery-tags-input/jquery.tagsinput.min.css' + 'css!'+'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/jquery-tags-input/jquery.tagsinput.min.css' ] }, 'yntree': { deps: [ - 'css!../libs/yntree/yntree.css' + 'css!https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/yntree/yntree.css' ] }, 'bootstrap-select': { @@ -125,13 +124,13 @@ requirejs.config({ 'froala-editor':{ deps: [ 'jquery', - 'css!../libs/froala/css/froala_editor.pkgd.min.css' + 'css!https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/froala/css/froala_editor.pkgd.min.css' ] }, 'bootstrap-datetimepicker':{ deps: [ 'jquery', - 'css!'+window.Config.admin_path+'/libs/bootstrap-datetimepicker/style.css' + 'css!'+'https://shunliao.oss-accelerate.aliyuncs.com/app/admin/libs/bootstrap-datetimepicker/style.css' ] } },