From 3111c0e6bf1300ca5370a27e11f6cfa9754e2614 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Sun, 4 Oct 2020 23:57:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/components/common/document/document.js | 32 ++++++++++--------- .../addSysDocumentView.html | 2 +- .../addSysDocumentView/addSysDocumentView.js | 6 ++-- .../editSysDocumentView.html | 2 +- .../editSysDocumentView.js | 22 +++---------- .../sysDocumentManage/sysDocumentManage.html | 10 +++--- .../sysDocumentManage/sysDocumentManage.js | 5 ++- public/vcCore/vcFramework.js | 20 ++++++++++++ 8 files changed, 53 insertions(+), 46 deletions(-) diff --git a/public/components/common/document/document.js b/public/components/common/document/document.js index 9dec56651..8db54326b 100644 --- a/public/components/common/document/document.js +++ b/public/components/common/document/document.js @@ -13,31 +13,33 @@ _initEvent:function(){ vc.on('document','openDocument',function(_param){ $('#documentModal').modal('show'); + $that._loadDocument(); }); }, methods:{ - listEnterCommunity: function (_page, _row) { + _loadDocument:function () { + let _componentCode = vc.getComponentCode(); var param = { params: { - _uid: '123mlkdinkldldijdhuudjdjkkd', - page: _page, - row: _row, - communityName: $that.navCommunityInfo.searchCommunityName + page:1, + row:1, + docCode:_componentCode } }; - vc.http.get('nav', - 'getCommunitys', + + //发送get请求 + vc.http.apiGet('/sysDocument/querySysDocument', param, function (json, res) { - if (res.status == 200) { - let _data = JSON.parse(json); - $that.navCommunityInfo.communityInfo = _data.communitys; - vc.emit('chooseEnterCommunity','paginationPlus', 'init', { - total: _data.records, - currentPage: _page - }); + let _sysDocumentManageInfo = JSON.parse(json); + let _total = _sysDocumentManageInfo.total; + + if(_total < 1){ + return; } - }, function () { + vc.component.documentInfo.title = _sysDocumentManageInfo.data[0].docTitle; + vc.component.documentInfo.context = _sysDocumentManageInfo.data[0].docContent; + }, function (errInfo, error) { console.log('请求失败处理'); } ); diff --git a/public/components/dev/addSysDocumentView/addSysDocumentView.html b/public/components/dev/addSysDocumentView/addSysDocumentView.html index 4af3968f6..0389a96c5 100644 --- a/public/components/dev/addSysDocumentView/addSysDocumentView.html +++ b/public/components/dev/addSysDocumentView/addSysDocumentView.html @@ -26,7 +26,7 @@
-
+
diff --git a/public/components/dev/addSysDocumentView/addSysDocumentView.js b/public/components/dev/addSysDocumentView/addSysDocumentView.js index ed4525d4f..7751cdccf 100644 --- a/public/components/dev/addSysDocumentView/addSysDocumentView.js +++ b/public/components/dev/addSysDocumentView/addSysDocumentView.js @@ -12,8 +12,6 @@ _initMethod: function () { vc.component._initSysDocumentInfo(); - $that._loadAddSysDocumentType(); - }, _initEvent: function () { vc.on('addSysDocumentView', 'openAddSysDocumentView', function () { @@ -50,7 +48,7 @@ errInfo: "文档编码超过200位" }, ], - 'addSysDocumentViewInfo.docContext': [ + 'addSysDocumentViewInfo.docContent': [ { limit: "required", param: "", @@ -113,7 +111,7 @@ vc.component.sendFile($summernote, files); }, onChange: function (contents, $editable) { - vc.component.addSysDocumentViewInfo.docContext = contents; + vc.component.addSysDocumentViewInfo.docContent = contents; } }, toolbar: [ diff --git a/public/components/dev/editSysDocumentView/editSysDocumentView.html b/public/components/dev/editSysDocumentView/editSysDocumentView.html index 91c7e1cc0..bf486cfe3 100644 --- a/public/components/dev/editSysDocumentView/editSysDocumentView.html +++ b/public/components/dev/editSysDocumentView/editSysDocumentView.html @@ -27,7 +27,7 @@
-
+
diff --git a/public/components/dev/editSysDocumentView/editSysDocumentView.js b/public/components/dev/editSysDocumentView/editSysDocumentView.js index cc4bcbfc7..e1b9b9d7b 100644 --- a/public/components/dev/editSysDocumentView/editSysDocumentView.js +++ b/public/components/dev/editSysDocumentView/editSysDocumentView.js @@ -16,29 +16,17 @@ _initEvent: function () { vc.on('editSysDocumentView', 'openEditSysDocumentModal', function (_params) { vc.component.refreshEditSysDocumentInfo(); - _params.context = filterXSS(_params.context); + _params.docContent = filterXSS(_params.docContent); vc.component.editSysDocumentViewInfo = _params; }); vc.on('editSysDocumentView', 'sysDocumentEditSysDocumentInfo', function (_params) { vc.component.refreshEditSysDocumentInfo(); - _params.context = filterXSS(_params.context); + _params.docContent = filterXSS(_params.docContent); vc.copyObject(_params, vc.component.editSysDocumentViewInfo); - $(".eidtSummernote").summernote('code', vc.component.editSysDocumentViewInfo.context); - var photos = []; - photos.push(vc.component.editSysDocumentViewInfo.headerImg); - vc.emit('editSysDocumentView', 'uploadImage', 'notifyPhotos', photos); + $(".eidtSummernote").summernote('code', vc.component.editSysDocumentViewInfo.docContent); }); - - vc.on("editSysDocumentView", "notifyUploadImage", function (_param) { - if (!vc.isEmpty(_param) && _param.length > 0) { - vc.component.editSysDocumentViewInfo.headerImg = _param[0]; - } else { - vc.component.editSysDocumentViewInfo.headerImg = ''; - } - }); - }, methods: { editSysDocumentValidate: function () { @@ -69,7 +57,7 @@ errInfo: "文档编码超过200位" }, ], - 'editSysDocumentViewInfo.docContext': [ + 'editSysDocumentViewInfo.docContent': [ { limit: "required", param: "", @@ -133,7 +121,7 @@ vc.component.sendEditFile(files); }, onChange: function (contents, $editable) { - vc.component.editSysDocumentViewInfo.docContext = contents; + vc.component.editSysDocumentViewInfo.docContent = contents; } } }); diff --git a/public/pages/dev/sysDocumentManage/sysDocumentManage.html b/public/pages/dev/sysDocumentManage/sysDocumentManage.html index 33330d745..9cf20794e 100644 --- a/public/pages/dev/sysDocumentManage/sysDocumentManage.html +++ b/public/pages/dev/sysDocumentManage/sysDocumentManage.html @@ -104,12 +104,12 @@
-
- +
+
-
- +
+
- +
\ No newline at end of file diff --git a/public/pages/dev/sysDocumentManage/sysDocumentManage.js b/public/pages/dev/sysDocumentManage/sysDocumentManage.js index e83bb74f2..adbc26201 100644 --- a/public/pages/dev/sysDocumentManage/sysDocumentManage.js +++ b/public/pages/dev/sysDocumentManage/sysDocumentManage.js @@ -45,14 +45,13 @@ }; //发送get请求 - vc.http.get('sysDocumentManage', - 'list', + vc.http.apiGet('/sysDocument/querySysDocument', param, function (json, res) { var _sysDocumentManageInfo = JSON.parse(json); vc.component.sysDocumentManageInfo.total = _sysDocumentManageInfo.total; vc.component.sysDocumentManageInfo.records = _sysDocumentManageInfo.records; - vc.component.sysDocumentManageInfo.sysDocuments = _sysDocumentManageInfo.sysDocuments; + vc.component.sysDocumentManageInfo.sysDocuments = _sysDocumentManageInfo.data; vc.emit('pagination', 'init', { total: vc.component.sysDocumentManageInfo.records, currentPage: _page diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js index 74c254bc3..a63da859a 100644 --- a/public/vcCore/vcFramework.js +++ b/public/vcCore/vcFramework.js @@ -1288,6 +1288,26 @@ } } }; + vcFramework.getComponentCode = function(){ + let _componentUrl = location.hash; + + //判断是否为组件页面 + if (!vcFramework.notNull(_componentUrl)) { + return "/"; + } + + if (_componentUrl.lastIndexOf('#') < 0) { + return "/"; + } + + let endPos = _componentUrl.length; + if (_componentUrl.indexOf('?') > -1) { + endPos = _componentUrl.indexOf('?'); + } + + _componentUrl = _componentUrl.substring(_componentUrl.lastIndexOf('#') + 1, endPos); + return _componentUrl; + } //获取url参数 vcFramework.getParam = function (_key) { //返回当前 URL 的查询部分（问号 ? 之后的部分）。