eoss-ui 0.4.47 → 0.4.48

package/lib/eoss-ui.common.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 20);
+/******/ 	return __webpack_require__(__webpack_require__.s = 19);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -91,13 +91,13 @@ module.exports =
 
 "use strict";
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6);
+/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(7);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11);
+/* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(10);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(8);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(4);
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -109,7 +109,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(21).sm2;
+var sm2 = __webpack_require__(20).sm2;
 
 
 
@@ -163,8 +163,7 @@ function delPendingRequest(config) {
   }
 }
 var ajax = function ajax(_ref) {
-  var _ref$headers = _ref.headers,
-      headers = _ref$headers === undefined ? {} : _ref$headers,
+  var headers = _ref.headers,
       method = _ref.method,
       url = _ref.url,
       _ref$host = _ref.host,
@@ -181,6 +180,7 @@ var ajax = function ajax(_ref) {
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
       loading = _ref.loading;
 
+  var header = headers || {};
   if (!method) {
     if (format) {
       method = 'get';
@@ -350,9 +350,9 @@ var ajax = function ajax(_ref) {
     if (!mix) {
       params = {};
     }
-    if (format) {
+    if (format && !headers) {
       data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
-      headers['content-type'] = 'application/x-www-form-urlencoded';
+      header['content-type'] = 'application/x-www-form-urlencoded';
     }
   }
   return http({
@@ -360,7 +360,7 @@ var ajax = function ajax(_ref) {
     url: url,
     data: data,
     params: params,
-    headers: headers
+    header: header
   });
 };
 
@@ -408,6 +408,108 @@ var browser = function browser() {
   }
 };
 
+/**
+ * calcDateDayDiff
+ * @desc:时间计算-天数计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateDayDiff = function calcDateDayDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算天数
+      var days = Math.floor(timeDiff / (1000 * 60 * 60 * 24));
+
+      return days;
+    } catch (error) {
+      // 捕获错误并抛出
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error, 5);
+    }
+  }
+};
+
+/**
+ * calcDateHourDiff
+ * @desc:时间计算-小时计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateHourDiff = function calcDateHourDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算小时
+      var hours = Math.floor(timeDiff / (1000 * 60 * 60));
+
+      return hours;
+    } catch (error) {
+      // 使用 MessageBox.error 处理错误
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
+    }
+  }
+};
+
+/**
+ * calcDateMinuteDiff
+ * @desc:时间计算-分钟计算
+ * @author sutao
+ * @date 2023年11月10日
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
+ **/
+var calcDateMinuteDiff = function calcDateMinuteDiff(date1, date2) {
+  if (date1 && date2) {
+    try {
+      // 尝试将输入转换为 Date 对象
+      var d1 = new Date(date1);
+      var d2 = new Date(date2);
+
+      // 检查转换是否成功
+      if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
+        throw new Error('日期格式不正确');
+      }
+
+      // 将日期转换为毫秒数
+      var timeDiff = Math.abs(d2.getTime() - d1.getTime());
+
+      // 计算分钟
+      var minutes = Math.floor(timeDiff / (1000 * 60));
+
+      return minutes;
+    } catch (error) {
+      // 使用 MessageBox.error 处理错误
+      eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
+    }
+  }
+};
+
 /**
  * debounce
  * @desc:添加js内容
@@ -2176,10 +2278,14 @@ var watermark = function watermark(option) {
   wrap.appendChild(docFrag);
   document.body.appendChild(wrap);
 };
+
 /* harmony default export */ __webpack_exports__["a"] = ({
   ajax: ajax,
   arrUnique: arrUnique,
   browser: browser,
+  calcDateDayDiff: calcDateDayDiff,
+  calcDateHourDiff: calcDateHourDiff,
+  calcDateMinuteDiff: calcDateMinuteDiff,
   debounce: debounce,
   delUrlParam: delUrlParam,
   domEval: domEval,
@@ -2577,131 +2683,119 @@ module.exports = require("qs");
 /* 4 */
 /***/ (function(module, exports) {
 
-module.exports = require("runtime-import");
+module.exports = require("eoss-element");
 
 /***/ }),
 /* 5 */
 /***/ (function(module, exports) {
 
-module.exports = require("sockjs-client");
+module.exports = require("runtime-import");
 
 /***/ }),
 /* 6 */
 /***/ (function(module, exports) {
 
-module.exports = require("axios");
+module.exports = require("sockjs-client");
 
 /***/ }),
 /* 7 */
 /***/ (function(module, exports) {
 
-module.exports = require("stompjs");
+module.exports = require("axios");
 
 /***/ }),
 /* 8 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss-element");
+module.exports = require("stompjs");
 
 /***/ }),
 /* 9 */
 /***/ (function(module, exports) {
 
-module.exports = require("@wangeditor/editor-for-vue");
-
-/***/ }),
-/* 10 */
-/***/ (function(module, exports) {
-
 module.exports = require("video.js");
 
 /***/ }),
-/* 11 */
+/* 10 */
 /***/ (function(module, exports) {
 
 module.exports = require("json-bigint");
 
 /***/ }),
-/* 12 */
+/* 11 */
 /***/ (function(module, exports) {
 
 module.exports = require("vue");
 
 /***/ }),
-/* 13 */
+/* 12 */
 /***/ (function(module, exports) {
 
 module.exports = require("wujie-vue2");
 
 /***/ }),
-/* 14 */
+/* 13 */
 /***/ (function(module, exports) {
 
 module.exports = require("slate");
 
 /***/ }),
-/* 15 */
+/* 14 */
 /***/ (function(module, exports) {
 
 module.exports = require("slate-history");
 
 /***/ }),
-/* 16 */
+/* 15 */
 /***/ (function(module) {
 
 module.exports = JSON.parse("[\"zuomian\",\"monitor\",\"maximize\",\"pointer-up\",\"pointer-left\",\"pointer-down\",\"tri-down\",\"retrograde\",\"rainfall\",\"caveat\",\"print\",\"alarm\",\"table\",\"duigouquan\",\"bumen\",\"mm\",\"accelerate\",\"quanping\",\"password\",\"qing\",\"kaifa\",\"daoru\",\"piaochongicon\",\"instructions\",\"notice\",\"wifi\",\"tishicuo\",\"minganciguanli\",\"switch-off\",\"switch-on\",\"narrow\",\"yidongduan\",\"web\",\"upload\",\"message\",\"go-back\",\"close\",\"shujutongji\",\"folder\",\"edit\",\"enter\",\"dian\",\"wendu\",\"shangwu\",\"shenbao\",\"magnifier\",\"project-add\",\"xiexian\",\"caidan\",\"tupian\",\"home\",\"yinyu\",\"wenhao\",\"template\",\"daiban\",\"set\",\"zhengwen\",\"cuowu\",\"chenggong\",\"indent\",\"increase\",\"ziliaoku\",\"tuichu\",\"quit\",\"leaf\",\"refresh\",\"statistic\",\"gengduo\",\"lvyou\",\"mail\",\"user\",\"zhishi\",\"weizhi\",\"jinggao\",\"zuzhijigou\",\"xue\",\"fenxiang\",\"jinrong\",\"shanchu\",\"jianhao\",\"jiahao\",\"yinzhang\",\"renyuanqiehuan\",\"gouxuanzhong1\",\"circle\",\"fuxuankuang1\",\"fangkuang\",\"application\",\"wenjianjia\",\"jiaren\",\"xiugai\",\"duanxinguanli\",\"workbench\",\"rizhi\",\"gongwen\",\"qingshi\",\"shiwu\",\"official\",\"baogao\",\"document\",\"wodeyouxiang\",\"ziliaojiaohuan\",\"denglu\",\"podium\",\"fangkuai\",\"xuewei\",\"duoyun\",\"pm\",\"xiajia\",\"huanbao\",\"dunpai\",\"shu\",\"gongzuozheng\",\"more\",\"fenlei\",\"delete\",\"fengsu\",\"bar\",\"yuanqu\",\"duomeiti\",\"youjian\",\"qiye\",\"zuixinzixun\",\"biaoge\",\"omit\",\"diaotou\",\"jiantou-left\",\"jiantou-right\",\"jiantou-up\",\"roles\",\"jiantou-next\",\"chijiuhuacunchu\",\"zhuanhuan\",\"cloudy\",\"form\",\"wuye\",\"tri-up\",\"pointer-right\",\"bianji\",\"tri-right\",\"tri-left\",\"daimaguanli\",\"jiankong\",\"kaifazhong\",\"fujian\",\"bingtu\",\"zhuzhuangtu\",\"lose\",\"rmb\",\"move\",\"xiazai\",\"yiban\",\"laoshi\",\"clear\",\"jinyong\",\"yunxing\",\"weihu\",\"chakan\",\"pifu\",\"ren\",\"gouwuche\",\"loading2\",\"yulan\",\"ziliao\",\"yidong\",\"fenxiang11\",\"kaoqin\",\"change\",\"shidu\",\"portfolio\",\"info\",\"yanjing\",\"laba\",\"camera\",\"xitongxiaoxi\",\"xitongguanli\",\"webduan\",\"wagnz\",\"group\",\"shengqian\",\"jiantou-prev\",\"attention\",\"look\",\"guanzhu\",\"daikuan\",\"tubiao\",\"duigou\",\"star\",\"dayin\",\"xinzeng\",\"reduce\",\"goup\",\"calendar\",\"tree\",\"yingyong\",\"caution\",\"zhuanfa\",\"add\",\"zongtiqixian\",\"daochu\",\"gongwu\",\"ihouse\",\"chilun\",\"weixiu\",\"chengguo\",\"trophy\",\"duiwu\",\"qiehuanjiaose\",\"door\",\"shebei\",\"fangjian\",\"microscope\",\"huaxue\",\"shiyanshianquan\",\"shiyan\",\"qiyexinxi\",\"yewuxinxi\",\"lab\",\"shiyanguanli\",\"yuqing\",\"big-screen\",\"signal-search\",\"database\",\"star-mark\",\"cng\",\"professor\",\"informatization\",\"code\",\"science\",\"price\",\"xunhuan\",\"savings\",\"administration\",\"aid\",\"biao\",\"line\",\"xietong\",\"jingzheng\",\"enterprise\",\"datatable\",\"toubiao\",\"bingdu\",\"keji2\",\"qiyeku5\",\"touzi5\",\"zijinliu\",\"zhishichanquan3\",\"kejifuwu2\",\"zhishichanquan2\",\"zijinanquan\",\"kejifuwu1\",\"geju\",\"yiqingfangkong\",\"kejifuwu\",\"anquanfangkong\",\"shujufuwu\",\"shujuceng\",\"shujugongxiang\",\"flows\",\"setup\",\"shujulian\",\"caiwujianguan\",\"caiwuliushui\",\"mubiaogeju\",\"juxing\",\"fuwuqi\",\"touzijigou\",\"xiezilou\",\"jianzhu\",\"logo\",\"touzhi\",\"zijin\",\"fintech\",\"touzixiangmu\",\"library\",\"touziguanli\",\"zhongda\",\"ziyuan\",\"shujutai\",\"shujudongtai\",\"bank\",\"shujuzhongxin\",\"zhongyaomubiao\",\"touzishijian\",\"caiwuguanli\",\"mingzhong\",\"touzishenpi\",\"jingzhenggeju\",\"property\",\"keji\",\"qiyeku\",\"zhongyaojihui\",\"touzilicai\",\"zhishichanquan\",\"touzi\",\"tzz\",\"menu\",\"xiangmushu\",\"pdf\",\"jiazai\",\"gongsi\",\"rise\",\"jbxx\",\"zwxx\",\"jypx\",\"jcgl\",\"ndkh\",\"grjl\",\"shgx\",\"gou\",\"shijian\",\"fukuan\",\"guoji\",\"shoukuan\",\"down\",\"gongzuotai\",\"gaigedongtai\",\"xitongshezhi\",\"relation\",\"zuzhirenshi\",\"kaohepingjia\",\"caiwujiandu\",\"sanzhongyida\",\"mima\",\"xianshi\",\"zhanghao\",\"bangongshi\",\"checked\",\"checke\",\"help\",\"kuoda\",\"banli\",\"xiaoxi\",\"shouqicaidan\",\"shouqicaidan-right\",\"smile\",\"tongzhi\",\"guanji\",\"shuaxin\",\"guiji\",\"tianjiawenjianjia\",\"yunxiazai\",\"del\",\"touzifangan\",\"zongheguanli\",\"sanzhongyida_mian\",\"gongwenguanli1\",\"heguiguanli\",\"jingyingfenxi\",\"txl\",\"diannao\",\"renliziyuan\",\"caiwuxitong\",\"shiwuguanli\",\"shouye\",\"bangongyongpin\",\"sidebar\",\"zhidulashi\",\"log\",\"fawenguanli\",\"huiyiguanli\",\"zuzhishishi\",\"gongwenqianshou\",\"jinxiupeixun\",\"gongwenbao\",\"jiaohuan\",\"daibanshixiang\",\"richeng\",\"tongxunlu\",\"yongche\",\"yanzheng\",\"daibanxinxi\",\"shuben\",\"fanfu\",\"guangbo\",\"shuzhuangtu\",\"bengqiye\",\"tongguo\",\"dengdai\",\"cross\",\"daichuli\",\"zhenggai\",\"shouli\",\"shujuhecha\",\"guanli\",\"paper-file\",\"wenjian\",\"dakaiwenjian\",\"yewu\",\"jiance\",\"jiheguanli\",\"jinru\",\"arrow-right\",\"lingdao\",\"rencai\",\"prev\",\"next\",\"jianpan\",\"qrcode\",\"bohui\",\"homepage\",\"download\",\"gantanhao\",\"dingding\",\"weixin\",\"pad\",\"ios\",\"android\",\"txt\",\"doc\",\"audioo\",\"video\",\"zip\",\"shuru\",\"duanxin\",\"saoma\",\"youxiang\",\"word\",\"excel\",\"fileword\",\"picture\",\"ppt\",\"ca\",\"usb-key\"]");
 
 /***/ }),
-/* 17 */
+/* 16 */
 /***/ (function(module, exports) {
 
 module.exports = require("video.js/dist/lang/zh-CN.json");
 
 /***/ }),
-/* 18 */
+/* 17 */
 /***/ (function(module, exports) {
 
 module.exports = require("eoss-element/src/utils/clickoutside");
 
 /***/ }),
-/* 19 */
+/* 18 */
 /***/ (function(module, exports) {
 
 module.exports = require("sortablejs");
 
 /***/ }),
-/* 20 */
+/* 19 */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(25);
+module.exports = __webpack_require__(23);
 
 
 /***/ }),
-/* 21 */
+/* 20 */
 /***/ (function(module, exports) {
 
 module.exports = require("sm-crypto");
 
 /***/ }),
-/* 22 */
-/***/ (function(module, exports) {
-
-module.exports = require("@wangeditor/editor/dist/css/style.css?vue&type=style&index=0&prod&lang=css&");
-
-/***/ }),
-/* 23 */
+/* 21 */
 /***/ (function(module, exports) {
 
 module.exports = require("video.js/dist/video-js.css");
 
 /***/ }),
-/* 24 */
+/* 22 */
 /***/ (function(module, exports) {
 
 module.exports = require("qrcode");
 
 /***/ }),
-/* 25 */
+/* 23 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4894,8 +4988,8 @@ childrenvue_type_template_id_796433ee_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=62f64d56&
-var columnvue_type_template_id_62f64d56_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=256206e7&
+var columnvue_type_template_id_256206e7_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5692,6 +5786,7 @@ var columnvue_type_template_id_62f64d56_render = function () {
                                                 "es-input",
                                                 _vm._b(
                                                   {
+                                                    attrs: { scope: scope },
                                                     on: {
                                                       blur: function (event) {
                                                         _vm.handleBlur({
@@ -5874,11 +5969,11 @@ var columnvue_type_template_id_62f64d56_render = function () {
         2
       )
 }
-var columnvue_type_template_id_62f64d56_staticRenderFns = []
-columnvue_type_template_id_62f64d56_render._withStripped = true
+var columnvue_type_template_id_256206e7_staticRenderFns = []
+columnvue_type_template_id_256206e7_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=62f64d56&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=256206e7&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(2);
@@ -6450,6 +6545,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
 
 
 
@@ -6781,8 +6877,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 var column_component = normalizeComponent(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_62f64d56_render,
-  columnvue_type_template_id_62f64d56_staticRenderFns,
+  columnvue_type_template_id_256206e7_render,
+  columnvue_type_template_id_256206e7_staticRenderFns,
   false,
   null,
   null,
@@ -7090,7 +7186,7 @@ var sizer_component = normalizeComponent(
 
 /* harmony default export */ var sizer = (sizer_component.exports);
 // EXTERNAL MODULE: external "vue"
-var external_vue_ = __webpack_require__(12);
+var external_vue_ = __webpack_require__(11);
 var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
 
 // CONCATENATED MODULE: ./src/utils/bus.js
@@ -10893,7 +10989,7 @@ mainvue_type_template_id_7f267c7b_render._withStripped = true
 // CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=7f267c7b&
 
 // EXTERNAL MODULE: external "wujie-vue2"
-var external_wujie_vue2_ = __webpack_require__(13);
+var external_wujie_vue2_ = __webpack_require__(12);
 var external_wujie_vue2_default = /*#__PURE__*/__webpack_require__.n(external_wujie_vue2_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=script&lang=js&
@@ -11458,8 +11554,8 @@ dialog_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_dialog = (dialog_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/editor/src/main.vue?vue&type=template&id=530b6f3e&
-var mainvue_type_template_id_530b6f3e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/editor/src/main.vue?vue&type=template&id=f482498c&
+var mainvue_type_template_id_f482498c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11487,48 +11583,23 @@ var mainvue_type_template_id_530b6f3e_render = function () {
                     },
                   }),
                 ]
-              : [
-                  _c("Toolbar", {
-                    staticClass: "es-editor-toolbar",
-                    attrs: {
-                      editor: _vm.editor,
-                      defaultConfig: _vm.toolbarConfig,
-                      mode: _vm.mode,
-                    },
-                  }),
-                  _c("Editor", {
-                    staticClass: "es-editor-main",
-                    style: { height: _vm.height },
-                    attrs: { defaultConfig: _vm._editorConfig, mode: _vm.mode },
-                    on: { onCreated: _vm.onCreated },
-                    model: {
-                      value: _vm.model,
-                      callback: function ($$v) {
-                        _vm.model = $$v
-                      },
-                      expression: "model",
-                    },
-                  }),
-                ],
+              : void 0,
           ],
     ],
     2
   )
 }
-var mainvue_type_template_id_530b6f3e_staticRenderFns = []
-mainvue_type_template_id_530b6f3e_render._withStripped = true
+var mainvue_type_template_id_f482498c_staticRenderFns = []
+mainvue_type_template_id_f482498c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/editor/src/main.vue?vue&type=template&id=530b6f3e&
+// CONCATENATED MODULE: ./packages/editor/src/main.vue?vue&type=template&id=f482498c&
 
 // EXTERNAL MODULE: external "slate"
-var external_slate_ = __webpack_require__(14);
+var external_slate_ = __webpack_require__(13);
 
 // EXTERNAL MODULE: external "slate-history"
-var external_slate_history_ = __webpack_require__(15);
-
-// EXTERNAL MODULE: external "@wangeditor/editor-for-vue"
-var editor_for_vue_ = __webpack_require__(9);
+var external_slate_history_ = __webpack_require__(14);
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/editor/src/toolbar.vue?vue&type=template&id=1ddba256&
 var toolbarvue_type_template_id_1ddba256_render = function () {
@@ -12501,13 +12572,13 @@ var editor_src_mainvue_type_script_lang_js_extends = Object.assign || function (
 
 
 
-
+//import { Editor, Toolbar } from '@wangeditor/editor-for-vue';
 
 
 /* harmony default export */ var editor_src_mainvue_type_script_lang_js_ = ({
   name: 'EsEditor',
   inheritAttrs: false,
-  components: { Editor: editor_for_vue_["Editor"], Toolbar: editor_for_vue_["Toolbar"], Toolbars: src_toolbar, Editors: src_editor },
+  //components: { Editor, Toolbar, Toolbars, Editors },
   inject: {
     elForm: {
       default: ''
@@ -12578,22 +12649,18 @@ var editor_src_mainvue_type_script_lang_js_extends = Object.assign || function (
 });
 // CONCATENATED MODULE: ./packages/editor/src/main.vue?vue&type=script&lang=js&
  /* harmony default export */ var packages_editor_src_mainvue_type_script_lang_js_ = (editor_src_mainvue_type_script_lang_js_); 
-// EXTERNAL MODULE: external "@wangeditor/editor/dist/css/style.css?vue&type=style&index=0&prod&lang=css&"
-var stylevue_type_style_index_0_prod_lang_css_ = __webpack_require__(22);
-
 // CONCATENATED MODULE: ./packages/editor/src/main.vue
 
 
 
 
 
-
 /* normalize component */
 
 var editor_src_main_component = normalizeComponent(
   packages_editor_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_530b6f3e_render,
-  mainvue_type_template_id_530b6f3e_staticRenderFns,
+  mainvue_type_template_id_f482498c_render,
+  mainvue_type_template_id_f482498c_staticRenderFns,
   false,
   null,
   null,
@@ -27971,8 +28038,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=b5452b5c&
-var mainvue_type_template_id_b5452b5c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=4ef7ee29&
+var mainvue_type_template_id_4ef7ee29_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -29350,11 +29417,11 @@ var mainvue_type_template_id_b5452b5c_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_b5452b5c_staticRenderFns = []
-mainvue_type_template_id_b5452b5c_render._withStripped = true
+var mainvue_type_template_id_4ef7ee29_staticRenderFns = []
+mainvue_type_template_id_4ef7ee29_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=b5452b5c&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=4ef7ee29&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=4e1f4030&
 var CommonOpinionsvue_type_template_id_4e1f4030_render = function () {
@@ -37717,7 +37784,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
      * @param {String} val 当前选中值
      * @date 2022年5月25日
      **/
-    selecNext: function selecNext(val, type) {
+    selecNext: function selecNext(val, type, isDef) {
       var _this13 = this;
 
       this.loading = utils_util["a" /* default */].loading(this.$loading, '加载中...');
@@ -37731,7 +37798,36 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       this.radioList = [];
 
       if (type) {
+        this.nextNode.nextNodeId = '';
+        this.nextNode.isReturnSubmitter = 0;
+        this.nextNode.isUndertakeReply = 0;
+        this.nextNode.isTakeAdviceReply = 0;
+        this.nextNode.isUndertakeEnd = 0;
+        this.nextNode.isTakeAdviceEnd = 0;
+        this.nextNode.isReadDealReply = 0;
+        this.nextNode.isReadDealEnd = 0;
+        this.nextNode.isReturnRejectNode = 0;
+        this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
+        if (val == -1) {
+          this.nextNode.isSerialSubmit = 1;
+        } else if (val == 0) {} else if (val == 1) {} else if (val == 2) {
+          this.nextNode.isReturnSubmitter = 1;
+        } else if (val == 3) {
+          this.nextNode.isUndertakeReply = 1;
+        } else if (val == 4) {
+          this.nextNode.isTakeAdviceReply = 1;
+        } else if (val == 5) {
+          this.nextNode.isUndertakeEnd = 1;
+        } else if (val == 6) {
+          this.nextNode.isTakeAdviceEnd = 1;
+        } else if (val == 7) {
+          this.nextNode.isReadDealReply = 1;
+        } else if (val == 8) {
+          this.nextNode.isReadDealEnd = 1;
+        } else if (val == 9) {
+          this.nextNode.isReturnRejectNode = 1;
+        } else {}
         this.operationList.map(function (item) {
           if (item.key === val) {
             if (!item.taskNodeList) {
@@ -37762,7 +37858,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       } else {
         this.isReject = false;
       }
-      this.getNodeInfo();
+      if (isDef !== true) this.getNodeInfo();
     },
 
     /**
@@ -37852,7 +37948,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           _this14.endFlowInfo.pOrgId = pOrgId;
           _this14.canPresetRead = canPresetRead;
           _this14.isCdjxjTaskHandle = isCdjxjTaskHandle;
-
+          _this14.operationList = taskOperations;
           _this14.customPresetHintMessage = customPresetHintMessage;
           if (canPresetRead) {
             var ids = nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
@@ -37892,8 +37988,9 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                 }
               }
             });
+            _this14.selecNext(_this14.nextNode.nextOperate, true, true);
           }
-          _this14.operationList = taskOperations;
+
           if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
             if (nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList) {
               var notice = JSON.parse(nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList);
@@ -37939,6 +38036,15 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             _this14.taskExamineInfo.choiceDeptId = choiceDeptId;
             _this14.endFlowInfo.processType = taskExamine.processType;
             _this14.endFlowInfo.isReturnSubmitter = taskExamine.isReturnSubmitter;
+            _this14.nextNode.isReturnSubmitter = taskExamine.isReturnSubmitter;
+            _this14.nextNode.isUndertakeReply = taskExamine.isUndertakeReply;
+            _this14.nextNode.isTakeAdviceReply = taskExamine.isTakeAdviceReply;
+            _this14.nextNode.isUndertakeEnd = taskExamine.isUndertakeEnd;
+            _this14.nextNode.isTakeAdviceEnd = taskExamine.isTakeAdviceEnd;
+            _this14.nextNode.isReadDealReply = taskExamine.isReadDealReply;
+            _this14.nextNode.isReadDealEnd = taskExamine.isReadDealEnd;
+            _this14.nextNode.isReturnRejectNode = taskExamine.isReturnRejectNode;
+            _this14.nextNode.isSerialSubmit = taskExamine.isSerialSubmit;
             _this14.endFlowInfo.isSubFlow = taskExamine.isSubFlow;
             _this14.endFlowInfo.isUndertakeReply = taskExamine.isUndertakeReply;
             _this14.endFlowInfo.isUndertakeEnd = taskExamine.isUndertakeEnd;
@@ -37948,7 +38054,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
             _this14.endFlowInfo.isReadDealReply = taskExamine.isReadDealReply;
             _this14.endFlowInfo.isReturnRejectNode = taskExamine.isReturnRejectNode;
             _this14.endFlowInfo.isSerialSubmit = taskExamine.isSerialSubmit;
-            _this14.endFlowInfo.isReadDealReply = taskExamine.isReadDealReplybusinessId;
+            // this.endFlowInfo.isReadDealReply =
+            //   taskExamine.isReadDealReplybusinessId;
             _this14.endFlowInfo.appId = taskExamine.appId;
             _this14.endFlowInfo.businessId = taskExamine.businessId;
             _this14.endFlowInfo.processDefinitionId = taskExamine.processDefinitionId;
@@ -37993,7 +38100,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           _this14.getNodeType();
           _this14.getNodeInfo();
         } else {
-          if (res.status === "taskCompleted") {
+          if (res.status === 'taskCompleted') {
             _this14.shrinkAbled = true;
             _this14.$message.warning(res.message || '系统错误，请联系管理员！');
           } else {
@@ -38175,7 +38282,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
               switch (_context.prev = _context.next) {
                 case 0:
                   if (!valid) {
-                    _context.next = 55;
+                    _context.next = 56;
                     break;
                   }
 
@@ -38281,10 +38388,13 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                     _this18.nextNode.isReturnRejectNode = 1;
                     _this18.nextNode.processDefinitionId = _this18.processObj.taskExamine.processDefinitionId;
                   }
-                  _context.next = 31;
+                  if (_this18.nextNode.nextOperate == 9 || _this18.nextNode.nextOperate == 2) {
+                    delete _this18.nextNode.nextNodeId;
+                  }
+                  _context.next = 32;
                   return _this18.saveInfo('subMit');
 
-                case 31:
+                case 32:
                   _this18.loading = utils_util["a" /* default */].loading(_this18.$loading, '加载中...');
 
                   notificationType = '';
@@ -38346,10 +38456,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
                     }
                   }));
 
-                case 55:
+                case 56:
                   return _context.abrupt('return', false);
 
-                case 56:
+                case 57:
                 case 'end':
                   return _context.stop();
               }
@@ -38376,8 +38486,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_b5452b5c_render,
-  mainvue_type_template_id_b5452b5c_staticRenderFns,
+  mainvue_type_template_id_4ef7ee29_render,
+  mainvue_type_template_id_4ef7ee29_staticRenderFns,
   false,
   null,
   null,
@@ -42345,7 +42455,7 @@ mainvue_type_template_id_32c03886_render._withStripped = true
 // CONCATENATED MODULE: ./packages/icons/src/main.vue?vue&type=template&id=32c03886&
 
 // EXTERNAL MODULE: ./packages/icons/src/icon.json
-var icon = __webpack_require__(16);
+var icon = __webpack_require__(15);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/icons/src/main.vue?vue&type=script&lang=js&
 //
@@ -42509,7 +42619,8 @@ var src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typ
     },
     readonly: Boolean,
     plain: Boolean,
-    text: [String, Number]
+    text: [String, Number],
+    scope: {}
   },
   data: function data() {
     return {
@@ -42633,8 +42744,8 @@ var src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typ
           domProps: this.$attrs[type].icon ? { innerHTML: this.$attrs[type].icon } : {},
           on: {
             click: function click() {
-              _this3.$attrs[type].click && _this3.$attrs[type].click(_this3, _this3.model);
-              _this3.$attrs[type].event && _this3.$attrs[type].event(_this3, _this3.model);
+              _this3.$attrs[type].click && _this3.$attrs[type].click(_this3, _this3.model, _this3.scope);
+              _this3.$attrs[type].event && _this3.$attrs[type].event(_this3, _this3.model, _this3.scope);
             }
           }
         }, [this.$attrs[type].text]));
@@ -43093,8 +43204,8 @@ label_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_label = (label_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=4aa8315b&
-var mainvue_type_template_id_4aa8315b_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=5756d38e&
+var mainvue_type_template_id_5756d38e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -43128,6 +43239,7 @@ var mainvue_type_template_id_4aa8315b_render = function () {
                 },
               ],
               staticClass: "es-login",
+              class: { "es-simple": _vm.mode == "simple" },
               style: _vm.transform,
               attrs: {
                 "element-loading-text": "登录中...",
@@ -43890,14 +44002,14 @@ var mainvue_type_template_id_4aa8315b_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_4aa8315b_staticRenderFns = []
-mainvue_type_template_id_4aa8315b_render._withStripped = true
+var mainvue_type_template_id_5756d38e_staticRenderFns = []
+mainvue_type_template_id_5756d38e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=4aa8315b&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5756d38e&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=669156c6&
-var resetPasswordvue_type_template_id_669156c6_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
+var resetPasswordvue_type_template_id_4f5da52e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -43952,11 +44064,11 @@ var resetPasswordvue_type_template_id_669156c6_render = function () {
     1
   )
 }
-var resetPasswordvue_type_template_id_669156c6_staticRenderFns = []
-resetPasswordvue_type_template_id_669156c6_render._withStripped = true
+var resetPasswordvue_type_template_id_4f5da52e_staticRenderFns = []
+resetPasswordvue_type_template_id_4f5da52e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=669156c6&
+// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=script&lang=js&
 var resetPasswordvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -44204,6 +44316,12 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
           _this3.$message.success(res.msg);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
+          if (res.rCode === 2) {
+            _this3.btnText = '获取验证码';
+            _this3.disabled = false;
+            _this3.countdown = 0;
+            clearInterval(_this3.timer);
+          }
           _this3.$message.error(msg);
         }
       }).catch(function (err) {
@@ -44271,8 +44389,8 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
 
 var resetPassword_component = normalizeComponent(
   src_resetPasswordvue_type_script_lang_js_,
-  resetPasswordvue_type_template_id_669156c6_render,
-  resetPasswordvue_type_template_id_669156c6_staticRenderFns,
+  resetPasswordvue_type_template_id_4f5da52e_render,
+  resetPasswordvue_type_template_id_4f5da52e_staticRenderFns,
   false,
   null,
   null,
@@ -44592,6 +44710,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 //
 //
 //
+//
 
 
 
@@ -44610,6 +44729,10 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       type: String,
       default: api["Q" /* initLogin */]
     },
+    mode: {
+      type: String,
+      default: 'default'
+    },
     title: {
       type: String,
       default: '账号登录'
@@ -45223,8 +45346,15 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
           _this4.$message({
             message: res.msg,
             duration: 2000,
-            type: res ? 'error' : 'success'
+            type: res.rCode == 0 ? 'success' : 'error'
           });
+
+          if (res.rCode === 2) {
+            _this4.btnText = '获取验证码';
+            _this4.disabled = false;
+            _this4.countdown = 0;
+            clearInterval(_this4.timer);
+          }
           // if (res.rCode) {
           //   clearInterval(this.timer);
           // }
@@ -45509,8 +45639,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_4aa8315b_render,
-  mainvue_type_template_id_4aa8315b_staticRenderFns,
+  mainvue_type_template_id_5756d38e_render,
+  mainvue_type_template_id_5756d38e_staticRenderFns,
   false,
   null,
   null,
@@ -45951,8 +46081,8 @@ mainvue_type_template_id_13aacaf9_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=13aacaf9&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=1965153d&
-var userinfovue_type_template_id_1965153d_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=327101d6&
+var userinfovue_type_template_id_327101d6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45968,11 +46098,11 @@ var userinfovue_type_template_id_1965153d_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_1965153d_staticRenderFns = []
-userinfovue_type_template_id_1965153d_render._withStripped = true
+var userinfovue_type_template_id_327101d6_staticRenderFns = []
+userinfovue_type_template_id_327101d6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=1965153d&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=327101d6&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=script&lang=js&
 //
@@ -46273,19 +46403,27 @@ userinfovue_type_template_id_1965153d_render._withStripped = true
     handleFormSubmit: function handleFormSubmit() {
       var _this4 = this;
 
+      var initLogin = utils_util["a" /* default */].getStorage('initLogin');
+      initLogin && (initLogin = JSON.parse(initLogin));
       utils_util["a" /* default */].ajax({
         url: api["Ob" /* updateUserInfo */],
         params: {
           email: this.values.email,
           officeTel: this.values.officetel,
           phone: this.values.phone,
-          oldPassword: this.values.oldpassword,
-          password: this.values.password
+          oldPassword: initLogin && initLogin.secret ? utils_util["a" /* default */].esmEncrypt({
+            data: this.values.oldpassword,
+            key: initLogin.secret
+          }) : this.values.oldpassword,
+          password: initLogin && initLogin.secret ? utils_util["a" /* default */].esmEncrypt({
+            data: this.values.password,
+            key: initLogin.secret
+          }) : this.values.password
         }
       }).then(function (res) {
         if (res.rCode === 0) {
           if (_this4.values.oldpassword && _this4.values.password) {
-            _this4.$confirm('密码修改成功,请重新登陆！', '提示', {
+            _this4.$confirm('密码修改成功,请重新登录！', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               closeOnClickModal: false,
@@ -46361,8 +46499,8 @@ userinfovue_type_template_id_1965153d_render._withStripped = true
 
 var userinfo_component = normalizeComponent(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_1965153d_render,
-  userinfovue_type_template_id_1965153d_staticRenderFns,
+  userinfovue_type_template_id_327101d6_render,
+  userinfovue_type_template_id_327101d6_staticRenderFns,
   false,
   null,
   null,
@@ -46371,8 +46509,8 @@ var userinfo_component = normalizeComponent(
 )
 
 /* harmony default export */ var userinfo = (userinfo_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=template&id=6cd57e02&
-var settingsvue_type_template_id_6cd57e02_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=template&id=ff684db0&
+var settingsvue_type_template_id_ff684db0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -46450,14 +46588,54 @@ var settingsvue_type_template_id_6cd57e02_render = function () {
         ],
         1
       ),
+      _c("div", { staticClass: "es-setting-item" }, [
+        _c("div", { staticClass: "es-setting-title" }, [_vm._v("导航模式")]),
+        _c(
+          "div",
+          { staticClass: "es-setting-navs-box" },
+          [
+            _c(
+              "el-tooltip",
+              {
+                staticClass: "es-setting-navs-item",
+                attrs: {
+                  effect: "dark",
+                  content: "顶部菜单布局",
+                  placement: "bottom",
+                },
+              },
+              [_c("div", { staticClass: "es-setting-navs es-setting-top-nav" })]
+            ),
+            _c(
+              "el-tooltip",
+              {
+                staticClass: "es-setting-navs-item",
+                attrs: {
+                  effect: "dark",
+                  content: "侧边菜单布局",
+                  placement: "bottom",
+                },
+              },
+              [
+                _c(
+                  "div",
+                  { staticClass: "es-setting-navs es-setting-side-nav" },
+                  [_c("div", { staticClass: "es-setting-side-sub-nav" })]
+                ),
+              ]
+            ),
+          ],
+          1
+        ),
+      ]),
     ]
   )
 }
-var settingsvue_type_template_id_6cd57e02_staticRenderFns = []
-settingsvue_type_template_id_6cd57e02_render._withStripped = true
+var settingsvue_type_template_id_ff684db0_staticRenderFns = []
+settingsvue_type_template_id_ff684db0_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/settings.vue?vue&type=template&id=6cd57e02&
+// CONCATENATED MODULE: ./packages/main/src/settings.vue?vue&type=template&id=ff684db0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/settings.vue?vue&type=script&lang=js&
 //
@@ -46495,6 +46673,31 @@ settingsvue_type_template_id_6cd57e02_render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var settingsvue_type_script_lang_js_ = ({
@@ -46574,8 +46777,8 @@ settingsvue_type_template_id_6cd57e02_render._withStripped = true
 
 var settings_component = normalizeComponent(
   src_settingsvue_type_script_lang_js_,
-  settingsvue_type_template_id_6cd57e02_render,
-  settingsvue_type_template_id_6cd57e02_staticRenderFns,
+  settingsvue_type_template_id_ff684db0_render,
+  settingsvue_type_template_id_ff684db0_staticRenderFns,
   false,
   null,
   null,
@@ -47323,7 +47526,7 @@ async_componentvue_type_template_id_51f0233c_scoped_true_render._withStripped =
 // CONCATENATED MODULE: ./packages/main/src/async-component/index.vue?vue&type=template&id=51f0233c&scoped=true&
 
 // EXTERNAL MODULE: external "runtime-import"
-var external_runtime_import_ = __webpack_require__(4);
+var external_runtime_import_ = __webpack_require__(5);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/async-component/index.vue?vue&type=script&lang=js&
 
@@ -47475,11 +47678,11 @@ var async_component_component = normalizeComponent(
 
 /* harmony default export */ var async_component = (async_component_component.exports);
 // EXTERNAL MODULE: external "sockjs-client"
-var external_sockjs_client_ = __webpack_require__(5);
+var external_sockjs_client_ = __webpack_require__(6);
 var external_sockjs_client_default = /*#__PURE__*/__webpack_require__.n(external_sockjs_client_);
 
 // EXTERNAL MODULE: external "stompjs"
-var external_stompjs_ = __webpack_require__(7);
+var external_stompjs_ = __webpack_require__(8);
 var external_stompjs_default = /*#__PURE__*/__webpack_require__.n(external_stompjs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=script&lang=js&
@@ -49189,8 +49392,8 @@ main_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_main = (main_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/mainComp/src/main.vue?vue&type=template&id=1faf05d8&
-var mainvue_type_template_id_1faf05d8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/mainComp/src/main.vue?vue&type=template&id=8cb86f32&
+var mainvue_type_template_id_8cb86f32_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -49599,14 +49802,14 @@ var mainvue_type_template_id_1faf05d8_render = function () {
     1
   )
 }
-var mainvue_type_template_id_1faf05d8_staticRenderFns = []
-mainvue_type_template_id_1faf05d8_render._withStripped = true
+var mainvue_type_template_id_8cb86f32_staticRenderFns = []
+mainvue_type_template_id_8cb86f32_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/mainComp/src/main.vue?vue&type=template&id=1faf05d8&
+// CONCATENATED MODULE: ./packages/mainComp/src/main.vue?vue&type=template&id=8cb86f32&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/mainComp/src/userinfo.vue?vue&type=template&id=5902ef8f&
-var userinfovue_type_template_id_5902ef8f_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/mainComp/src/userinfo.vue?vue&type=template&id=b081c92a&
+var userinfovue_type_template_id_b081c92a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -49622,11 +49825,11 @@ var userinfovue_type_template_id_5902ef8f_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_5902ef8f_staticRenderFns = []
-userinfovue_type_template_id_5902ef8f_render._withStripped = true
+var userinfovue_type_template_id_b081c92a_staticRenderFns = []
+userinfovue_type_template_id_b081c92a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/mainComp/src/userinfo.vue?vue&type=template&id=5902ef8f&
+// CONCATENATED MODULE: ./packages/mainComp/src/userinfo.vue?vue&type=template&id=b081c92a&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/mainComp/src/userinfo.vue?vue&type=script&lang=js&
 //
@@ -49938,7 +50141,7 @@ userinfovue_type_template_id_5902ef8f_render._withStripped = true
       }).then(function (res) {
         if (res.rCode === 0) {
           if (_this4.values.oldpassword && _this4.values.password) {
-            _this4.$confirm('密码修改成功,请重新登陆！', '提示', {
+            _this4.$confirm('密码修改成功,请重新登录！', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               closeOnClickModal: false,
@@ -50009,8 +50212,8 @@ userinfovue_type_template_id_5902ef8f_render._withStripped = true
 
 var src_userinfo_component = normalizeComponent(
   packages_mainComp_src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_5902ef8f_render,
-  userinfovue_type_template_id_5902ef8f_staticRenderFns,
+  userinfovue_type_template_id_b081c92a_render,
+  userinfovue_type_template_id_b081c92a_staticRenderFns,
   false,
   null,
   null,
@@ -52928,7 +53131,7 @@ var mainvue_type_script_lang_js_isIE = navigator.userAgent.indexOf('MSIE') != -1
       };
       if (res) {
         if (res.rCode === 69) {
-          msg = '该账号在其他地方已登陆!';
+          msg = '该账号在其他地方已登录!';
           btn = {
             confirmButtonText: '确定',
             closeOnClickModal: false,
@@ -52998,8 +53201,8 @@ var mainvue_type_script_lang_js_isIE = navigator.userAgent.indexOf('MSIE') != -1
 
 var mainComp_src_main_component = normalizeComponent(
   packages_mainComp_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1faf05d8_render,
-  mainvue_type_template_id_1faf05d8_staticRenderFns,
+  mainvue_type_template_id_8cb86f32_render,
+  mainvue_type_template_id_8cb86f32_staticRenderFns,
   false,
   null,
   null,
@@ -54894,15 +55097,15 @@ mainvue_type_template_id_29c1659e_render._withStripped = true
 // CONCATENATED MODULE: ./packages/player/src/main.vue?vue&type=template&id=29c1659e&
 
 // EXTERNAL MODULE: external "video.js"
-var external_video_js_ = __webpack_require__(10);
+var external_video_js_ = __webpack_require__(9);
 var external_video_js_default = /*#__PURE__*/__webpack_require__.n(external_video_js_);
 
 // EXTERNAL MODULE: external "video.js/dist/lang/zh-CN.json"
-var zh_CN_json_ = __webpack_require__(17);
+var zh_CN_json_ = __webpack_require__(16);
 var zh_CN_json_default = /*#__PURE__*/__webpack_require__.n(zh_CN_json_);
 
 // EXTERNAL MODULE: external "video.js/dist/video-js.css"
-var video_js_css_ = __webpack_require__(23);
+var video_js_css_ = __webpack_require__(21);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/player/src/main.vue?vue&type=script&lang=js&
 var player_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -55193,7 +55396,7 @@ mainvue_type_template_id_31151606_render._withStripped = true
 //
 
 
-var QRCode = __webpack_require__(24);
+var QRCode = __webpack_require__(22);
 /* harmony default export */ var qr_code_src_mainvue_type_script_lang_js_ = ({
   name: 'EsQrCode',
   props: {
@@ -57530,7 +57733,7 @@ mainvue_type_template_id_88396248_render._withStripped = true
 // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=88396248&
 
 // EXTERNAL MODULE: external "eoss-element/src/utils/clickoutside"
-var clickoutside_ = __webpack_require__(18);
+var clickoutside_ = __webpack_require__(17);
 var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=script&lang=js&
@@ -58827,7 +59030,7 @@ selectionvue_type_template_id_66e09547_render._withStripped = true
 // CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=66e09547&
 
 // EXTERNAL MODULE: external "sortablejs"
-var external_sortablejs_ = __webpack_require__(19);
+var external_sortablejs_ = __webpack_require__(18);
 var external_sortablejs_default = /*#__PURE__*/__webpack_require__.n(external_sortablejs_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/selection.vue?vue&type=script&lang=js&
@@ -65258,6 +65461,7 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
       this.$emit('tabs', { item: res, index: num });
     },
     hanleReset: function hanleReset() {
+      this.$refs.filter && this.$refs.filter.resetFields();
       this.searchData = {};
       this.advancedData = {};
       this.$emit('reset');
@@ -65392,6 +65596,7 @@ var toolbar_src_mainvue_type_script_lang_js_extends = Object.assign || function
           }]
         }, [h('es-form', {
           class: 'es-form-search',
+          ref: 'filter',
           props: {
             size: 'medium',
             closeDialog: false,
@@ -71119,7 +71324,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.47',
+  version: '0.4.48',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,