Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.0.1 #2

Merged
merged 4 commits into from
Jan 11, 2019
Merged

1.0.1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a6bc43
校验内容是否为html元素，进行转换
listars Jan 10, 2019
c213020
方法提取
listars Jan 10, 2019
c8eed2f
输入内容为空时，返回空字符串，而不是<p><br></p>
listars Jan 10, 2019
0a4be1b
1.0.1
listars Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions dist/v-editor.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@ var defaultEditorOptions = {
if (typeof document !== 'undefined') {
var head = document.head || document.getElementsByTagName('head')[0],
style = document.createElement('style'),
css = ".v-editor { position: relative; } .v-editor .disabled-mask { position: absolute; background-color: rgba(0,0,0,0); margin: 0; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000; cursor: not-allowed; } .v-editor .loading-mask { position: absolute; background-color: rgba(0,0,0,0.3); margin: 0; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000; } .v-editor .loading-mask .loading-content { position: absolute; text-align: center; width: 100%; top: 50%; margin-top: -21px; } ";style.type = 'text/css';if (style.styleSheet) {
css = ".v-editor { position: relative; } .v-editor .text-box { margin: 10px 0; line-height: 1.5; } .v-editor .disabled-mask { position: absolute; background-color: rgba(0,0,0,0); margin: 0; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000; cursor: not-allowed; } .v-editor .loading-mask { position: absolute; background-color: rgba(0,0,0,0.3); margin: 0; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000; } .v-editor .loading-mask .loading-content { position: absolute; text-align: center; width: 100%; top: 50%; margin-top: -21px; } ";style.type = 'text/css';if (style.styleSheet) {
style.styleSheet.cssText = css;
} else {
style.appendChild(document.createTextNode(css));
}head.appendChild(style);
}
})();

var HTML_PATTERN = /^<[a-z].*>$/i;

// 对齐wangEditor的样式
var editorValue = function editorValue(val) {
return val && HTML_PATTERN.test(val) ? val : '<div class="text-box">' + val + '<br></div>';
};

var Component = { render: function render() {
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('div', { staticClass: "v-editor" }, [_vm.showLoading ? _c('div', { staticClass: "loading-mask" }, [_c('div', { staticClass: "loading-content" }, [_vm._t("loading", [_c('p', [_vm._v("文件上传中...")])])], 2)]) : _vm._e(), _vm._v(" "), _c('div', { ref: "editor", staticStyle: { "text-align": "left" } }), _vm._v(" "), _c('upload-to-ali', _vm._b({ directives: [{ name: "show", rawName: "v-show", value: false, expression: "false" }], ref: "uploadToAli", attrs: { "multiple": "multiple" }, on: { "loading": _vm.handleLoading, "loaded": _vm.handleUploadFileSuccess } }, 'upload-to-ali', _vm.uploadOptions, false))], 1);
}, staticRenderFns: [],
Expand Down Expand Up @@ -89,7 +96,7 @@ var Component = { render: function render() {
value: function value(val, oldVal) {
//更新编辑器内容会导致光标偏移, 故只在blur之后更新
if (this.enableUpdateValue) {
this.editor && this.editor.$textElem.html(val);
this.editor && this.editor.$textElem.html(editorValue(val));
}
}
},
Expand All @@ -112,8 +119,10 @@ var Component = { render: function render() {
editor.customConfig.onchangeTimeout = this.editorOptions.onchangeTimeout || defaultEditorOptions.onchangeTimeout; // 单位 ms

editor.customConfig.onchange = function (html) {
// 输入内容为空时，返回空字符串，而不是<p><br></p>
var value = editor && editor.$textElem[0].textContent.trim() ? html : '';
// html 即变化之后的内容
_this.$emit('input', html);
_this.$emit('input', value);
};

editor.customConfig.onfocus = function (html) {
Expand All @@ -128,7 +137,7 @@ var Component = { render: function render() {
editor.create();

//设置默认值
editor.txt.html(this.value);
editor.txt.html(editorValue(this.value));
//是否禁用编辑器
document.querySelector('.w-e-toolbar').style['pointer-events'] = this.disabled ? 'none' : '';
editor.$textElem.attr('contenteditable', !this.disabled);
Expand Down
2 changes: 1 addition & 1 deletion dist/v-editor.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions dist/v-editor.umd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,21 @@
if (typeof document !== 'undefined') {
var head = document.head || document.getElementsByTagName('head')[0],
style = document.createElement('style'),
css = ".v-editor { position: relative; } .v-editor .disabled-mask { position: absolute; background-color: rgba(0,0,0,0); margin: 0; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000; cursor: not-allowed; } .v-editor .loading-mask { position: absolute; background-color: rgba(0,0,0,0.3); margin: 0; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000; } .v-editor .loading-mask .loading-content { position: absolute; text-align: center; width: 100%; top: 50%; margin-top: -21px; } ";style.type = 'text/css';if (style.styleSheet) {
css = ".v-editor { position: relative; } .v-editor .text-box { margin: 10px 0; line-height: 1.5; } .v-editor .disabled-mask { position: absolute; background-color: rgba(0,0,0,0); margin: 0; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000; cursor: not-allowed; } .v-editor .loading-mask { position: absolute; background-color: rgba(0,0,0,0.3); margin: 0; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000; } .v-editor .loading-mask .loading-content { position: absolute; text-align: center; width: 100%; top: 50%; margin-top: -21px; } ";style.type = 'text/css';if (style.styleSheet) {
style.styleSheet.cssText = css;
} else {
style.appendChild(document.createTextNode(css));
}head.appendChild(style);
}
})();

var HTML_PATTERN = /^<[a-z].*>$/i;

// 对齐wangEditor的样式
var editorValue = function editorValue(val) {
return val && HTML_PATTERN.test(val) ? val : '<div class="text-box">' + val + '<br></div>';
};

var Component = { render: function render() {
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('div', { staticClass: "v-editor" }, [_vm.showLoading ? _c('div', { staticClass: "loading-mask" }, [_c('div', { staticClass: "loading-content" }, [_vm._t("loading", [_c('p', [_vm._v("文件上传中...")])])], 2)]) : _vm._e(), _vm._v(" "), _c('div', { ref: "editor", staticStyle: { "text-align": "left" } }), _vm._v(" "), _c('upload-to-ali', _vm._b({ directives: [{ name: "show", rawName: "v-show", value: false, expression: "false" }], ref: "uploadToAli", attrs: { "multiple": "multiple" }, on: { "loading": _vm.handleLoading, "loaded": _vm.handleUploadFileSuccess } }, 'upload-to-ali', _vm.uploadOptions, false))], 1);
}, staticRenderFns: [],
Expand Down Expand Up @@ -95,7 +102,7 @@
value: function value(val, oldVal) {
//更新编辑器内容会导致光标偏移, 故只在blur之后更新
if (this.enableUpdateValue) {
this.editor && this.editor.$textElem.html(val);
this.editor && this.editor.$textElem.html(editorValue(val));
}
}
},
Expand All @@ -118,8 +125,10 @@
editor.customConfig.onchangeTimeout = this.editorOptions.onchangeTimeout || defaultEditorOptions.onchangeTimeout; // 单位 ms

editor.customConfig.onchange = function (html) {
// 输入内容为空时，返回空字符串，而不是<p><br></p>
var value = editor && editor.$textElem[0].textContent.trim() ? html : '';
// html 即变化之后的内容
_this.$emit('input', html);
_this.$emit('input', value);
};

editor.customConfig.onfocus = function (html) {
Expand All @@ -134,7 +143,7 @@
editor.create();

//设置默认值
editor.txt.html(this.value);
editor.txt.html(editorValue(this.value));
//是否禁用编辑器
document.querySelector('.w-e-toolbar').style['pointer-events'] = this.disabled ? 'none' : '';
editor.$textElem.attr('contenteditable', !this.disabled);
Expand Down
Loading