up：5.3.4

Signed-off-by: mingsoft <killfen@126.com>

src/main/webapp/WEB-INF/manager/cms/category/index.ftl

@@ -42,7 +42,7 @@
                     </el-popover>
                 </template>
                 <template slot-scope="scope">
-                    <span style="cursor: pointer" class="copyBtn" :data-clipboard-text="scope.row.id"
+                    <span style="cursor: pointer" class="copyBtn cell-tooltip "  :data-clipboard-text="scope.row.id"
                           @click="copyContent(true)">{{scope.row.id}}</span>
                 </template>
             </el-table-column>
@@ -354,3 +354,8 @@
         }
     });
 </script>
+<style scoped>
+    .el-table .cell.el-tooltip {
+        width: 100px;
+    }
+</style>

src/main/webapp/static/css/app.css

@@ -165,3 +165,7 @@ textarea::-webkit-input-placeholder {
 .el-upload--picture-card i {
     line-height: unset !important;
 }
+
+.el-notification__content p {
+    word-break: break-all !important;
+}

src/main/webapp/static/plugins/ms/2.0/ms-el-form.umd.js

@@ -1214,20 +1214,6 @@ module.exports = !fails(function () {
 });
 
 
-/***/ }),
-
-/***/ "4332":
-/***/ (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-7429dca8]{height:auto;max-height:274px;padding:0;overflow:hidden;overflow-y:auto}.el-select-dropdown__item.selected[data-v-7429dca8]{font-weight:400}ul li[data-v-7429dca8] .el-tree .el-tree-node__content{height:auto;padding:0 20px}.el-tree-node__label[data-v-7429dca8]{font-weight:400}.el-tree[data-v-7429dca8] .is-current .el-tree-node__label{color:#409eff;font-weight:700}.el-tree[data-v-7429dca8] .is-current .el-tree-node__children .el-tree-node__label{color:#606266;font-weight:400}", ""]);
-// Exports
-module.exports = exports;
-
-
 /***/ }),
 
 /***/ "4362":
@@ -1947,6 +1933,20 @@ module.exports = {
 };
 
 
+/***/ }),
+
+/***/ "6069":
+/***/ (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-75b6f99f]{height:auto;max-height:274px;padding:0;overflow:hidden;overflow-y:auto}.el-select-dropdown__item.selected[data-v-75b6f99f]{font-weight:400}ul li[data-v-75b6f99f] .el-tree .el-tree-node__content{height:auto;padding:0 20px}.el-tree-node__label[data-v-75b6f99f]{font-weight:400}.el-tree[data-v-75b6f99f] .is-current .el-tree-node__label{color:#409eff;font-weight:700}.el-tree[data-v-75b6f99f] .is-current .el-tree-node__children .el-tree-node__label{color:#606266;font-weight:400}", ""]);
+// Exports
+module.exports = exports;
+
+
 /***/ }),
 
 /***/ "6374":
@@ -2217,6 +2217,17 @@ module.exports = NATIVE_BIND ? uncurryThisWithBind : function (fn) {
 };
 
 
+/***/ }),
+
+/***/ "7dc9":
+/***/ (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_75b6f99f_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("d86f");
+/* 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_75b6f99f_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_75b6f99f_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "7e79":
@@ -2481,22 +2492,6 @@ var POLYFILL = isForced.POLYFILL = 'P';
 module.exports = isForced;
 
 
-/***/ }),
-
-/***/ "951f":
-/***/ (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__("4332");
-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("668973d9", content, true, {"sourceMap":false,"shadowMode":false});
-
 /***/ }),
 
 /***/ "9bf2":
@@ -2563,17 +2558,6 @@ module.exports = function (argument) {
 };
 
 
-/***/ }),
-
-/***/ "a9e2":
-/***/ (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_7429dca8_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("951f");
-/* 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_7429dca8_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_7429dca8_prod_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "aed9":
@@ -3645,6 +3629,22 @@ exports.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
 } : $propertyIsEnumerable;
 
 
+/***/ }),
+
+/***/ "d86f":
+/***/ (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__("6069");
+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("70c3d65e", content, true, {"sourceMap":false,"shadowMode":false});
+
 /***/ }),
 
 /***/ "d925":
@@ -6649,14 +6649,15 @@ var ms_select_component = normalizeComponent(
 )
 
 /* 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":"b48c589a-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=7429dca8&scoped=true&
-var ms_tree_selectvue_type_template_id_7429dca8_scoped_true_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"b48c589a-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=75b6f99f&scoped=true&
+var ms_tree_selectvue_type_template_id_75b6f99f_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-select', {
     ref: "tsSselect",
     staticClass: "ms-tree-select",
     attrs: {
+      "disabled": _vm.disabled,
       "value": _vm.valueTitle,
       "clearable": _vm.clearable
     },
@@ -6686,9 +6687,9 @@ var ms_tree_selectvue_type_template_id_7429dca8_scoped_true_render = function re
     }
   })], 1)], 1);
 };
-var ms_tree_selectvue_type_template_id_7429dca8_scoped_true_staticRenderFns = [];
+var ms_tree_selectvue_type_template_id_75b6f99f_scoped_true_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue?vue&type=template&id=7429dca8&scoped=true&
+// CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue?vue&type=template&id=75b6f99f&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&
 /* harmony default export */ var ms_tree_selectvue_type_script_lang_js_ = ({
@@ -6740,6 +6741,12 @@ var ms_tree_selectvue_type_template_id_7429dca8_scoped_true_staticRenderFns = []
     defaultExpandAll: {
       type: Boolean,
       default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: function () {
+        return false;
+      }
     }
   },
   data: function () {
@@ -6812,8 +6819,8 @@ var ms_tree_selectvue_type_template_id_7429dca8_scoped_true_staticRenderFns = []
 });
 // 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_); 
-// EXTERNAL MODULE: ./src/components/form/ms-tree-select.vue?vue&type=style&index=0&id=7429dca8&prod&scoped=true&lang=css&
-var ms_tree_selectvue_type_style_index_0_id_7429dca8_prod_scoped_true_lang_css_ = __webpack_require__("a9e2");
+// EXTERNAL MODULE: ./src/components/form/ms-tree-select.vue?vue&type=style&index=0&id=75b6f99f&prod&scoped=true&lang=css&
+var ms_tree_selectvue_type_style_index_0_id_75b6f99f_prod_scoped_true_lang_css_ = __webpack_require__("7dc9");
 
 // CONCATENATED MODULE: ./src/components/form/ms-tree-select.vue
 
@@ -6826,11 +6833,11 @@ var ms_tree_selectvue_type_style_index_0_id_7429dca8_prod_scoped_true_lang_css_
 
 var ms_tree_select_component = normalizeComponent(
   form_ms_tree_selectvue_type_script_lang_js_,
-  ms_tree_selectvue_type_template_id_7429dca8_scoped_true_render,
-  ms_tree_selectvue_type_template_id_7429dca8_scoped_true_staticRenderFns,
+  ms_tree_selectvue_type_template_id_75b6f99f_scoped_true_render,
+  ms_tree_selectvue_type_template_id_75b6f99f_scoped_true_staticRenderFns,
   false,
   null,
-  "7429dca8",
+  "75b6f99f",
   null
   
 )

src/main/webapp/static/plugins/ueditor/1.4.3.3/dialogs/image/image.html

@@ -21,7 +21,7 @@
         <div id="tabhead" class="tabhead">
             <span class="tab" data-content-id="remote"><var id="lang_tab_remote"></var></span>
             <span class="tab focus" data-content-id="upload"><var id="lang_tab_upload"></var></span>
-            <span class="tab" data-content-id="online"><var id="lang_tab_online"></var></span>
+<!--            <span class="tab" data-content-id="online"><var id="lang_tab_online"></var></span>-->
             <span class="tab" data-content-id="search"><var id="lang_tab_search"></var></span>
         </div>
         <div class="alignBar">