diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue index 1d81e87c..aab768e1 100644 --- a/resources/assets/js/pages/manage/components/TaskAdd.vue +++ b/resources/assets/js/pages/manage/components/TaskAdd.vue @@ -18,7 +18,7 @@ :plugins="taskPlugins" :options="taskOptions" :option-full="taskOptionFull" - :placeholder="$L('选填...')"> + :placeholder="$L('选填...')"/>
@@ -141,8 +141,8 @@ export default { taskPlugins: [ 'advlist autolink lists link image charmap print preview hr anchor pagebreak imagetools', 'searchreplace visualblocks visualchars code', - 'insertdatetime media nonbreaking save table contextmenu directionality', - 'emoticons paste textcolor colorpicker imagetools codesample', + 'insertdatetime media nonbreaking save table directionality', + 'emoticons paste imagetools codesample', 'autoresize' ], taskOptions: { diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 78b2d22f..8b98d5fe 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -154,13 +154,14 @@
+ inline/>
@@ -417,6 +418,7 @@ export default { data() { return { taskDetail: {}, + loadEditor: false, ownerShow: false, ownerData: {}, @@ -450,8 +452,8 @@ export default { taskPlugins: [ 'advlist autolink lists link image charmap print preview hr anchor pagebreak imagetools', 'searchreplace visualblocks visualchars code', - 'insertdatetime media nonbreaking save table contextmenu directionality', - 'emoticons paste textcolor colorpicker imagetools codesample', + 'insertdatetime media nonbreaking save table directionality', + 'emoticons paste imagetools codesample', 'autoresize' ], taskOptions: { @@ -676,6 +678,7 @@ export default { taskId (id) { if (id > 0) { this.$nextTick(() => { + this.loadEditor = true; this.$refs.input.focus() }); } else { diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js index c1940ead..df7b6e78 100755 --- a/resources/assets/js/routes.js +++ b/resources/assets/js/routes.js @@ -28,11 +28,11 @@ export default [ component: () => import('./pages/manage/messenger.vue'), }, { - name: 'manage-setting', path: 'setting', component: () => import('./pages/manage/setting/index.vue'), children: [ { + name: 'manage-setting', path: '', redirect: 'personal', }, @@ -47,12 +47,12 @@ export default [ component: () => import('./pages/manage/setting/password.vue'), }, { - name: 'manage-setting-personal', + name: 'manage-setting-system', path: 'system', component: () => import('./pages/manage/setting/system.vue'), }, { - name: 'manage-setting-personal', + name: 'manage-setting-priority', path: 'priority', component: () => import('./pages/manage/setting/priority.vue'), }, diff --git a/resources/assets/statics/public/js/tinymce/themes/mobile/index.js b/resources/assets/statics/public/js/tinymce/themes/mobile/index.js index ad02e831..7efb9868 100644 --- a/resources/assets/statics/public/js/tinymce/themes/mobile/index.js +++ b/resources/assets/statics/public/js/tinymce/themes/mobile/index.js @@ -4,4 +4,4 @@ // require('tinymce/themes/mobile') // ES2015: // import 'tinymce/themes/mobile' -require('./theme.js'); \ No newline at end of file +require('./theme.min.js'); diff --git a/resources/assets/statics/public/js/tinymce/themes/silver/index.js b/resources/assets/statics/public/js/tinymce/themes/silver/index.js index 09caa865..2048169e 100644 --- a/resources/assets/statics/public/js/tinymce/themes/silver/index.js +++ b/resources/assets/statics/public/js/tinymce/themes/silver/index.js @@ -4,4 +4,4 @@ // require('tinymce/themes/silver') // ES2015: // import 'tinymce/themes/silver' -require('./theme.js'); \ No newline at end of file +require('./theme.min.js'); diff --git a/webpack.mix.js b/webpack.mix.js index e29c18b3..517054c7 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -29,7 +29,7 @@ mix .webpackConfig({ output: { chunkFilename: function ({chunk}) { - return `js/build/${mixBuildName(chunk.id)}.${mix.inProduction() ? '[hash:8].' : ''}js` + return `js/build/${mixBuildName(chunk.id)}.js` } }, })