Skip to content

C
cloud-platform-ui
Commit 01262b7b authored by rencs's avatar rencs
Browse files
Options

10.14

parent cf196b7f
Show whitespace changes
Inline Side-by-side
Showing with 1714 additions and 1531 deletions
src/views/modal/Ueditor.vue
View file @ 01262b7b
......@@ -40,7 +40,3 @@ export default {
};
</script>
<style lang="scss" scoped>
.edui-default {
z-index: 0;
}
</style>>
\ No newline at end of file
src/views/tourManage/modal/oneTourModal.vue
View file @ 01262b7b
<template>
<!-- 旅游：创建、编辑 -->
<div>
<h4>{{title}}</h4>
<h4>{{ title }}</h4>
<p class="title_line_P">基础信息</p>
<el-form :model="form" :rules="rules" ref="form" label-width="90px">
<el-row>
<el-col :span="8">
<el-form-item label="旅行名称" prop="name">
<el-input v-model="form.name" placeholder="请输入旅行名称"></el-input>
<el-input
v-model="form.name"
placeholder="请输入旅行名称"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="描述">
<el-input v-model="form.describe" placeholder="请输入描述"></el-input>
<el-input
v-model="form.describe"
placeholder="请输入描述"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item label="成人价" prop="price">
<el-input v-model="form.price" type="number" min="0" placeholder="请输入成人价"></el-input>
<el-input
v-model="form.price"
type="number"
min="0"
placeholder="请输入成人价"
></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="儿童价" prop="childPrice">
<el-input v-model="form.childPrice" type="number" min="0" placeholder="请输入儿童价"></el-input>
<el-input
v-model="form.childPrice"
type="number"
min="0"
placeholder="请输入儿童价"
></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="库存" prop="stock">
<el-input v-model="form.stock" placeholder="请输入总人数" type="number" min="0"></el-input>
<el-input
v-model="form.stock"
placeholder="请输入总人数"
type="number"
min="0"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!--BASE_API + -->
<el-form-item label="封面图" :style="{display:'block'}">
<el-form-item label="封面图" :style="{ display: 'block' }">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:action="BASE_API + '/api/universal/file/app/unauth/admin/upload'"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:on-progress="uploadProcess"
list-type="picture"
>
<div slot="tip" class="el-upload__tip">
<span style="color: red;">建议尺寸：320*228px</span>
<span style="color: red">建议尺寸：320*228px</span>
</div>
<el-progress
v-show="imgFlag == true"
......@@ -57,24 +78,33 @@
style="margin-top: 20px"
></el-progress>
<img
v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover) && !imgFlag"
v-if="
$utils.isString(form.cover) &&
!$utils.isEmpty(form.cover) &&
!imgFlag
"
:src="form.cover"
style="width:300px;max-height:300px;"
style="width: 300px; max-height: 300px"
/>
<i
v-else-if="!imgFlag"
class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
style="
lineheight: 100px;
width: 300px;
height: 100px;
border: 1px dashed #ccc;
"
></i>
</el-upload>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="轮播图" :style="{display:'block'}">
<el-form-item label="轮播图" :style="{ display: 'block' }">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:action="BASE_API + '/api/universal/file/app/unauth/admin/upload'"
:on-remove="handleRemove"
:file-list="fileList2"
:on-success="handleBannerSuccess"
......@@ -82,23 +112,35 @@
>
<div slot="tip" class="el-upload__tip">
最多上传5张
<span style="color: red;">建议尺寸：1080*644px</span>
<span style="color: red">建议尺寸：1080*644px</span>
</div>
<el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button>
<el-button v-if="fileList2.length < 5" size="small" type="primary"
>点击上传</el-button
>
</el-upload>
</el-form-item>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item label="浏览量">
<el-input v-model="form.viewCount" placeholder="请输入浏览量" type="number" min="0"></el-input>
<el-input
v-model="form.viewCount"
placeholder="请输入浏览量"
type="number"
min="0"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item label="排序">
<el-input v-model="form.rank" placeholder="请输入排序值" type="number" min="0"></el-input>
<el-input
v-model="form.rank"
placeholder="请输入排序值"
type="number"
min="0"
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -112,7 +154,12 @@
<el-row>
<el-col :span="4">
<el-form-item label="销量">
<el-input v-model="form.saleCount" type="number" min="0" placeholder="请输入销量"></el-input>
<el-input
v-model="form.saleCount"
type="number"
min="0"
placeholder="请输入销量"
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -120,8 +167,14 @@
<span
v-for="item in form.tagDTOS"
:key="item.id"
style="border: 1px solid #ccc; padding: 5px 10px;border-radius: 5px;margin-right: 10px;"
>{{item.name}}</span>
style="
border: 1px solid #ccc;
padding: 5px 10px;
border-radius: 5px;
margin-right: 10px;
"
>{{ item.name }}</span
>
<!--<el-checkbox-group v-model="checkList">-->
<!--<el-checkbox v-for="item in allLabelList"-->
<!--:key="item.id" :label="item.name"></el-checkbox>-->
......@@ -132,7 +185,8 @@
type="button"
icon="edit"
@click="editLable(form.tagDTOS)"
>编辑</el-button>
>编辑</el-button
>
</el-form-item>
<el-row>
<el-form-item label="所属公司" prop="corporationId">
......@@ -145,11 +199,21 @@
placeholder="请选择公司"
>
<el-option label="全部" :key="undefined" :value="0"></el-option>
<el-option v-for="val in companys_list" :key="val.id" :label="val.name" :value="val.id"></el-option>
<el-option
v-for="val in companys_list"
:key="val.id"
:label="val.name"
:value="val.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属门店">
<el-select class="filter-item" v-model="form.companyId" clearable placeholder="请选择">
<el-select
class="filter-item"
v-model="form.companyId"
clearable
placeholder="请选择"
>
<el-option label="全部" :key="undefined" :value="0"></el-option>
<el-option
v-for="val in branchCompany_list"
......@@ -164,27 +228,39 @@
<el-row>
<el-col :span="4">
<el-form-item label="是否为推荐" v-if="false">
<el-radio class="radio" v-model="form.recommend" label="1">是</el-radio>
<el-radio class="radio" v-model="form.recommend" label="0">否</el-radio>
<el-radio class="radio" v-model="form.recommend" label="1"
>是</el-radio
>
<el-radio class="radio" v-model="form.recommend" label="0"
>否</el-radio
>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会员价格" v-if="false">
<el-radio class="radio" v-model="form.isMember" label="1">启用会员价</el-radio>
<el-radio class="radio" v-model="form.isMember" label="0">不启用会员价</el-radio>
<el-radio class="radio" v-model="form.isMember" label="1"
>启用会员价</el-radio
>
<el-radio class="radio" v-model="form.isMember" label="0"
>不启用会员价</el-radio
>
</el-form-item>
</el-col>
</el-row>
<el-form-item label v-if="false">
<el-radio class="radio" v-model="form.isOutside" label="0">省内</el-radio>
<el-radio class="radio" v-model="form.isOutside" label="1">省外</el-radio>
<el-radio class="radio" v-model="form.isOutside" label="0"
>省内</el-radio
>
<el-radio class="radio" v-model="form.isOutside" label="1"
>省外</el-radio
>
</el-form-item>
<el-row>
<!--<el-col :span="24">-->
<el-form-item label="出发地">
<el-input
style="display: inline-block;margin-right: 10px;width: 240px;"
style="display: inline-block; margin-right: 10px; width: 240px"
v-model="item.name"
v-for="item in departureList"
:key="item.id"
......@@ -197,7 +273,8 @@
type="button"
icon="edit"
@click="editDeparture(departureList)"
>编辑</el-button>
>编辑</el-button
>
<!--<el-autocomplete-->
<!--v-for="item in departureList"-->
<!--:key="item.id"-->
......@@ -237,7 +314,7 @@
type="button"
@click="editPathway(item)"
>
{{item.name}}
{{ item.name }}
<i class="el-icon-edit el-icon--right"></i>
</el-button>
<el-button
......@@ -246,7 +323,8 @@
type="button"
icon="plus"
@click="addPathway()"
>添加</el-button>
>添加</el-button
>
</el-form-item>
<!--</el-col>-->
</el-row>
......@@ -259,7 +337,8 @@
:key="item.id"
class="el-button el-button--default"
type="button"
>{{item.startTime}}~{{item.endTime}}</el-button>
>{{ item.startTime }}~{{ item.endTime }}</el-button
>
<el-button
size="small"
......@@ -267,7 +346,8 @@
type="button"
icon="edit"
@click="editTime()"
>编辑</el-button>
>编辑</el-button
>
<!--<el-input v-model="form.operator" placeholder="请选择活动日期"></el-input>-->
</el-form-item>
</el-row>
......@@ -275,43 +355,59 @@
<el-row>
<el-col :span="8">
<el-form-item label="alt" v-if="false">
<el-input v-model="form.alt" type="text" placeholder="请输入替代文本"></el-input>
<el-input
v-model="form.alt"
type="text"
placeholder="请输入替代文本"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="img-title" v-if="false">
<el-input v-model="form.imgTitle" type="text" placeholder="请输入图片title"></el-input>
<el-input
v-model="form.imgTitle"
type="text"
placeholder="请输入图片title"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="img-keyword" v-if="false">
<el-input v-model="form.imgKeyword" type="text" placeholder="请输入图片关键字"></el-input>
<el-input
v-model="form.imgKeyword"
type="text"
placeholder="请输入图片关键字"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="img-desc" v-if="false">
<el-input v-model="form.imgDesc" type="text" placeholder="请输入图片描述"></el-input>
<el-input
v-model="form.imgDesc"
type="text"
placeholder="请输入图片描述"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="海报背景" :style="{display:'block'}" v-if="false">
<el-form-item label="海报背景" :style="{ display: 'block' }" v-if="false">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:action="BASE_API + '/api/universal/file/app/unauth/admin/upload'"
:show-file-list="false"
:on-success="handlePosterSuccess"
:on-progress="uploadPosterProcess"
list-type="picture"
>
<div slot="tip" class="el-upload__tip">
<span style="color: red;">建议尺寸：320*228px</span>
<span style="color: red">建议尺寸：320*228px</span>
</div>
<el-progress
v-show="imgPosterFlag == true"
......@@ -320,21 +416,30 @@
style="margin-top: 20px"
></el-progress>
<img
v-if="$utils.isString(form.posterBackground) && !$utils.isEmpty(form.posterBackground)&& !imgPosterFlag"
v-if="
$utils.isString(form.posterBackground) &&
!$utils.isEmpty(form.posterBackground) &&
!imgPosterFlag
"
:src="form.posterBackground"
style="width:300px;max-height:300px;"
style="width: 300px; max-height: 300px"
/>
<i
v-else-if="!imgPosterFlag"
class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
style="
lineheight: 100px;
width: 300px;
height: 100px;
border: 1px dashed #ccc;
"
></i>
</el-upload>
</el-form-item>
<el-tabs v-model="activeName2" type="card" @tab-click="handleClick">
<el-tab-pane label="行程亮点" name="first">
<div class="editor-container" v-if="activeName2=='first'">
<div class="editor-container" v-if="activeName2 == 'first'">
<UE
:editorId="activeName2"
:defaultMsg="form.content"
......@@ -346,7 +451,7 @@
<!--<Editor v-if="activeName2=='first'" @input="handelContentIncrease" :value="form.content" :myQuillEditor="'myQuillEditorContent'" :activeName2="activeName2"></Editor>-->
</el-tab-pane>
<el-tab-pane label="行程介绍" name="second">
<div class="editor-container" v-if="activeName2=='second'">
<div class="editor-container" v-if="activeName2 == 'second'">
<UE
:editorId="activeName2"
:defaultMsg="form.introduce"
......@@ -358,7 +463,7 @@
<!--<Editor v-if="activeName2=='second'" @input="handelIntroduceIncrease" :value="form.introduce" :myQuillEditor="'myQuillEditorIntroduce'" :activeName2="activeName2"></Editor>-->
</el-tab-pane>
<el-tab-pane label="费用说明" name="third">
<div class="editor-container" v-if="activeName2=='third'">
<div class="editor-container" v-if="activeName2 == 'third'">
<UE
:editorId="activeName2"
:defaultMsg="form.explain"
......@@ -373,12 +478,18 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelTour">取 消</el-button>
<el-button type="primary" v-if="title=='创建' && !isCreate" @click="create('form')">确 定</el-button>
<el-button
type="primary"
v-if="title=='编辑' && !isCreate&&good_btn_update"
v-if="title == '创建' && !isCreate"
@click="create('form')"
>确 定</el-button
>
<el-button
type="primary"
v-if="title == '编辑' && !isCreate && good_btn_update"
@click="update('form')"
>确 定</el-button>
>确 定</el-button
>
</div>
<!--编辑出发地-->
<departureModal
......@@ -393,7 +504,11 @@
v-on:destinationEvent="destinationEvent"
></destination>
<!--编辑途径地-->
<destination v-if="showPathWayVisible" :obj="onePathObj" v-on:pathWayEvent="pathWayEvent"></destination>
<destination
v-if="showPathWayVisible"
:obj="onePathObj"
v-on:pathWayEvent="pathWayEvent"
></destination>
<!--编辑活动时间-->
<tourTime
v-if="showTimeVisible"
......
static/utf8-jsp/themes/default/css/ueditor.css
View file @ 01262b7b
/*基础UI构建
*/
.edui-default{
z-index: 3000 !important;
.edui-default {
z-index: 1000 !important;
}
.edui-popup-content{
.edui-popup-content {
position: absolute;
top:0;
top: 0;
height: 200px !important;
overflow-y: auto;
}
/* common layer */
.edui-default .edui-box {
border: none;
......@@ -56,7 +58,7 @@ div.edui-box {
clear: both;
}
* html div.edui-box {
* html div.edui-box {
display: inline !important;
}
......@@ -65,7 +67,10 @@ div.edui-box {
}
/* control layout */
.edui-default .edui-button-body, .edui-splitbutton-body, .edui-menubutton-body, .edui-combox-body {
.edui-default .edui-button-body,
.edui-splitbutton-body,
.edui-menubutton-body,
.edui-combox-body {
position: relative;
}
......@@ -93,7 +98,8 @@ div.edui-box {
position: absolute;
}
.edui-default .edui-dialog-modalmask, .edui-dialog-dragmask {
.edui-default .edui-dialog-modalmask,
.edui-dialog-dragmask {
position: absolute;
left: 0;
top: 0;
......@@ -122,16 +128,18 @@ div.edui-box {
color: gray;
cursor: default;
}
/* 工具栏 */
.edui-default .edui-toolbar {
cursor: default;
-webkit-user-select: none;
-moz-user-select: none;
padding: 1px;
overflow: hidden; /*全屏下单独一行不占位*/
overflow: hidden;
/*全屏下单独一行不占位*/
zoom: 1;
width:auto;
height:auto;
width: auto;
height: auto;
}
.edui-default .edui-toolbar .edui-button,
......@@ -140,6 +148,7 @@ div.edui-box {
.edui-default .edui-toolbar .edui-combox {
margin: 1px;
}
/*UI工具栏、编辑区域、底部*/
.edui-default .edui-editor {
border: 1px solid #d4d4d4;
......@@ -150,18 +159,20 @@ div.edui-box {
-moz-border-radius: 4px;
border-radius: 4px;
}
.edui-editor div{
width:auto;
height:auto;
.edui-editor div {
width: auto;
height: auto;
}
.edui-default .edui-editor-toolbarbox {
position: relative;
zoom: 1;
-webkit-box-shadow:0 1px 4px rgba(204, 204, 204, 0.6);
-moz-box-shadow:0 1px 4px rgba(204, 204, 204, 0.6);
box-shadow:0 1px 4px rgba(204, 204, 204, 0.6);
border-top-left-radius:2px;
border-top-right-radius:2px;
-webkit-box-shadow: 0 1px 4px rgba(204, 204, 204, 0.6);
-moz-box-shadow: 0 1px 4px rgba(204, 204, 204, 0.6);
box-shadow: 0 1px 4px rgba(204, 204, 204, 0.6);
border-top-left-radius: 2px;
border-top-right-radius: 2px;
}
.edui-default .edui-editor-toolbarboxouter {
......@@ -232,9 +243,11 @@ div.edui-box {
margin-right: 5px;
color: #aaa;
}
.edui-default .edui-editor-scale {
width: 12px;
}
.edui-default .edui-editor-scale .edui-editor-icon {
float: right;
width: 100%;
......@@ -243,6 +256,7 @@ div.edui-box {
background: url(../images/scale.png) no-repeat;
cursor: se-resize;
}
.edui-default .edui-editor-breadcrumb {
margin: 2px 0 0 3px;
}
......@@ -308,6 +322,7 @@ div.edui-box {
cursor: pointer;
color: red;
}
/*可选中菜单按钮*/
.edui-default .edui-list .edui-bordereraser {
display: none;
......@@ -333,6 +348,7 @@ div.edui-box {
line-height: 22px;
padding-left: 5px;
}
.edui-default .edui-for-insertcode .edui-listitem-label {
min-width: 120px;
_width: 120px;
......@@ -341,6 +357,7 @@ div.edui-box {
line-height: 22px;
padding-left: 5px;
}
.edui-default .edui-for-underline .edui-listitem-label {
min-width: 120px;
_width: 120px;
......@@ -380,6 +397,7 @@ div.edui-box {
width: 200px !important;
padding: 2px 5px;
}
/* 可选中按钮弹出菜单*/
.edui-default .edui-menu {
z-index: 3000;
......@@ -395,8 +413,7 @@ div.edui-box {
background: url("../images/sparator_v.png") repeat-y 25px;
}
.edui-default .edui-menuitem-body {
}
.edui-default .edui-menuitem-body {}
.edui-default .edui-menuitem {
height: 20px;
......@@ -482,13 +499,14 @@ div.edui-box {
.edui-toolbar .edui-state-disabled .edui-combox-body {
background-color: #F0F0EE;
opacity: 0.3;
filter: alpha(opacity = 30);
filter: alpha(opacity=30);
}
.edui-toolbar .edui-state-opened .edui-combox-body {
background-color: white;
border: 1px solid gray;
}
/*普通按钮样式及状态*/
.edui-default .edui-toolbar .edui-button .edui-icon,
.edui-default .edui-toolbar .edui-menubutton .edui-icon,
......@@ -524,12 +542,14 @@ div.edui-box {
padding: 0;
border: 1px solid gray;
}
.edui-default .edui-toolbar .edui-state-disabled .edui-label {
color: #ccc;
}
.edui-default .edui-toolbar .edui-state-disabled .edui-icon {
opacity: 0.3;
filter: alpha(opacity = 30);
filter: alpha(opacity=30);
}
/* toolbar icons */
......@@ -550,8 +570,9 @@ div.edui-box {
}
.edui-default .edui-for-fontborder .edui-icon {
background-position:-160px -40px;
background-position: -160px -40px;
}
.edui-default .edui-for-underline .edui-icon {
background-position: -140px 0;
}
......@@ -937,7 +958,7 @@ div.edui-box {
}
.edui-default .edui-for-charts .edui-icon {
background: url( ../images/charts.png ) no-repeat 2px 3px!important;
background: url(../images/charts.png ) no-repeat 2px 3px !important;
}
.edui-default .edui-for-inserttitlecol .edui-icon {
......@@ -951,6 +972,7 @@ div.edui-box {
.edui-default .edui-for-simpleupload .edui-icon {
background-position: -380px 0px;
}
/*splitbutton*/
.edui-default .edui-toolbar .edui-splitbutton-body .edui-arrow,
.edui-default .edui-toolbar .edui-menubutton-body .edui-arrow {
......@@ -1008,7 +1030,7 @@ div.edui-box {
.edui-default .edui-state-disabled .edui-arrow {
opacity: 0.3;
_filter: alpha(opacity = 30);
_filter: alpha(opacity=30);
}
.edui-default .edui-toolbar .edui-splitbutton .edui-state-opened .edui-splitbutton-body,
......@@ -1033,15 +1055,15 @@ div.edui-box {
.edui-default .edui-for-rowspacingbottom .edui-popup-body .edui-icon,
.edui-default .edui-for-insertunorderedlist .edui-popup-body .edui-icon {
/*background-position: 0 -40px;*/
background-image: none ;
background-image: none;
}
/* 弹出菜单 */
.edui-default .edui-popup {
z-index: 3000 !important;
background-color: #ffffff;
width:auto;
height:auto;
width: auto;
height: auto;
}
......@@ -1053,7 +1075,7 @@ div.edui-box {
}
.edui-default .edui-popup-content {
border:1px solid #ccc;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
......@@ -1067,7 +1089,7 @@ div.edui-box {
-moz-background-clip: padding;
background-clip: padding-box;
padding: 5px;
background:#ffffff;
background: #ffffff;
}
.edui-default .edui-popup .edui-bordereraser {
......@@ -1105,10 +1127,11 @@ div.edui-box {
border-right: 1px solid gray;
}
.edui-popup div{
width:auto;
height:auto;
.edui-popup div {
width: auto;
height: auto;
}
.edui-default .edui-editor-messageholder {
display: block;
width: 150px;
......@@ -1121,36 +1144,41 @@ div.edui-box {
right: 3px;
}
.edui-default .edui-message{
.edui-default .edui-message {
min-height: 10px;
text-shadow: 0 1px 0 rgba(255,255,255,0.5);
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
padding: 0;
margin-bottom: 3px;
position: relative;
}
.edui-default .edui-message-body{
.edui-default .edui-message-body {
border-radius: 3px;
padding: 8px 15px 8px 8px;
color: #c09853;
background-color: #fcf8e3;
border: 1px solid #fbeed5;
}
.edui-default .edui-message-type-info{
.edui-default .edui-message-type-info {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1
}
.edui-default .edui-message-type-success{
.edui-default .edui-message-type-success {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6
}
.edui-default .edui-message-type-danger,
.edui-default .edui-message-type-error{
.edui-default .edui-message-type-error {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7
}
.edui-default .edui-message .edui-message-closer {
display: block;
width: 16px;
......@@ -1168,13 +1196,15 @@ div.edui-box {
font-weight: bold;
color: #999;
text-shadow: 0 1px 0 #fff;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
.edui-default .edui-message .edui-message-content {
font-size: 10pt;
word-wrap: break-word;
word-break: normal;
}
/* 弹出对话框按钮和对话框大小 */
.edui-default .edui-dialog {
z-index: 3000 !important;
......@@ -1183,8 +1213,8 @@ div.edui-box {
}
.edui-dialog div{
width:auto;
.edui-dialog div {
width: auto;
}
.edui-default .edui-dialog-wrap {
......@@ -1199,7 +1229,7 @@ div.edui-box {
.edui-default .edui-dialog-body {
position: relative;
padding:2px 0 0 2px;
padding: 2px 0 0 2px;
_zoom: 1;
}
......@@ -1241,6 +1271,7 @@ div.edui-box {
position: relative;
cursor: move;
}
.edui-default .edui-dialog-caption {
font-weight: bold;
font-size: 12px;
......@@ -1305,7 +1336,7 @@ div.edui-box {
.edui-default .edui-dialog-modalmask {
opacity: 0.3;
filter: alpha(opacity = 30);
filter: alpha(opacity=30);
background-color: #ccc;
position: absolute;
/*z-index: 1999;*/
......@@ -1330,7 +1361,7 @@ div.edui-box {
width: 100%;
height: 100%;
opacity: 0;
filter: alpha(opacity = 0);
filter: alpha(opacity=0);
}
/*link-dialog*/
......@@ -1339,6 +1370,7 @@ div.edui-box {
height: 200px;
overflow: hidden;
}
/*background-dialog*/
.edui-default .edui-for-background .edui-dialog-content {
width: 440px;
......@@ -1374,6 +1406,7 @@ div.edui-box {
height: 400px;
overflow: hidden;
}
/*webapp-dialog*/
.edui-default .edui-for-webapp .edui-dialog-content {
width: 560px;
......@@ -1444,7 +1477,7 @@ div.edui-box {
/*edittable-dialog*/
.edui-default .edui-for-edittable .edui-dialog-content {
width: 540px;
_width:590px;
_width: 590px;
height: 335px;
}
......@@ -1459,6 +1492,7 @@ div.edui-box {
width: 240px;
height: 50px;
}
/*snapscreen-dialog*/
.edui-default .edui-for-snapscreen .edui-dialog-content {
width: 400px;
......@@ -1516,16 +1550,20 @@ div.edui-box {
font-size: 12px;
line-height: 14px;
}
/* 表格弹出菜单 */
.edui-default .edui-for-inserttable .edui-splitborder {
display: none
}
.edui-default .edui-for-inserttable .edui-splitbutton-body .edui-arrow {
width: 0
}
.edui-default .edui-toolbar .edui-for-inserttable .edui-state-active .edui-splitborder{
.edui-default .edui-toolbar .edui-for-inserttable .edui-state-active .edui-splitborder {
border-left: 1px solid transparent;
}
.edui-default .edui-tablepicker .edui-infoarea {
height: 14px;
line-height: 14px;
......@@ -1600,28 +1638,35 @@ div.edui-box {
height: 14px;
margin: 0;
}
.edui-default .edui-colorpicker-advbtn{
.edui-default .edui-colorpicker-advbtn {
display: block;
text-align: center;
cursor: pointer;
height:20px;
height: 20px;
}
.arrow_down{
.arrow_down {
background: white url('../images/arrow_down.png') no-repeat center;
}
.arrow_up{
.arrow_up {
background: white url('../images/arrow_up.png') no-repeat center;
}
/*高级的样式*/
.edui-colorpicker-adv{
.edui-colorpicker-adv {
position: relative;
overflow: hidden;
height: 180px;
display: none;
}
.edui-colorpicker-plant, .edui-colorpicker-hue {
.edui-colorpicker-plant,
.edui-colorpicker-hue {
border: solid 1px #666;
}
.edui-colorpicker-pad {
width: 150px;
height: 150px;
......@@ -1632,7 +1677,8 @@ div.edui-box {
overflow: hidden;
cursor: crosshair;
}
.edui-colorpicker-cover{
.edui-colorpicker-cover {
position: absolute;
top: 0;
left: 0;
......@@ -1640,7 +1686,8 @@ div.edui-box {
height: 150px;
background: url("../images/tangram-colorpicker.png") -160px -200px;
}
.edui-colorpicker-padDot{
.edui-colorpicker-padDot {
position: absolute;
top: 0;
left: 0;
......@@ -1651,6 +1698,7 @@ div.edui-box {
z-index: 1000;
}
.edui-colorpicker-sliderMain {
position: absolute;
left: 171px;
......@@ -1660,12 +1708,14 @@ div.edui-box {
background: url(../images/tangram-colorpicker.png) -179px -12px no-repeat;
}
.edui-colorpicker-slider {
width: 100%;
height: 100%;
cursor: pointer;
}
.edui-colorpicker-thumb{
.edui-colorpicker-thumb {
position: absolute;
top: 0;
cursor: pointer;
......@@ -1676,6 +1726,7 @@ div.edui-box {
background: white;
opacity: .8;
}
/*自动排版弹出菜单*/
.edui-default .edui-autotypesetpicker .edui-autotypesetpicker-body {
font-size: 12px;
......@@ -1690,13 +1741,14 @@ div.edui-box {
.edui-default .edui-autotypesetpicker-body td {
font-size: 12px;
word-wrap:break-word;
word-wrap: break-word;
}
.edui-default .edui-autotypesetpicker-body td input {
margin: 3px 3px 3px 4px;
*margin: 1px 0 0 0;
}
/*自动排版弹出菜单*/
.edui-default .edui-cellalignpicker .edui-cellalignpicker-body {
width: 70px;
......@@ -1708,36 +1760,39 @@ div.edui-box {
border-collapse: separate;
border-spacing: 0;
}
.edui-default .edui-cellalignpicker-body td{
.edui-default .edui-cellalignpicker-body td {
padding: 1px;
}
.edui-default .edui-cellalignpicker-body .edui-icon{
.edui-default .edui-cellalignpicker-body .edui-icon {
height: 20px;
width: 20px;
padding: 1px;
background-image: url(../images/table-cell-align.png);
}
.edui-default .edui-cellalignpicker-body .edui-left{
.edui-default .edui-cellalignpicker-body .edui-left {
background-position: 0 0;
}
.edui-default .edui-cellalignpicker-body .edui-center{
.edui-default .edui-cellalignpicker-body .edui-center {
background-position: -25px 0;
}
.edui-default .edui-cellalignpicker-body .edui-right{
.edui-default .edui-cellalignpicker-body .edui-right {
background-position: -51px 0;
}
.edui-default .edui-cellalignpicker-body td.edui-state-hover .edui-left{
.edui-default .edui-cellalignpicker-body td.edui-state-hover .edui-left {
background-position: -73px 0;
}
.edui-default .edui-cellalignpicker-body td.edui-state-hover .edui-center{
.edui-default .edui-cellalignpicker-body td.edui-state-hover .edui-center {
background-position: -98px 0;
}
.edui-default .edui-cellalignpicker-body td.edui-state-hover .edui-right{
.edui-default .edui-cellalignpicker-body td.edui-state-hover .edui-right {
background-position: -124px 0;
}
......@@ -1753,6 +1808,7 @@ div.edui-box {
.edui-default .edui-cellalignpicker-body td.edui-cellalign-selected .edui-right {
background-position: -271px 0;
}
/*分隔线*/
.edui-default .edui-toolbar .edui-separator {
width: 2px;
......@@ -1771,19 +1827,20 @@ div.edui-box {
width: 18px;
height: 4px;
}
/*表情按钮及弹出菜单*/
/*去除了表情的下拉箭头*/
.edui-default .edui-for-emotion .edui-icon {
background-position: -60px -20px;
}
.edui-default .edui-for-emotion .edui-popup-content iframe
{
.edui-default .edui-for-emotion .edui-popup-content iframe {
width: 514px;
height: 380px;
overflow: hidden;
}
.edui-default .edui-for-emotion .edui-popup-content
{
.edui-default .edui-for-emotion .edui-popup-content {
position: relative;
z-index: 555
}
......@@ -1792,14 +1849,14 @@ div.edui-box {
display: none
}
.edui-default .edui-for-emotion .edui-splitbutton-body .edui-arrow
{
.edui-default .edui-for-emotion .edui-splitbutton-body .edui-arrow {
width: 0
}
.edui-default .edui-toolbar .edui-for-emotion .edui-state-active .edui-splitborder
{
.edui-default .edui-toolbar .edui-for-emotion .edui-state-active .edui-splitborder {
border-left: 1px solid transparent;
}
/*contextmenu*/
.edui-default .edui-hassubmenu .edui-arrow {
height: 20px;
......@@ -1829,6 +1886,7 @@ div.edui-box {
background-color: #fff5d4;
border: 1px solid #dcac6c;
}
/*弹出菜单*/
.edui-default .edui-shortcutmenu {
padding: 2px;
......@@ -1840,12 +1898,13 @@ div.edui-box {
}
/*粘贴弹出菜单*/
.edui-default .edui-wordpastepop .edui-popup-content{
.edui-default .edui-wordpastepop .edui-popup-content {
border: none;
padding: 0;
width: 54px;
height: 21px;
}
.edui-default .edui-pasteicon {
width: 100%;
height: 100%;
......@@ -1881,7 +1940,7 @@ div.edui-box {
.edui-default .edui-pastecontainer .edui-button .edui-richtxticon,
.edui-default .edui-pastecontainer .edui-button .edui-tagicon,
.edui-default .edui-pastecontainer .edui-button .edui-plaintxticon{
.edui-default .edui-pastecontainer .edui-button .edui-plaintxticon {
float: left;
cursor: pointer;
width: 29px;
......@@ -1890,10 +1949,12 @@ div.edui-box {
background-image: url('../images/wordpaste.png');
background-repeat: no-repeat;
}
.edui-default .edui-pastecontainer .edui-button .edui-richtxticon {
margin-left: 0;
background-position: -109px 0;
}
.edui-default .edui-pastecontainer .edui-button .edui-tagicon {
background-position: -148px 1px;
}
......@@ -1905,9 +1966,11 @@ div.edui-box {
.edui-default .edui-pastecontainer .edui-button .edui-state-hover .edui-richtxticon {
background-position: -109px -34px;
}
.edui-default .edui-pastecontainer .edui-button .edui-state-hover .edui-tagicon{
.edui-default .edui-pastecontainer .edui-button .edui-state-hover .edui-tagicon {
background-position: -148px -34px;
}
.edui-default .edui-pastecontainer .edui-button .edui-state-hover .edui-plaintxticon{
.edui-default .edui-pastecontainer .edui-button .edui-state-hover .edui-plaintxticon {
background-position: -72px -34px;
}
static/utf8-jsp/ueditor.config.js
View file @ 01262b7b
......@@ -21,17 +21,17 @@
*/
window.UEDITOR_HOME_URL = "/static/utf8-jsp/";
var getHost = function(url) {
var getHost = function (url) {
var host = "null";
if(typeof url == "undefined"
|| null == url)
if (typeof url == "undefined" ||
null == url)
url = window.location.href;
var regex = /.*\:\/\/([^\/]*).*/;
var match = url.match(regex);
if(typeof match != "undefined"
&& null != match)
if (typeof match != "undefined" &&
null != match)
host = match[1];
return host+"/";
return host + "/";
}
var URL = window.UEDITOR_HOME_URL || getUEBasePath();
......@@ -44,10 +44,13 @@
UEDITOR_HOME_URL: URL
// 服务器统一请求接口路径
, serverUrl:"api/universal/file/app/unauth/ueditor"
,
serverUrl: "api/universal/file/app/unauth/ueditor"
//工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
, toolbars: [[
,
toolbars: [
[
'fullscreen', 'source', '|', 'undo', 'redo', '|',
'bold', 'italic', 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', 'selectall', 'cleardoc', '|',
'rowspacingtop', 'rowspacingbottom', 'lineheight', '|',
......@@ -59,7 +62,8 @@
'horizontal', 'date', 'time', 'spechars', 'snapscreen', 'wordimage', '|',
'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',
'print', 'preview', 'searchreplace', 'drafts', 'help'
]]
]
]
//当鼠标放在工具栏上时显示的tooltip提示,留空支持自动多语言配置，否则以配置值为准
//,labelMap:{
// 'anchor':'', 'undo':''
......@@ -75,7 +79,8 @@
//,theme:'default'
//,themePath:URL +"themes/"
//,zIndex : 900 //编辑器层级的基数,默认是900
,
zIndex: 0 //编辑器层级的基数,默认是900
//针对getAllHtml方法，会在对应的head标签中增加该编码设置。
//,charset:"utf-8"
......@@ -370,13 +375,17 @@
//,rgb2Hex:true //默认产出的数据中的color自动从rgb格式变成16进制格式
// xss 过滤是否开启,inserthtml等操作
,xssFilterRules: true
,
xssFilterRules: true
//input xss过滤
,inputXssFilter: true
,
inputXssFilter: true
//output xss过滤
,outputXssFilter: true
,
outputXssFilter: true
// xss过滤白名单 名单来源: https://raw.githubusercontent.com/leizongmin/js-xss/master/lib/default.js
,whitList: {
,
whitList: {
a: ['target', 'href', 'title', 'class', 'style'],
abbr: ['title', 'class', 'style'],
address: ['class', 'style'],
......@@ -423,7 +432,7 @@
p: ['class', 'style'],
pre: ['class', 'style'],
s: [],
section:[],
section: [],
small: [],
span: ['class', 'style'],
sub: ['class', 'style'],
......@@ -456,7 +465,7 @@
var configPath = document.getElementsByTagName('script');
return configPath[ configPath.length - 1 ].src;
return configPath[configPath.length - 1].src;
}
......@@ -483,7 +492,7 @@
function optimizationPath(path) {
var protocol = /^[a-z]+:\/\//.exec(path)[ 0 ],
var protocol = /^[a-z]+:\/\//.exec(path)[0],
tmp = null,
res = [];
......@@ -491,11 +500,11 @@
path = path.replace(/\\/g, '/').split(/\//);
path[ path.length - 1 ] = "";
path[path.length - 1] = "";
while (path.length) {
if (( tmp = path.shift() ) === "..") {
if ((tmp = path.shift()) === "..") {
res.pop();
} else if (tmp !== ".") {
res.push(tmp);
......
Markdown is supported
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