Commit 6a59a6d7 authored by msgroup's avatar msgroup Committed by mingsoft
Browse files

fix: 5.3

parent 672d5545
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
:label="item.title" :name="item.name"> :label="item.title" :name="item.name">
<el-form v-if="item.title=='文章编辑'" ref="form" :model="form" :rules="rules" label-width="120px" <el-form v-if="item.title=='文章编辑'" ref="form" :model="form" :rules="rules" label-width="120px"
size="mini"> size="mini">
<el-row gutter="0" justify="start" align="top"> <el-row :gutter="0" justify="start" align="top">
<el-col :span="returnIsShow?'12':'24'"> <el-col :span="returnIsShow?'12':'24'">
<el-form-item label="文章标题" prop="contentTitle"> <el-form-item label="文章标题" prop="contentTitle">
<el-input v-model="form.contentTitle" <el-input v-model="form.contentTitle"
...@@ -65,6 +65,37 @@ ...@@ -65,6 +65,37 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row
gutter="0"
justify="start" align="top">
<el-col :span="returnIsShow?'12':'24'">
<el-form-item label="文章副标题" prop="contentShortTitle">
<el-input v-model="form.contentShortTitle"
:disabled="false"
:style="{width: '100%'}"
:clearable="true"
placeholder="请输入文章副标题">
</el-input>
<div class="ms-form-tip">
标签:<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{field.shorttitle}</a>
</div>
</el-form-item>
</el-col>
<el-col span="12">
<el-form-item label="文章外链接" prop="contentOutLink">
<el-input v-model="form.contentOutLink"
:disabled="false"
:style="{width: '100%'}"
:clearable="true"
placeholder="请输入文章外链接">
</el-input>
<div class="ms-form-tip">
标签:<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html"
target="_blank">${'$'}{field.outlink}</a> 文章外链接必须以http或者https等开头
</div>
</el-form-item>
</el-col>
</el-row>
<el-row <el-row
gutter="0" gutter="0"
justify="start" align="top"> justify="start" align="top">
...@@ -138,24 +169,6 @@ ...@@ -138,24 +169,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row
gutter="0"
justify="start" align="top">
<el-col span="12">
<el-form-item label="文章外链接" prop="contentOutLink">
<el-input v-model="form.contentOutLink"
:disabled="false"
:style="{width: '100%'}"
:clearable="true"
placeholder="请输入文章外链接">
</el-input>
<div class="ms-form-tip">
标签:<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html"
target="_blank">${'$'}{field.outlink}</a> 文章外链接必须以http或者https等开头
</div>
</el-form-item>
</el-col>
</el-row>
<el-row <el-row
gutter="0" gutter="0"
justify="start" align="top"> justify="start" align="top">
...@@ -195,7 +208,7 @@ ...@@ -195,7 +208,7 @@
:action="ms.manager+'/file/upload.do'" :action="ms.manager+'/file/upload.do'"
:on-remove="contentImghandleRemove" :on-remove="contentImghandleRemove"
:style="{width:''}" :style="{width:''}"
:limit="1" :limit="10"
:on-exceed="contentImghandleExceed" :on-exceed="contentImghandleExceed"
:disabled="false" :disabled="false"
:data="{uploadPath:'/cms/content','isRename':true ,'appId':true}" :data="{uploadPath:'/cms/content','isRename':true ,'appId':true}"
...@@ -205,7 +218,7 @@ ...@@ -205,7 +218,7 @@
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
<div slot="tip" class="ms-form-tip"> <div slot="tip" class="ms-form-tip">
标签:<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'{@ms:file field.litpic/}'}</a><br/> 标签:<a href="http://doc.mingsoft.net/mcms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'{@ms:file field.litpic/}'}</a><br/>
最多上传1张图片,文章缩略图,支持jpg格式 最多上传10张图片,文章缩略图,支持jpg格式;多图情况下,{@ms:file field.litpic/}会只取第一张缩略图,其他用法参考文档arclist标签
</div> </div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
...@@ -270,6 +283,8 @@ ...@@ -270,6 +283,8 @@
form: { form: {
// 文章标题 // 文章标题
contentTitle: '', contentTitle: '',
// 文章副标题
contentShortTitle: '',
// 所属栏目 // 所属栏目
categoryId: undefined, categoryId: undefined,
// 文章类型 // 文章类型
...@@ -336,7 +351,11 @@ ...@@ -336,7 +351,11 @@
var _this = this; var _this = this;
var that = this; //自定义模型需要验证 var that = this; //自定义模型需要验证
if (this.model && !this.model.validate()) { var model = null;
if (that.currCategory.mdiyModelId && String(that.currCategory.mdiyModelId )!="0"){
model = ms.mdiy.model.modelForm();
}
if (model && !model.validate()) {
this.activeName = 'custom-name'; this.activeName = 'custom-name';
return; return;
} }
...@@ -347,7 +366,7 @@ ...@@ -347,7 +366,7 @@
} }
//若缩略图为空则赋值为空串 //若缩略图为空则赋值为空串
if (that.form.contentImg.length == 0){ if (that.form.contentImg.length == 0){
that.form.contentImg = ""; that.form.contentImg = [];
} }
this.$refs.form[0].validate(function (valid) { this.$refs.form[0].validate(function (valid) {
...@@ -367,9 +386,9 @@ ...@@ -367,9 +386,9 @@
ms.http.post(url, data).then(function (data) { ms.http.post(url, data).then(function (data) {
if (data.result) { if (data.result) {
//保存时需要赋值关联ID //保存时需要赋值关联ID
if (that.model) { if (model) {
that.model.form.linkId = data.data.id; model.form.linkId = data.data.id;
that.model.save(); model.save();
} }
that.$notify({ that.$notify({
title: '成功', title: '成功',
...@@ -589,7 +608,7 @@ ...@@ -589,7 +608,7 @@
contentImghandleExceed: function (files, fileList) { contentImghandleExceed: function (files, fileList) {
this.$notify({ this.$notify({
title: '失败', title: '失败',
message: '当前最多上传1个文件', message: '当前最多上传10个文件',
type: 'warning' type: 'warning'
}); });
}, },
......
...@@ -364,15 +364,18 @@ ...@@ -364,15 +364,18 @@
save: function (id) { save: function (id) {
//id有值时编辑 //id有值时编辑
if (id) { if (id) {
location.href = this.manager + "/cms/content/form.do?id=" + id; // location.href = this.manager + "/cms/content/form.do?id=" + id;
ms.util.openSystemUrl("/cms/content/form.do?id=" + id);
}else { }else {
//根据当前栏目新增时自动选中栏目 //根据当前栏目新增时自动选中栏目
var categoryId = this.form.categoryId; var categoryId = this.form.categoryId;
if (categoryId) { if (categoryId) {
location.href = this.manager + "/cms/content/form.do?categoryId=" + this.form.categoryId; // location.href = this.manager + "/cms/content/form.do?categoryId=" + this.form.categoryId;
ms.util.openSystemUrl("/cms/content/form.do?categoryId=" + this.form.categoryId);
}else { }else {
//如果栏目id没有值就单纯的新增,不自动选定栏目 //如果栏目id没有值就单纯的新增,不自动选定栏目
location.href = this.manager + "/cms/content/form.do"; // location.href = this.manager + "/cms/content/form.do";
ms.util.openSystemUrl("/cms/content/form.do");
} }
} }
}, },
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
</style> </style>
</head> </head>
<body class="custom-body"> <body class="custom-body">
<div id="app" v-cloak> <div id="app" class="ms-index" v-cloak>
<el-form ref="form" label-width="100px" size="mini"> <el-form ref="form" label-width="100px" size="mini">
<div class="class-2" > <div class="class-2" >
<div class="class-3" > <div class="class-3 panel" >
<div class="class-4" > <div class="class-4" >
<el-form-item label="主页模板" > <el-form-item label="主页模板" >
<el-select v-model="template" <el-select v-model="template"
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
:label="item"></el-option> :label="item"></el-option>
</el-select> </el-select>
<div class="ms-form-tip"> <div class="ms-form-tip">
一般选择<i>index.htm</i>模 一般选择<i>index.htm</i>模
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
</el-input> </el-input>
<div class="ms-form-tip"> <div class="ms-form-tip">
一般为index.html或default.html, 一般为index.html或default.html,
如果是<i>引导页面->首页</i>,可以手动调整主页模与主页设置,先生成引导页,再生成首页。一般default.html为引导页面index.html为主页(需要服务器容器配置好对应默认页)。<br/> 如果是<i>引导页面->首页</i>,可以手动调整主页模与主页设置,先生成引导页,再生成首页。一般default.html为引导页面index.html为主页(需要服务器容器配置好对应默认页)。<br/>
点击“预览主页”可跳转到网站首页进行预览网站首页<br/> 点击“预览主页”可跳转到网站首页进行预览网站首页<br/>
不能选择有分页标签的页面生成,例如news-list.htm、search.htm<br/> 不能选择有分页标签的页面生成,例如news-list.htm、search.htm<br/>
如果下拉没有出现模,请检查应用设置是否绑定了模<br/> 如果下拉没有出现模,请检查应用设置是否绑定了模<br/>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="class-13" > <div class="class-13 panel" >
<div class="class-14" > <div class="class-14" >
<el-form-item label="文章栏目"> <el-form-item label="文章栏目">
<ms-tree-select v-model="contentSection" <ms-tree-select v-model="contentSection"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</div> </div>
</div> </div>
<div class="class-23" > <div class="class-23 panel" >
<div class="class-24" > <div class="class-24" >
<el-form-item label="生成栏目"> <el-form-item label="生成栏目">
<ms-tree-select v-model="section" <ms-tree-select v-model="section"
...@@ -276,6 +276,14 @@ ...@@ -276,6 +276,14 @@
}); });
</script> </script>
<style> <style>
#app {
background-color: white;
}
#app .panel {
background-color: white;
padding: 20px 40px 20px 40px;
border: 1px solid #EBEEF5;
}
input{ input{
width: 100%!important; width: 100%!important;
} }
......
This diff is collapsed.
...@@ -161,4 +161,7 @@ textarea::-webkit-input-placeholder { ...@@ -161,4 +161,7 @@ textarea::-webkit-input-placeholder {
margin-bottom: unset !important; margin-bottom: unset !important;
overflow-x: hidden!important; overflow-x: hidden!important;
} }
/*上传+号位置*/
.el-upload--picture-card i {
line-height: unset !important;
}
This diff is collapsed.
...@@ -520,6 +520,20 @@ module.exports = function (it) { ...@@ -520,6 +520,20 @@ module.exports = function (it) {
}; };
/***/ }),
/***/ "22a0":
/***/ (function(module, exports, __webpack_require__) {
// Imports
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.i, ".el-scrollbar .el-scrollbar__view .el-select-dropdown__item[data-v-898189e8]{height:auto;max-height:274px;padding:0;overflow:hidden;overflow-y:auto}.el-select-dropdown__item.selected[data-v-898189e8]{font-weight:400}ul li[data-v-898189e8] .el-tree .el-tree-node__content{height:auto;padding:0 20px}.el-tree-node__label[data-v-898189e8]{font-weight:400}.el-tree[data-v-898189e8] .is-current .el-tree-node__label{color:#409eff;font-weight:700}.el-tree[data-v-898189e8] .is-current .el-tree-node__children .el-tree-node__label{color:#606266;font-weight:400}", ""]);
// Exports
module.exports = exports;
/***/ }), /***/ }),
/***/ "23cb": /***/ "23cb":
...@@ -1734,20 +1748,6 @@ module.exports = function (argument) { ...@@ -1734,20 +1748,6 @@ module.exports = function (argument) {
}; };
/***/ }),
/***/ "522a":
/***/ (function(module, exports, __webpack_require__) {
// Imports
var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.i, ".el-scrollbar .el-scrollbar__view .el-select-dropdown__item[data-v-1a21ca58]{height:auto;max-height:274px;padding:0;overflow:hidden;overflow-y:auto}.el-select-dropdown__item.selected[data-v-1a21ca58]{font-weight:400}ul li[data-v-1a21ca58] .el-tree .el-tree-node__content{height:auto;padding:0 20px}.el-tree-node__label[data-v-1a21ca58]{font-weight:400}.el-tree[data-v-1a21ca58] .is-current .el-tree-node__label{color:#409eff;font-weight:700}.el-tree[data-v-1a21ca58] .is-current .el-tree-node__children .el-tree-node__label{color:#606266;font-weight:400}", ""]);
// Exports
module.exports = exports;
/***/ }), /***/ }),
/***/ "5270": /***/ "5270":
...@@ -1891,22 +1891,6 @@ module.exports = function (argument) { ...@@ -1891,22 +1891,6 @@ module.exports = function (argument) {
}; };
/***/ }),
/***/ "59bf":
/***/ (function(module, exports, __webpack_require__) {
// style-loader: Adds some css to the DOM by adding a <style> tag
// load the styles
var content = __webpack_require__("522a");
if(content.__esModule) content = content.default;
if(typeof content === 'string') content = [[module.i, content, '']];
if(content.locals) module.exports = content.locals;
// add the styles to the DOM
var add = __webpack_require__("499e").default
var update = add("39b28dcf", content, true, {"sourceMap":false,"shadowMode":false});
/***/ }), /***/ }),
/***/ "59ed": /***/ "59ed":
...@@ -2300,6 +2284,17 @@ module.exports = function buildFullPath(baseURL, requestedURL) { ...@@ -2300,6 +2284,17 @@ module.exports = function buildFullPath(baseURL, requestedURL) {
}; };
/***/ }),
/***/ "8502":
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ms_tree_select_vue_vue_type_style_index_0_id_898189e8_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("d964");
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ms_tree_select_vue_vue_type_style_index_0_id_898189e8_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ms_tree_select_vue_vue_type_style_index_0_id_898189e8_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
/* unused harmony reexport * */
/***/ }), /***/ }),
/***/ "861d": /***/ "861d":
...@@ -3474,17 +3469,6 @@ module.exports = function (it) { ...@@ -3474,17 +3469,6 @@ module.exports = function (it) {
}; };
/***/ }),
/***/ "cc4b":
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ms_tree_select_vue_vue_type_style_index_0_id_1a21ca58_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("59bf");
/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ms_tree_select_vue_vue_type_style_index_0_id_1a21ca58_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ms_tree_select_vue_vue_type_style_index_0_id_1a21ca58_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
/* unused harmony reexport * */
/***/ }), /***/ }),
/***/ "cdce": /***/ "cdce":
...@@ -3667,6 +3651,22 @@ module.exports = function isAbsoluteURL(url) { ...@@ -3667,6 +3651,22 @@ module.exports = function isAbsoluteURL(url) {
}; };
/***/ }),
/***/ "d964":
/***/ (function(module, exports, __webpack_require__) {
// style-loader: Adds some css to the DOM by adding a <style> tag
// load the styles
var content = __webpack_require__("22a0");
if(content.__esModule) content = content.default;
if(typeof content === 'string') content = [[module.i, content, '']];
if(content.locals) module.exports = content.locals;
// add the styles to the DOM
var add = __webpack_require__("499e").default
var update = add("e9db61a6", content, true, {"sourceMap":false,"shadowMode":false});
/***/ }), /***/ }),
/***/ "d9b5": /***/ "d9b5":
...@@ -6649,8 +6649,8 @@ var ms_select_component = normalizeComponent( ...@@ -6649,8 +6649,8 @@ var ms_select_component = normalizeComponent(
) )
/* harmony default export */ var ms_select = (ms_select_component.exports); /* harmony default export */ var ms_select = (ms_select_component.exports);
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"01ea9f4c-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/ms-tree-select.vue?vue&type=template&id=1a21ca58&scoped=true& // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"01ea9f4c-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/ms-tree-select.vue?vue&type=template&id=898189e8&scoped=true&
var ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_render = function render() { var ms_tree_selectvue_type_template_id_898189e8_scoped_true_render = function render() {
var _vm = this, var _vm = this,
_c = _vm._self._c; _c = _vm._self._c;
return _c('el-select', { return _c('el-select', {
...@@ -6685,9 +6685,9 @@ var ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_render = function re ...@@ -6685,9 +6685,9 @@ var ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_render = function re
} }
})], 1)], 1); })], 1)], 1);
}; };
var ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_staticRenderFns = []; var ms_tree_selectvue_type_template_id_898189e8_scoped_true_staticRenderFns = [];
// CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue?vue&type=template&id=1a21ca58&scoped=true& // CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue?vue&type=template&id=898189e8&scoped=true&
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/ms-tree-select.vue?vue&type=script&lang=js& // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/form/ms-tree-select.vue?vue&type=script&lang=js&
/* harmony default export */ var ms_tree_selectvue_type_script_lang_js_ = ({ /* harmony default export */ var ms_tree_selectvue_type_script_lang_js_ = ({
...@@ -6768,7 +6768,7 @@ var ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_staticRenderFns = [] ...@@ -6768,7 +6768,7 @@ var ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_staticRenderFns = []
this.$nextTick(function () { this.$nextTick(function () {
var scrollWrap = document.querySelectorAll('.el-scrollbar .el-select-dropdown__wrap')[0]; var scrollWrap = document.querySelectorAll('.el-scrollbar .el-select-dropdown__wrap')[0];
var scrollBar = document.querySelectorAll('.el-scrollbar .el-scrollbar__bar'); var scrollBar = document.querySelectorAll('.el-scrollbar .el-scrollbar__bar');
scrollWrap.style.cssText = 'margin: 0px; max-height: none; overflow: hidden;'; scrollWrap.style.cssText = 'margin: 0px; ';
scrollBar.forEach(function (ele) { scrollBar.forEach(function (ele) {
return ele.style.width = 0; return ele.style.width = 0;
}); });
...@@ -6811,8 +6811,8 @@ var ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_staticRenderFns = [] ...@@ -6811,8 +6811,8 @@ var ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_staticRenderFns = []
}); });
// CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue?vue&type=script&lang=js& // CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue?vue&type=script&lang=js&
/* harmony default export */ var form_ms_tree_selectvue_type_script_lang_js_ = (ms_tree_selectvue_type_script_lang_js_); /* harmony default export */ var form_ms_tree_selectvue_type_script_lang_js_ = (ms_tree_selectvue_type_script_lang_js_);
// EXTERNAL MODULE: ./src/components/form/ms-tree-select.vue?vue&type=style&index=0&id=1a21ca58&prod&scoped=true&lang=css& // EXTERNAL MODULE: ./src/components/form/ms-tree-select.vue?vue&type=style&index=0&id=898189e8&prod&scoped=true&lang=css&
var ms_tree_selectvue_type_style_index_0_id_1a21ca58_prod_scoped_true_lang_css_ = __webpack_require__("cc4b"); var ms_tree_selectvue_type_style_index_0_id_898189e8_prod_scoped_true_lang_css_ = __webpack_require__("8502");
// CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue // CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue
...@@ -6825,11 +6825,11 @@ var ms_tree_selectvue_type_style_index_0_id_1a21ca58_prod_scoped_true_lang_css_ ...@@ -6825,11 +6825,11 @@ var ms_tree_selectvue_type_style_index_0_id_1a21ca58_prod_scoped_true_lang_css_
var ms_tree_select_component = normalizeComponent( var ms_tree_select_component = normalizeComponent(
form_ms_tree_selectvue_type_script_lang_js_, form_ms_tree_selectvue_type_script_lang_js_,
ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_render, ms_tree_selectvue_type_template_id_898189e8_scoped_true_render,
ms_tree_selectvue_type_template_id_1a21ca58_scoped_true_staticRenderFns, ms_tree_selectvue_type_template_id_898189e8_scoped_true_staticRenderFns,
false, false,
null, null,
"1a21ca58", "898189e8",
null null
) )
......
!function(e){if(!e.VueDemi){var t={},n=e.Vue;if(n)if("2."===n.version.slice(0,2)){var r=e.VueCompositionAPI;if(r){for(var i in r)t[i]=r[i];t.isVue2=!0,t.isVue3=!1,t.install=function(){},t.Vue=n,t.Vue2=n,t.version=n.version}else console.error("[vue-demi] no VueCompositionAPI instance found, please be sure to import `@vue/composition-api` before `vue-demi`.")}else if("3."===n.version.slice(0,2)){for(var i in n)t[i]=n[i];t.isVue2=!1,t.isVue3=!0,t.install=function(){},t.Vue=n,t.Vue2=void 0,t.version=n.version,t.set=function(e,t,n){return Array.isArray(e)?(e.length=Math.max(e.length,t),e.splice(t,1,n),n):(e[t]=n,n)},t.del=function(e,t){Array.isArray(e)?e.splice(t,1):delete e[t]}}else console.error("[vue-demi] Vue version "+n.version+" is unsupported.");else console.error("[vue-demi] no Vue instance found, please be sure to import `vue` before `vue-demi`.");e.VueDemi=t}}(window),function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("echarts"),require("vue-demi"),require("echarts/core")):"function"==typeof define&&define.amd?define(["echarts","vue-demi","echarts/core"],t):(e="undefined"!=typeof globalThis?globalThis:e||self).VueECharts=t(e.echarts,e.VueDemi,e.echarts)}(this,(function(e,t,n){"use strict";var r=function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},i=["getWidth","getHeight","getDom","getOption","resize","dispatchAction","convertToPixel","convertFromPixel","containPixel","getDataURL","getConnectedDataURL","appendData","clear","isDisposed","dispose"];function o(e){return t=Object.create(null),i.forEach((function(n){t[n]=function(t){return function(){for(var n=[],r=0;r<arguments.length;r++)n[r]=arguments[r];if(!e.value)throw new Error("ECharts is not initialized yet.");return e.value[t].apply(e.value,n)}}(n)})),t;var t}var s=null;var a=null;function u(e,t){void 0===t&&(t={});var n=document.createElement(e);return Object.keys(t).forEach((function(e){n[e]=t[e]})),n}function _(e,t,n){return(window.getComputedStyle(e,n||null)||{display:"none"})[t]}function c(e){if(!document.documentElement.contains(e))return{detached:!0,rendered:!1};for(var t=e;t!==document;){if("none"===_(t,"display"))return{detached:!1,rendered:!1};t=t.parentNode}return{detached:!1,rendered:!0}}var l=0,d=null;function f(e,t){if(e.__resize_mutation_handler__||(e.__resize_mutation_handler__=v.bind(e)),!e.__resize_listeners__)if(e.__resize_listeners__=[],window.ResizeObserver){var n=e.offsetWidth,r=e.offsetHeight,i=new ResizeObserver((function(){(e.__resize_observer_triggered__||(e.__resize_observer_triggered__=!0,e.offsetWidth!==n||e.offsetHeight!==r))&&p(e)})),o=c(e),s=o.detached,a=o.rendered;e.__resize_observer_triggered__=!1===s&&!1===a,e.__resize_observer__=i,i.observe(e)}else if(e.attachEvent&&e.addEventListener)e.__resize_legacy_resize_handler__=function(){p(e)},e.attachEvent("onresize",e.__resize_legacy_resize_handler__),document.addEventListener("DOMSubtreeModified",e.__resize_mutation_handler__);else if(l||(d=function(e){var t=document.createElement("style");return t.styleSheet?t.styleSheet.cssText=e:t.appendChild(document.createTextNode(e)),(document.querySelector("head")||document.body).appendChild(t),t}('.resize-triggers{visibility:hidden;opacity:0;pointer-events:none}.resize-contract-trigger,.resize-contract-trigger:before,.resize-expand-trigger,.resize-triggers{content:"";position:absolute;top:0;left:0;height:100%;width:100%;overflow:hidden}.resize-contract-trigger,.resize-expand-trigger{background:#eee;overflow:auto}.resize-contract-trigger:before{width:200%;height:200%}')),function(e){var t=_(e,"position");t&&"static"!==t||(e.style.position="relative");e.__resize_old_position__=t,e.__resize_last__={};var n=u("div",{className:"resize-triggers"}),r=u("div",{className:"resize-expand-trigger"}),i=u("div"),o=u("div",{className:"resize-contract-trigger"});r.appendChild(i),n.appendChild(r),n.appendChild(o),e.appendChild(n),e.__resize_triggers__={triggers:n,expand:r,expandChild:i,contract:o},g(e),e.addEventListener("scroll",h,!0),e.__resize_last__={width:e.offsetWidth,height:e.offsetHeight}}(e),e.__resize_rendered__=c(e).rendered,window.MutationObserver){var f=new MutationObserver(e.__resize_mutation_handler__);f.observe(document,{attributes:!0,childList:!0,characterData:!0,subtree:!0}),e.__resize_mutation_observer__=f}e.__resize_listeners__.push(t),l++}function v(){var e=c(this),t=e.rendered,n=e.detached;t!==this.__resize_rendered__&&(!n&&this.__resize_triggers__&&(g(this),this.addEventListener("scroll",h,!0)),this.__resize_rendered__=t,p(this))}function h(){var e,t,n=this;g(this),this.__resize_raf__&&(e=this.__resize_raf__,a||(a=(window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||function(e){clearTimeout(e)}).bind(window)),a(e)),this.__resize_raf__=(t=function(){var e,t,r,i,o,s,a=(t=(e=n).__resize_last__,r=t.width,i=t.height,o=e.offsetWidth,s=e.offsetHeight,o!==r||s!==i?{width:o,height:s}:null);a&&(n.__resize_last__=a,p(n))},s||(s=(window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(e){return setTimeout(e,16)}).bind(window)),s(t))}function p(e){e&&e.__resize_listeners__&&e.__resize_listeners__.forEach((function(t){t.call(e,e)}))}function g(e){var t=e.__resize_triggers__,n=t.expand,r=t.expandChild,i=t.contract,o=i.scrollWidth,s=i.scrollHeight,a=n.offsetWidth,u=n.offsetHeight,_=n.scrollWidth,c=n.scrollHeight;i.scrollLeft=o,i.scrollTop=s,r.style.width=a+1+"px",r.style.height=u+1+"px",n.scrollLeft=_,n.scrollTop=c}function m(e,r,i){var o=null;t.watch([i,e,r],(function(e,t,r){var i=e[0],s=e[1],a=e[2];i&&s&&a&&(o=n.throttle((function(){s.resize()}),100),f(i,o)),r((function(){o&&i&&function(e,t){var n=e.__resize_listeners__;if(n){if(t&&n.splice(n.indexOf(t),1),!n.length||!t){if(e.detachEvent&&e.removeEventListener)return e.detachEvent("onresize",e.__resize_legacy_resize_handler__),void document.removeEventListener("DOMSubtreeModified",e.__resize_mutation_handler__);e.__resize_observer__?(e.__resize_observer__.unobserve(e),e.__resize_observer__.disconnect(),e.__resize_observer__=null):(e.__resize_mutation_observer__&&(e.__resize_mutation_observer__.disconnect(),e.__resize_mutation_observer__=null),e.removeEventListener("scroll",h),e.removeChild(e.__resize_triggers__.triggers),e.__resize_triggers__=null),e.__resize_listeners__=null}!--l&&d&&d.parentNode.removeChild(d)}}(i,o)}))}))}var z={autoresize:Boolean},b="ecLoadingOptions";var w={loading:Boolean,loadingOptions:Object},O=[],y=[];!function(e,t){if(e&&"undefined"!=typeof document){var n,r=!0===t.prepend?"prepend":"append",i=!0===t.singleTag,o="string"==typeof t.container?document.querySelector(t.container):document.getElementsByTagName("head")[0];if(i){var s=O.indexOf(o);-1===s&&(s=O.push(o)-1,y[s]={}),n=y[s]&&y[s][r]?y[s][r]:y[s][r]=a()}else n=a();65279===e.charCodeAt(0)&&(e=e.substring(1)),n.styleSheet?n.styleSheet.cssText+=e:n.appendChild(document.createTextNode(e))}function a(){var e=document.createElement("style");if(e.setAttribute("type","text/css"),t.attributes)for(var n=Object.keys(t.attributes),i=0;i<n.length;i++)e.setAttribute(n[i],t.attributes[n[i]]);var s="prepend"===r?"afterbegin":"beforeend";return o.insertAdjacentElement(s,e),e}}("x-vue-echarts{display:block;width:100%;height:100%}",{});var E=/^on[^a-z]/,x=function(e){return E.test(e)};var C="x-vue-echarts";t.Vue2&&t.Vue2.config.ignoredElements.push(C);var A="ecTheme",T="ecInitOptions",j="ecUpdateOptions",L=t.defineComponent({name:"echarts",props:r(r({option:Object,theme:{type:[Object,String]},initOptions:Object,updateOptions:Object,group:String,manualUpdate:Boolean},z),w),inheritAttrs:!1,setup:function(e,i){var s=i.attrs,a=i.listeners,u=t.shallowRef(),_=t.shallowRef(),c=t.shallowRef(),l=t.inject(A,null),d=t.inject(T,null),f=t.inject(j,null),v=t.toRefs(e),h=v.autoresize,p=v.manualUpdate,g=v.loading,z=v.loadingOptions,w=t.computed((function(){return c.value||e.option||null})),O=t.computed((function(){return e.theme||t.unref(l)||{}})),y=t.computed((function(){return e.initOptions||t.unref(d)||{}})),E=t.computed((function(){return e.updateOptions||t.unref(f)||{}})),C=t.computed((function(){return function(e){var t={};for(var n in e)x(n)||(t[n]=e[n]);return t}(s)}));function L(r){if(u.value){var i=_.value=n.init(u.value,O.value,y.value);e.group&&(i.group=e.group);var o=a;o||(o={},Object.keys(s).filter((function(e){return 0===e.indexOf("on")&&e.length>2})).forEach((function(e){var t=e.charAt(2).toLowerCase()+e.slice(3);o[t]=s[e]}))),Object.keys(o).forEach((function(e){var t=o[e];t&&(0===e.indexOf("zr:")?i.getZr().on(e.slice(3).toLowerCase(),t):i.on(e.toLowerCase(),t))})),h.value?t.nextTick((function(){i&&!i.isDisposed()&&i.resize(),c()})):c()}function c(){var e=r||w.value;e&&i.setOption(e,E.value)}}function V(){_.value&&(_.value.dispose(),_.value=void 0)}var D=null;t.watch(p,(function(n){"function"==typeof D&&(D(),D=null),n||(D=t.watch((function(){return e.option}),(function(e,t){e&&(_.value?_.value.setOption(e,r({notMerge:e.value!==(null==t?void 0:t.value)},E.value)):L())}),{deep:!0}))}),{immediate:!0}),t.watch([O,y],(function(){V(),L()}),{deep:!0}),t.watchEffect((function(){e.group&&_.value&&(_.value.group=e.group)}));var S=o(_);return function(e,n,i){var o=t.inject(b,{}),s=t.computed((function(){return r(r({},t.unref(o)),null==i?void 0:i.value)}));t.watchEffect((function(){var t=e.value;t&&(n.value?t.showLoading(s.value):t.hideLoading())}))}(_,g,z),m(_,h,u),t.onMounted((function(){L()})),t.onUnmounted(V),r({chart:_,root:u,setOption:function(t,n){e.manualUpdate&&(c.value=t),_.value?_.value.setOption(t,n||{}):L(t)},nonEventAttrs:C},S)},render:function(){var e=r({},this.nonEventAttrs);return e.ref="root",e.class=e.class?["echarts"].concat(e.class):"echarts",t.h(C,e)}}),V=Object.freeze({__proto__:null,default:L,LOADING_OPTIONS_KEY:b,THEME_KEY:A,INIT_OPTIONS_KEY:T,UPDATE_OPTIONS_KEY:j});return r(r({},L),V)}));
//# sourceMappingURL=index.umd.min.js.map
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<meta name="description" content="{ms:global.descrip/}"> <meta name="description" content="{ms:global.descrip/}">
<script type="text/javascript" src="{ms:global.host/}/static/plugins/vue/2.6.9/vue.min.js"></script> <script type="text/javascript" src="{ms:global.host/}/static/plugins/vue/2.6.9/vue.min.js"></script>
<link rel="stylesheet" href="{ms:global.host/}/static/plugins/minireset/0.0.2/minireset.min.css"> <link rel="stylesheet" href="{ms:global.host/}/static/plugins/minireset/0.0.2/minireset.min.css">
<link rel="stylesheet" href="{ms:global.host/}/iconfont/1.0.0/iconfont.css"> <link rel="stylesheet" href="{ms:global.host/}/static/plugins/iconfont/1.0.0/iconfont.css">
<link rel="stylesheet" href="{ms:global.host/}/static/plugins/animate/4.1.0/animate.min.css"> <link rel="stylesheet" href="{ms:global.host/}/static/plugins/animate/4.1.0/animate.min.css">
<script src="{ms:global.host/}/static/plugins/element-ui/2.15.7/index.min.js"></script> <script src="{ms:global.host/}/static/plugins/element-ui/2.15.7/index.min.js"></script>
<link rel="stylesheet" href="{ms:global.host/}/static/plugins/element-ui/2.15.7/theme-chalk/index.min.css"> <link rel="stylesheet" href="{ms:global.host/}/static/plugins/element-ui/2.15.7/theme-chalk/index.min.css">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="body"> <div class="body">
<div class="logo"> <div class="logo">
<img title="" alt="" src="{ms:global.host/}/{@ms:file global.logo/}" class="logo-pic"> <img title="" alt="" src="{ms:global.host/}/{@ms:file global.logo/}" class="logo-pic">
<img title="" alt="" src="https://www.mingsoft.net//template/1/ms/images/1596437934982.png" class="logo-desc"> <img title="" alt="" src="https://www.mingsoft.net/static/images/logo_text.png" class="logo-desc">
</div> </div>
<div @click="switchShow([&quot;1605172743000_96378&quot;]);" class="nav-h5"> <div @click="switchShow([&quot;1605172743000_96378&quot;]);" class="nav-h5">
<i class="iconfont icon-caidan nav-h5-icon"></i> <i class="iconfont icon-caidan nav-h5-icon"></i>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment