eoss-ui 0.6.40 → 0.6.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (297) hide show
  1. package/lib/button-group.js +5 -0
  2. package/lib/button.js +5 -0
  3. package/lib/checkbox-group.js +5 -0
  4. package/lib/data-table-form.js +5 -0
  5. package/lib/data-table.js +11 -6
  6. package/lib/date-picker.js +5 -0
  7. package/lib/dialog.js +5 -0
  8. package/lib/eoss-ui.common.js +1967 -1458
  9. package/lib/flow-group.js +5 -0
  10. package/lib/flow-list.js +128 -112
  11. package/lib/flow.js +903 -801
  12. package/lib/form.js +5 -0
  13. package/lib/handle-user.js +5 -0
  14. package/lib/handler.js +152 -76
  15. package/lib/icon.js +5 -0
  16. package/lib/icons.js +1 -1
  17. package/lib/index.js +1 -1
  18. package/lib/input-number.js +5 -0
  19. package/lib/input.js +5 -0
  20. package/lib/login.js +248 -160
  21. package/lib/main.js +461 -245
  22. package/lib/nav.js +5 -0
  23. package/lib/page.js +5 -0
  24. package/lib/pagination.js +5 -0
  25. package/lib/player.js +5 -0
  26. package/lib/qr-code.js +18 -13
  27. package/lib/radio-group.js +5 -0
  28. package/lib/retrial-auth.js +5 -0
  29. package/lib/select-ganged.js +5 -0
  30. package/lib/select.js +5 -0
  31. package/lib/selector-panel.js +7 -3
  32. package/lib/selector.js +42 -5
  33. package/lib/sizer.js +5 -0
  34. package/lib/steps.js +5 -0
  35. package/lib/switch.js +5 -0
  36. package/lib/table-form.js +5 -0
  37. package/lib/tabs.js +5 -0
  38. package/lib/theme-chalk/base.css +1 -1
  39. package/lib/theme-chalk/flow.css +1 -1
  40. package/lib/theme-chalk/fonts/iconfont.ttf +0 -0
  41. package/lib/theme-chalk/fonts/iconfont.woff +0 -0
  42. package/lib/theme-chalk/icon.css +1 -1
  43. package/lib/theme-chalk/index.css +1 -1
  44. package/lib/theme-chalk/login.css +1 -1
  45. package/lib/theme-chalk/main.css +1 -1
  46. package/lib/theme-chalk/menu.css +1 -1
  47. package/lib/theme-chalk/simplicity.css +1 -1
  48. package/lib/theme-chalk/sizer.css +1 -1
  49. package/lib/theme-chalk/upload.css +1 -1
  50. package/lib/tips.js +5 -0
  51. package/lib/tree-group.js +5 -0
  52. package/lib/tree.js +5 -0
  53. package/lib/upload.js +5 -0
  54. package/lib/utils/util.js +5 -0
  55. package/lib/wujie.js +5 -0
  56. package/lib/wxlogin.js +5 -0
  57. package/package.json +159 -159
  58. package/packages/button/index.js +5 -5
  59. package/packages/button/src/main.vue +418 -418
  60. package/packages/button-group/index.js +5 -5
  61. package/packages/button-group/src/main.vue +298 -298
  62. package/packages/calendar/index.js +5 -5
  63. package/packages/card/index.js +5 -5
  64. package/packages/card/src/main.vue +156 -156
  65. package/packages/cascader/index.js +5 -5
  66. package/packages/cascader/src/main.vue +168 -168
  67. package/packages/checkbox-group/index.js +5 -5
  68. package/packages/checkbox-group/src/main.vue +333 -333
  69. package/packages/clients/index.js +5 -5
  70. package/packages/clients/src/main.vue +144 -144
  71. package/packages/data-table/index.js +5 -5
  72. package/packages/data-table/src/children.vue +39 -39
  73. package/packages/data-table/src/column.vue +989 -989
  74. package/packages/data-table/src/main.vue +1822 -1820
  75. package/packages/data-table/src/sizer.vue +195 -195
  76. package/packages/data-table-form/index.js +5 -5
  77. package/packages/data-table-form/src/checkbox.vue +101 -101
  78. package/packages/data-table-form/src/colgroup.vue +17 -17
  79. package/packages/data-table-form/src/main.vue +181 -181
  80. package/packages/data-table-form/src/radio.vue +65 -65
  81. package/packages/data-table-form/src/table.vue +233 -233
  82. package/packages/data-table-form/src/tbody.vue +336 -336
  83. package/packages/data-table-form/src/thead.vue +68 -68
  84. package/packages/date-picker/index.js +5 -5
  85. package/packages/date-picker/src/main.vue +236 -236
  86. package/packages/dialog/index.js +5 -5
  87. package/packages/enterprise/index.js +5 -5
  88. package/packages/enterprise/src/main.vue +66 -66
  89. package/packages/error-page/index.js +5 -5
  90. package/packages/error-page/src/main.vue +44 -44
  91. package/packages/flow/index.js +5 -5
  92. package/packages/flow/src/component/CommonOpinions.vue +345 -345
  93. package/packages/flow/src/component/CustomPreset.vue +322 -322
  94. package/packages/flow/src/component/FileList.vue +99 -99
  95. package/packages/flow/src/component/Preset.vue +255 -255
  96. package/packages/flow/src/component/SendMsg.vue +229 -229
  97. package/packages/flow/src/component/TimeLimit.vue +190 -190
  98. package/packages/flow/src/component/taskUnionExamine.vue +611 -603
  99. package/packages/flow/src/form.vue +121 -121
  100. package/packages/flow/src/freeStartFlow.vue +2843 -2843
  101. package/packages/flow/src/main.vue +2952 -2864
  102. package/packages/flow/src/processForm.vue +1018 -1007
  103. package/packages/flow/src/processReject.vue +293 -293
  104. package/packages/flow/src/reset.vue +899 -901
  105. package/packages/flow/src/startTaskRead.vue +596 -596
  106. package/packages/flow/src/table.vue +58 -58
  107. package/packages/flow-group/index.js +5 -5
  108. package/packages/flow-group/src/main.vue +688 -688
  109. package/packages/flow-list/index.js +5 -5
  110. package/packages/flow-list/src/main.vue +1183 -1172
  111. package/packages/form/index.js +5 -5
  112. package/packages/form/src/main.vue +3584 -3584
  113. package/packages/form/src/table.vue +1420 -1420
  114. package/packages/handle-user/index.js +5 -5
  115. package/packages/handle-user/src/main.vue +138 -138
  116. package/packages/handler/index.js +5 -5
  117. package/packages/handler/src/main.vue +474 -388
  118. package/packages/icon/index.js +5 -5
  119. package/packages/icon/src/main.vue +101 -101
  120. package/packages/icons/index.js +5 -5
  121. package/packages/icons/src/icon.json +1 -1
  122. package/packages/icons/src/main.vue +81 -81
  123. package/packages/input/index.js +5 -5
  124. package/packages/input/src/main.vue +356 -356
  125. package/packages/input-number/index.js +5 -5
  126. package/packages/input-number/src/main.vue +106 -106
  127. package/packages/label/index.js +5 -5
  128. package/packages/label/src/main.vue +457 -457
  129. package/packages/layout/index.js +5 -5
  130. package/packages/layout/src/item.vue +152 -152
  131. package/packages/layout/src/main.vue +31 -31
  132. package/packages/login/index.js +5 -5
  133. package/packages/login/src/main.vue +1935 -1892
  134. package/packages/login/src/resetPassword.vue +562 -562
  135. package/packages/main/index.js +5 -5
  136. package/packages/main/src/default/index.vue +32 -3
  137. package/packages/main/src/default/message.vue +249 -249
  138. package/packages/main/src/default/notice.vue +157 -157
  139. package/packages/main/src/default/userinfo.vue +505 -505
  140. package/packages/main/src/public/online.vue +89 -89
  141. package/packages/main/src/public/search.vue +461 -454
  142. package/packages/main/src/public/settings.vue +221 -221
  143. package/packages/main/src/simplicity/apps.vue +388 -388
  144. package/packages/main/src/simplicity/avatar.vue +82 -82
  145. package/packages/main/src/simplicity/handler.vue +259 -221
  146. package/packages/main/src/simplicity/index.vue +2047 -1993
  147. package/packages/main/src/simplicity/lists.vue +84 -84
  148. package/packages/main/src/simplicity/menu-list.vue +128 -128
  149. package/packages/main/src/simplicity/message.vue +259 -259
  150. package/packages/main/src/simplicity/notice.vue +190 -190
  151. package/packages/main/src/simplicity/router-page.vue +45 -45
  152. package/packages/main/src/simplicity/sub-menu.vue +241 -241
  153. package/packages/main/src/simplicity/user.vue +257 -257
  154. package/packages/main/src/simplicity/userinfo.vue +312 -312
  155. package/packages/menu/index.js +5 -5
  156. package/packages/menu/src/main.vue +536 -536
  157. package/packages/nav/index.js +5 -5
  158. package/packages/nav/src/main.vue +402 -402
  159. package/packages/notify/index.js +5 -5
  160. package/packages/notify/src/main.vue +538 -538
  161. package/packages/page/index.js +5 -5
  162. package/packages/page/src/main.vue +167 -167
  163. package/packages/pagination/index.js +5 -5
  164. package/packages/pagination/src/main.vue +96 -96
  165. package/packages/player/index.js +5 -5
  166. package/packages/player/src/main.vue +194 -194
  167. package/packages/qr-code/index.js +5 -5
  168. package/packages/qr-code/src/main.vue +170 -170
  169. package/packages/radio-group/index.js +6 -6
  170. package/packages/radio-group/src/main.vue +319 -319
  171. package/packages/retrial-auth/index.js +5 -5
  172. package/packages/retrial-auth/src/main.vue +280 -280
  173. package/packages/select/index.js +5 -5
  174. package/packages/select/src/main.vue +775 -775
  175. package/packages/select-ganged/index.js +5 -5
  176. package/packages/select-ganged/src/main.vue +724 -724
  177. package/packages/selector/index.js +5 -5
  178. package/packages/selector/src/main.vue +689 -677
  179. package/packages/selector-panel/index.js +5 -5
  180. package/packages/selector-panel/src/main.vue +1027 -1028
  181. package/packages/selector-panel/src/selection.vue +177 -177
  182. package/packages/selector-panel/src/tree.vue +129 -129
  183. package/packages/sizer/index.js +5 -5
  184. package/packages/sizer/src/main.vue +254 -254
  185. package/packages/steps/index.js +5 -5
  186. package/packages/steps/src/main.vue +181 -181
  187. package/packages/switch/index.js +5 -5
  188. package/packages/switch/src/main.vue +154 -154
  189. package/packages/table-form/index.js +5 -5
  190. package/packages/tabs/index.js +5 -5
  191. package/packages/tabs/src/main.vue +788 -788
  192. package/packages/tabs-panel/index.js +5 -5
  193. package/packages/tabs-panel/src/main.vue +29 -29
  194. package/packages/theme-chalk/lib/base.css +1 -1
  195. package/packages/theme-chalk/lib/flow.css +1 -1
  196. package/packages/theme-chalk/lib/fonts/iconfont.ttf +0 -0
  197. package/packages/theme-chalk/lib/fonts/iconfont.woff +0 -0
  198. package/packages/theme-chalk/lib/icon.css +1 -1
  199. package/packages/theme-chalk/lib/index.css +1 -1
  200. package/packages/theme-chalk/lib/login.css +1 -1
  201. package/packages/theme-chalk/lib/main.css +1 -1
  202. package/packages/theme-chalk/lib/menu.css +1 -1
  203. package/packages/theme-chalk/lib/simplicity.css +1 -1
  204. package/packages/theme-chalk/lib/sizer.css +1 -1
  205. package/packages/theme-chalk/lib/upload.css +1 -1
  206. package/packages/theme-chalk/src/base.scss +260 -260
  207. package/packages/theme-chalk/src/button-group.scss +175 -175
  208. package/packages/theme-chalk/src/button.scss +24 -24
  209. package/packages/theme-chalk/src/calendar.scss +113 -113
  210. package/packages/theme-chalk/src/card.scss +99 -99
  211. package/packages/theme-chalk/src/checkbox-group.scss +8 -8
  212. package/packages/theme-chalk/src/clients.scss +87 -87
  213. package/packages/theme-chalk/src/data-table-form.scss +67 -67
  214. package/packages/theme-chalk/src/data-table.scss +293 -293
  215. package/packages/theme-chalk/src/date-picker.scss +7 -7
  216. package/packages/theme-chalk/src/dialog.scss +77 -77
  217. package/packages/theme-chalk/src/enterprise.scss +5 -5
  218. package/packages/theme-chalk/src/error-page.scss +18 -18
  219. package/packages/theme-chalk/src/flow-group.scss +110 -110
  220. package/packages/theme-chalk/src/flow-list.scss +36 -36
  221. package/packages/theme-chalk/src/flow.scss +318 -310
  222. package/packages/theme-chalk/src/fonts/iconfont.ttf +0 -0
  223. package/packages/theme-chalk/src/fonts/iconfont.woff +0 -0
  224. package/packages/theme-chalk/src/form.scss +496 -496
  225. package/packages/theme-chalk/src/handle-user.scss +40 -40
  226. package/packages/theme-chalk/src/handler.scss +143 -143
  227. package/packages/theme-chalk/src/icon.scss +1789 -1760
  228. package/packages/theme-chalk/src/icons.scss +99 -99
  229. package/packages/theme-chalk/src/input.scss +9 -9
  230. package/packages/theme-chalk/src/label.scss +24 -24
  231. package/packages/theme-chalk/src/layout.scss +46 -46
  232. package/packages/theme-chalk/src/login.scss +947 -939
  233. package/packages/theme-chalk/src/main.scss +639 -632
  234. package/packages/theme-chalk/src/menu.scss +222 -222
  235. package/packages/theme-chalk/src/mixins/color.scss +117 -117
  236. package/packages/theme-chalk/src/nav.scss +125 -125
  237. package/packages/theme-chalk/src/page.scss +3 -3
  238. package/packages/theme-chalk/src/pagination.scss +29 -29
  239. package/packages/theme-chalk/src/player.scss +9 -9
  240. package/packages/theme-chalk/src/qr-code.scss +17 -17
  241. package/packages/theme-chalk/src/radio-group.scss +9 -9
  242. package/packages/theme-chalk/src/retrial-auth.scss +38 -38
  243. package/packages/theme-chalk/src/select-ganged.scss +8 -8
  244. package/packages/theme-chalk/src/select.scss +8 -8
  245. package/packages/theme-chalk/src/selector-panel.scss +204 -204
  246. package/packages/theme-chalk/src/selector.scss +91 -91
  247. package/packages/theme-chalk/src/simplicity.scss +1262 -1262
  248. package/packages/theme-chalk/src/sizer.scss +36 -36
  249. package/packages/theme-chalk/src/steps.scss +88 -88
  250. package/packages/theme-chalk/src/switch.scss +3 -3
  251. package/packages/theme-chalk/src/table-form.scss +1 -1
  252. package/packages/theme-chalk/src/tabs.scss +87 -87
  253. package/packages/theme-chalk/src/tips.scss +7 -7
  254. package/packages/theme-chalk/src/toolbar.scss +179 -179
  255. package/packages/theme-chalk/src/tree-group.scss +72 -72
  256. package/packages/theme-chalk/src/tree.scss +165 -165
  257. package/packages/theme-chalk/src/upload.scss +167 -167
  258. package/packages/theme-chalk/src/wxlogin.scss +3 -3
  259. package/packages/tips/index.js +5 -5
  260. package/packages/tips/src/main.vue +141 -141
  261. package/packages/toolbar/index.js +5 -5
  262. package/packages/toolbar/src/main.vue +430 -430
  263. package/packages/tree/index.js +5 -5
  264. package/packages/tree-group/index.js +5 -5
  265. package/packages/upload/index.js +5 -5
  266. package/packages/upload/src/main.vue +1334 -1334
  267. package/packages/upload/src/picture.js +15 -15
  268. package/packages/wujie/index.js +5 -5
  269. package/packages/wujie/src/main.vue +145 -145
  270. package/packages/wxlogin/index.js +5 -5
  271. package/packages/wxlogin/src/main.vue +128 -128
  272. package/src/config/api.js +248 -248
  273. package/src/config/image.js +2 -2
  274. package/src/index.js +157 -157
  275. package/src/utils/bus.js +3 -3
  276. package/src/utils/date-util.js +312 -312
  277. package/src/utils/http.js +50 -50
  278. package/src/utils/rules.js +18 -18
  279. package/src/utils/store.js +21 -21
  280. package/src/utils/util.js +5 -0
  281. package/src/utils/webSocket.js +107 -107
  282. package/packages/.DS_Store +0 -0
  283. package/packages/data-table/.DS_Store +0 -0
  284. package/packages/data-table-form/.DS_Store +0 -0
  285. package/packages/error-page/.DS_Store +0 -0
  286. package/packages/flow/.DS_Store +0 -0
  287. package/packages/form/.DS_Store +0 -0
  288. package/packages/login/.DS_Store +0 -0
  289. package/packages/main/.DS_Store +0 -0
  290. package/packages/main/src/.DS_Store +0 -0
  291. package/packages/selector/.DS_Store +0 -0
  292. package/packages/selector-panel/.DS_Store +0 -0
  293. package/packages/sizer/.DS_Store +0 -0
  294. package/packages/tabs/.DS_Store +0 -0
  295. package/packages/theme-chalk/src/.DS_Store +0 -0
  296. package/packages/upload/.DS_Store +0 -0
  297. package/src/.DS_Store +0 -0
package/lib/main.js CHANGED
@@ -559,6 +559,7 @@ var ajaxStream = function ajaxStream(_ref2) {
559
559
  var lastProcessedIndex = 0;
560
560
  var done = false;
561
561
  var finishThink = false;
562
+ var hasThink = false;
562
563
  ajax(_extends({
563
564
  timeout: 990000,
564
565
  format: false,
@@ -612,8 +613,12 @@ var ajaxStream = function ajaxStream(_ref2) {
612
613
  var start = parsedData.message.match(startRegex);
613
614
  var end = parsedData.message.match(endRegex);
614
615
  if (start) {
616
+ hasThink = true;
615
617
  var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
616
618
  info.thinkContent += _thinkContent;
619
+ } else if (hasThink === false) {
620
+ info.content += parsedData.message;
621
+ chunks += parsedData.message;
617
622
  } else {
618
623
  if (end) {
619
624
  finishThink = true;
@@ -4309,8 +4314,8 @@ render._withStripped = true
4309
4314
  // EXTERNAL MODULE: ./src/config/image.js
4310
4315
  var config_image = __webpack_require__(19);
4311
4316
 
4312
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=22cde548&scoped=true&
4313
- var simplicityvue_type_template_id_22cde548_scoped_true_render = function () {
4317
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=4aaec640&scoped=true&
4318
+ var simplicityvue_type_template_id_4aaec640_scoped_true_render = function () {
4314
4319
  var _vm = this
4315
4320
  var _h = _vm.$createElement
4316
4321
  var _c = _vm._self._c || _h
@@ -4522,7 +4527,7 @@ var simplicityvue_type_template_id_22cde548_scoped_true_render = function () {
4522
4527
  style: _vm._aibackground,
4523
4528
  on: {
4524
4529
  click: function ($event) {
4525
- _vm.handlerSetDrawer(_vm._aiConfig)
4530
+ _vm.handlerSetDrawer(_vm._aiConfig, "ai")
4526
4531
  },
4527
4532
  },
4528
4533
  },
@@ -4592,7 +4597,7 @@ var simplicityvue_type_template_id_22cde548_scoped_true_render = function () {
4592
4597
  {
4593
4598
  staticClass: "es-simplicity-public-drawer",
4594
4599
  attrs: {
4595
- direction: "ltr",
4600
+ direction: _vm.drawer.direction,
4596
4601
  "modal-class": "es-simplicity-apps-modal",
4597
4602
  size: "100%",
4598
4603
  "show-close": "",
@@ -4606,35 +4611,91 @@ var simplicityvue_type_template_id_22cde548_scoped_true_render = function () {
4606
4611
  },
4607
4612
  },
4608
4613
  [
4609
- _vm.drawer.url
4610
- ? [
4611
- _vm.isIE || _vm.drawer.method !== "wujie"
4612
- ? [
4613
- _c("iframe", {
4614
- attrs: {
4615
- frameborder: "0",
4616
- width: "100%",
4617
- height: "100%",
4618
- src: _vm.drawer.url,
4619
- },
4620
- }),
4621
- ]
4622
- : [
4623
- _c("es-wujie", {
4624
- attrs: {
4625
- host: _vm.host,
4626
- show: true,
4627
- props: _vm.wjProps,
4628
- attrs: _vm.wjAttrs,
4629
- name: _vm.drawer.name,
4630
- url: _vm.drawer.url,
4631
- },
4632
- }),
4633
- ],
4634
- ]
4614
+ _vm.drawer.ai && _vm.drawer.ai.url
4615
+ ? _c(
4616
+ "div",
4617
+ {
4618
+ directives: [
4619
+ {
4620
+ name: "show",
4621
+ rawName: "v-show",
4622
+ value: _vm.drawer.active == "ai",
4623
+ expression: "drawer.active == 'ai'",
4624
+ },
4625
+ ],
4626
+ staticClass: "es-simplicity-public-drawer-main",
4627
+ },
4628
+ [
4629
+ _vm.isIE || _vm.drawer.ai.method !== "wujie"
4630
+ ? [
4631
+ _c("iframe", {
4632
+ attrs: {
4633
+ frameborder: "0",
4634
+ width: "100%",
4635
+ height: "100%",
4636
+ src: _vm.drawer.ai.url,
4637
+ },
4638
+ }),
4639
+ ]
4640
+ : [
4641
+ _c("es-wujie", {
4642
+ attrs: {
4643
+ host: _vm.host,
4644
+ show: true,
4645
+ props: _vm.wjProps,
4646
+ attrs: _vm.wjAttrs,
4647
+ name: _vm.drawer.ai.name,
4648
+ url: _vm.drawer.ai.url,
4649
+ },
4650
+ }),
4651
+ ],
4652
+ ],
4653
+ 2
4654
+ )
4635
4655
  : _vm._e(),
4636
- ],
4637
- 2
4656
+ _vm.drawer.im && _vm.drawer.im.url
4657
+ ? _c(
4658
+ "div",
4659
+ {
4660
+ directives: [
4661
+ {
4662
+ name: "show",
4663
+ rawName: "v-show",
4664
+ value: _vm.drawer.active == "im",
4665
+ expression: "drawer.active == 'im'",
4666
+ },
4667
+ ],
4668
+ staticClass: "es-simplicity-public-drawer-main",
4669
+ },
4670
+ [
4671
+ _vm.isIE || _vm.drawer.im.method !== "wujie"
4672
+ ? [
4673
+ _c("iframe", {
4674
+ attrs: {
4675
+ frameborder: "0",
4676
+ width: "100%",
4677
+ height: "100%",
4678
+ src: _vm.drawer.im.url,
4679
+ },
4680
+ }),
4681
+ ]
4682
+ : [
4683
+ _c("es-wujie", {
4684
+ attrs: {
4685
+ host: _vm.host,
4686
+ show: true,
4687
+ props: _vm.wjProps,
4688
+ attrs: _vm.wjAttrs,
4689
+ name: _vm.drawer.im.name,
4690
+ url: _vm.drawer.im.url,
4691
+ },
4692
+ }),
4693
+ ],
4694
+ ],
4695
+ 2
4696
+ )
4697
+ : _vm._e(),
4698
+ ]
4638
4699
  ),
4639
4700
  _c(
4640
4701
  "div",
@@ -4946,11 +5007,11 @@ var simplicityvue_type_template_id_22cde548_scoped_true_render = function () {
4946
5007
  ),
4947
5008
  ])
4948
5009
  }
4949
- var simplicityvue_type_template_id_22cde548_scoped_true_staticRenderFns = []
4950
- simplicityvue_type_template_id_22cde548_scoped_true_render._withStripped = true
5010
+ var simplicityvue_type_template_id_4aaec640_scoped_true_staticRenderFns = []
5011
+ simplicityvue_type_template_id_4aaec640_scoped_true_render._withStripped = true
4951
5012
 
4952
5013
 
4953
- // CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=22cde548&scoped=true&
5014
+ // CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=4aaec640&scoped=true&
4954
5015
 
4955
5016
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=e722b45c&scoped=true&
4956
5017
  var avatarvue_type_template_id_e722b45c_scoped_true_render = function () {
@@ -5110,8 +5171,8 @@ var component = Object(componentNormalizer["a" /* default */])(
5110
5171
  )
5111
5172
 
5112
5173
  /* harmony default export */ var avatar = (component.exports);
5113
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/handler.vue?vue&type=template&id=6f2302b2&scoped=true&
5114
- var handlervue_type_template_id_6f2302b2_scoped_true_render = function () {
5174
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/handler.vue?vue&type=template&id=754aecd5&scoped=true&
5175
+ var handlervue_type_template_id_754aecd5_scoped_true_render = function () {
5115
5176
  var _vm = this
5116
5177
  var _h = _vm.$createElement
5117
5178
  var _c = _vm._self._c || _h
@@ -5152,7 +5213,7 @@ var handlervue_type_template_id_6f2302b2_scoped_true_render = function () {
5152
5213
  ]),
5153
5214
  ]
5154
5215
  )
5155
- : item.type === "online"
5216
+ : item.type === "online" || item.type === "onlineUser"
5156
5217
  ? _c(
5157
5218
  "div",
5158
5219
  { key: item.type, staticClass: "es-simplicity-online" },
@@ -5174,7 +5235,7 @@ var handlervue_type_template_id_6f2302b2_scoped_true_render = function () {
5174
5235
  _vm._v("\n 人在线\n "),
5175
5236
  ]
5176
5237
  )
5177
- : item.type === "notice"
5238
+ : item.type === "notice" || item.type === "messsage"
5178
5239
  ? _c(
5179
5240
  "el-badge",
5180
5241
  {
@@ -5217,15 +5278,17 @@ var handlervue_type_template_id_6f2302b2_scoped_true_render = function () {
5217
5278
  2
5218
5279
  )
5219
5280
  }
5220
- var handlervue_type_template_id_6f2302b2_scoped_true_staticRenderFns = []
5221
- handlervue_type_template_id_6f2302b2_scoped_true_render._withStripped = true
5281
+ var handlervue_type_template_id_754aecd5_scoped_true_staticRenderFns = []
5282
+ handlervue_type_template_id_754aecd5_scoped_true_render._withStripped = true
5222
5283
 
5223
5284
 
5224
- // CONCATENATED MODULE: ./packages/main/src/simplicity/handler.vue?vue&type=template&id=6f2302b2&scoped=true&
5285
+ // CONCATENATED MODULE: ./packages/main/src/simplicity/handler.vue?vue&type=template&id=754aecd5&scoped=true&
5225
5286
 
5226
5287
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/handler.vue?vue&type=script&lang=js&
5227
5288
  var _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; };
5228
5289
 
5290
+ 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; };
5291
+
5229
5292
  //
5230
5293
  //
5231
5294
  //
@@ -5301,31 +5364,69 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
5301
5364
  props: {
5302
5365
  contact: Object,
5303
5366
  dateTime: {
5304
- type: Boolean,
5305
- default: true
5367
+ type: [Boolean, Object],
5368
+ default: function _default() {
5369
+ return { type: 'dateTime' };
5370
+ },
5371
+
5372
+ validator: function validator(val) {
5373
+ return val === false || (typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object';
5374
+ }
5375
+ },
5376
+ onlineUser: {
5377
+ type: [Boolean, Object],
5378
+ default: function _default() {
5379
+ return { type: 'onlineUser' };
5380
+ },
5381
+
5382
+ validator: function validator(val) {
5383
+ return val === false || (typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object';
5384
+ }
5306
5385
  },
5307
5386
  search: {
5308
- type: Object,
5387
+ type: [Boolean, Object],
5309
5388
  default: function _default() {
5310
5389
  return {
5311
5390
  type: 'search',
5312
5391
  icon: 'es-icon-magnifier',
5313
5392
  title: '搜索'
5314
5393
  };
5394
+ },
5395
+
5396
+ validator: function validator(val) {
5397
+ return val === false || (typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object';
5398
+ }
5399
+ },
5400
+ im: {
5401
+ type: [Boolean, Object],
5402
+ default: function _default() {
5403
+ return {
5404
+ type: 'im',
5405
+ icon: 'es-icon-liaotian',
5406
+ title: 'IM'
5407
+ };
5408
+ },
5409
+
5410
+ validator: function validator(val) {
5411
+ return val === false || (typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object';
5315
5412
  }
5316
5413
  },
5317
5414
  index: {
5318
- type: Object,
5415
+ type: [Boolean, Object],
5319
5416
  default: function _default() {
5320
5417
  return {
5321
5418
  type: 'index',
5322
5419
  icon: 'es-icon-home',
5323
5420
  title: '门户'
5324
5421
  };
5422
+ },
5423
+
5424
+ validator: function validator(val) {
5425
+ return val === false || (typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object';
5325
5426
  }
5326
5427
  },
5327
5428
  home: {
5328
- type: Object,
5429
+ type: [Boolean, Object],
5329
5430
  default: function _default() {
5330
5431
  return {
5331
5432
  type: 'home',
@@ -5335,7 +5436,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
5335
5436
  }
5336
5437
  },
5337
5438
  notice: {
5338
- type: Object,
5439
+ type: [Boolean, Object],
5339
5440
  default: function _default() {
5340
5441
  return {
5341
5442
  type: 'notice',
@@ -5345,7 +5446,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
5345
5446
  }
5346
5447
  },
5347
5448
  quit: {
5348
- type: Object,
5449
+ type: [Boolean, Object],
5349
5450
  default: function _default() {
5350
5451
  return {
5351
5452
  type: 'quit',
@@ -5355,24 +5456,30 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
5355
5456
  }
5356
5457
  },
5357
5458
  set: {
5358
- type: Object,
5459
+ type: [Boolean, Object],
5359
5460
  default: function _default() {
5360
5461
  return {
5361
5462
  type: 'set',
5362
5463
  icon: 'es-icon-xitongguanli',
5363
5464
  title: '设置'
5364
5465
  };
5466
+ },
5467
+
5468
+ validator: function validator(val) {
5469
+ return val === false || (typeof val === 'undefined' ? 'undefined' : _typeof(val)) === 'object';
5365
5470
  }
5366
5471
  },
5367
5472
  data: Array,
5368
5473
  hide: {
5369
5474
  type: Object,
5370
5475
  default: function _default() {
5371
- return {
5372
- old: true
5373
- };
5476
+ return {};
5374
5477
  }
5375
5478
  },
5479
+ msgNum: {
5480
+ type: Number,
5481
+ default: 0
5482
+ },
5376
5483
  noticeNum: {
5377
5484
  type: Number,
5378
5485
  default: 0
@@ -5392,21 +5499,13 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
5392
5499
 
5393
5500
  computed: {
5394
5501
  lists: function lists() {
5395
- var _this = this;
5396
-
5397
- var df = [];
5398
- if (this.contact) {
5399
- df.push(_extends({}, this.contact, { type: 'contact' }));
5400
- }
5401
- if (this.dateTime) {
5402
- df.push({ type: 'dateTime' });
5403
- }
5404
- if (this.online) {
5405
- df.push({ type: 'online' });
5406
- }
5407
- var data = this.data ? [].concat(df, this.data) : [].concat(df, [this.search, this.index, this.home, this.notice, this.quit, this.set]);
5502
+ var hide = _extends({
5503
+ old: true,
5504
+ im: true
5505
+ }, this.hide);
5506
+ var data = this.data ? this.data : [this.contact ? _extends({}, this.contact, { type: 'contact' }) : {}, this.dateTime, this.onlineUser, this.search, this.im, this.index, this.home, this.notice, this.quit, this.set];
5408
5507
  return data.filter(function (item) {
5409
- return !_this.hide[item.type];
5508
+ return item && Object.keys(item).length && !item.hide && !hide[item.type];
5410
5509
  });
5411
5510
  },
5412
5511
  isClick: function isClick() {
@@ -5425,11 +5524,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
5425
5524
 
5426
5525
  methods: {
5427
5526
  getTime: function getTime() {
5428
- var _this2 = this;
5527
+ var _this = this;
5429
5528
 
5430
5529
  this.timer && clearInterval(this.timer);
5431
5530
  this.timer = setInterval(function () {
5432
- _this2.time = util["a" /* default */].formatDate('', 'HH:mm:ss');
5531
+ _this.time = util["a" /* default */].formatDate('', 'HH:mm:ss');
5433
5532
  });
5434
5533
  },
5435
5534
  handleClick: function handleClick(res) {
@@ -5452,11 +5551,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
5452
5551
 
5453
5552
  var handler_component = Object(componentNormalizer["a" /* default */])(
5454
5553
  simplicity_handlervue_type_script_lang_js_,
5455
- handlervue_type_template_id_6f2302b2_scoped_true_render,
5456
- handlervue_type_template_id_6f2302b2_scoped_true_staticRenderFns,
5554
+ handlervue_type_template_id_754aecd5_scoped_true_render,
5555
+ handlervue_type_template_id_754aecd5_scoped_true_staticRenderFns,
5457
5556
  false,
5458
5557
  null,
5459
- "6f2302b2",
5558
+ "754aecd5",
5460
5559
  null
5461
5560
 
5462
5561
  )
@@ -6927,10 +7026,10 @@ var external_throttle_debounce_ = __webpack_require__(12);
6927
7026
  this.$emit('click', res);
6928
7027
  },
6929
7028
 
6930
- /**
6931
- * @desc:获取气泡提醒
6932
- * @author huangbo
6933
- * @date 2024年9月7日
7029
+ /**
7030
+ * @desc:获取气泡提醒
7031
+ * @author huangbo
7032
+ * @date 2024年9月7日
6934
7033
  **/
6935
7034
  getBadge: function getBadge(res) {
6936
7035
  var num = res.tips || 0;
@@ -9330,8 +9429,8 @@ var online_component = Object(componentNormalizer["a" /* default */])(
9330
9429
  )
9331
9430
 
9332
9431
  /* harmony default export */ var online = (online_component.exports);
9333
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=template&id=4c2b6f24&
9334
- var searchvue_type_template_id_4c2b6f24_render = function () {
9432
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=template&id=6c253fc4&
9433
+ var searchvue_type_template_id_6c253fc4_render = function () {
9335
9434
  var _vm = this
9336
9435
  var _h = _vm.$createElement
9337
9436
  var _c = _vm._self._c || _h
@@ -9396,11 +9495,13 @@ var searchvue_type_template_id_4c2b6f24_render = function () {
9396
9495
  { staticClass: "es-public-search-list" },
9397
9496
  _vm._l(
9398
9497
  item.records.slice(0, 3),
9399
- function (ele) {
9498
+ function (ele, idx) {
9400
9499
  return _c(
9401
9500
  "li",
9402
9501
  {
9403
- key: ele.id || ele.title,
9502
+ key:
9503
+ ele.id ||
9504
+ item.id + "_" + ele.title + "_" + idx,
9404
9505
  staticClass:
9405
9506
  "es-public-search-list-item",
9406
9507
  on: {
@@ -9540,7 +9641,7 @@ var searchvue_type_template_id_4c2b6f24_render = function () {
9540
9641
  ),
9541
9642
  _vm._l(_vm.types, function (item, index) {
9542
9643
  return [
9543
- !_vm.hides.includes(item.name)
9644
+ !_vm.hides.includes(item.name) && !item.hide
9544
9645
  ? _c(
9545
9646
  "el-tab-pane",
9546
9647
  {
@@ -9605,11 +9706,13 @@ var searchvue_type_template_id_4c2b6f24_render = function () {
9605
9706
  _c(
9606
9707
  "ul",
9607
9708
  { staticClass: "es-public-search-lists" },
9608
- _vm._l(item.records, function (ele) {
9709
+ _vm._l(item.records, function (ele, idx) {
9609
9710
  return _c(
9610
9711
  "li",
9611
9712
  {
9612
- key: ele.id || ele.title,
9713
+ key:
9714
+ ele.id ||
9715
+ item.id + "_" + ele.title + "_" + idx,
9613
9716
  staticClass: "es-public-search-list-item",
9614
9717
  on: {
9615
9718
  click: function ($event) {
@@ -9741,11 +9844,11 @@ var searchvue_type_template_id_4c2b6f24_render = function () {
9741
9844
  1
9742
9845
  )
9743
9846
  }
9744
- var searchvue_type_template_id_4c2b6f24_staticRenderFns = []
9745
- searchvue_type_template_id_4c2b6f24_render._withStripped = true
9847
+ var searchvue_type_template_id_6c253fc4_staticRenderFns = []
9848
+ searchvue_type_template_id_6c253fc4_render._withStripped = true
9746
9849
 
9747
9850
 
9748
- // CONCATENATED MODULE: ./packages/main/src/public/search.vue?vue&type=template&id=4c2b6f24&
9851
+ // CONCATENATED MODULE: ./packages/main/src/public/search.vue?vue&type=template&id=6c253fc4&
9749
9852
 
9750
9853
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=script&lang=js&
9751
9854
  var searchvue_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; };
@@ -10048,7 +10151,12 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
10048
10151
  var types = results.catalog.map(function (item, index) {
10049
10152
  loadings[item.id || String(index)] = false;
10050
10153
  noMore[item.id || String(index)] = false;
10051
- return searchvue_type_script_lang_js_extends({}, item, { pageNum: 0, pageCount: 1, records: [] });
10154
+ return searchvue_type_script_lang_js_extends({}, item, {
10155
+ pageNum: 0,
10156
+ pageCount: 1,
10157
+ records: [],
10158
+ hide: item.name == '应用' && _this2.apps.length == 0 ? true : false
10159
+ });
10052
10160
  });
10053
10161
  _this2.types = types;
10054
10162
  _this2.loadings = loadings;
@@ -10059,7 +10167,7 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
10059
10167
  searchAll: function searchAll(keyWords) {
10060
10168
  for (var i = 0; i < this.types.length; i++) {
10061
10169
  var item = this.types[i];
10062
- if (keyWords) {
10170
+ if (keyWords && !this.hides.includes(item.name) && !item.hide) {
10063
10171
  if (item.name == '菜单' && this.menus.length) {
10064
10172
  this.isLoading = false;
10065
10173
  this.types[i].records = this.searchData(this.menus, keyWords);
@@ -10202,8 +10310,8 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
10202
10310
 
10203
10311
  var search_component = Object(componentNormalizer["a" /* default */])(
10204
10312
  public_searchvue_type_script_lang_js_,
10205
- searchvue_type_template_id_4c2b6f24_render,
10206
- searchvue_type_template_id_4c2b6f24_staticRenderFns,
10313
+ searchvue_type_template_id_6c253fc4_render,
10314
+ searchvue_type_template_id_6c253fc4_staticRenderFns,
10207
10315
  false,
10208
10316
  null,
10209
10317
  null,
@@ -10216,7 +10324,7 @@ var search_component = Object(componentNormalizer["a" /* default */])(
10216
10324
  var store = __webpack_require__(13);
10217
10325
 
10218
10326
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=script&lang=js&
10219
- 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; };
10327
+ var simplicityvue_type_script_lang_js_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; };
10220
10328
 
10221
10329
  var simplicityvue_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; };
10222
10330
 
@@ -10546,6 +10654,30 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
10546
10654
  //
10547
10655
  //
10548
10656
  //
10657
+ //
10658
+ //
10659
+ //
10660
+ //
10661
+ //
10662
+ //
10663
+ //
10664
+ //
10665
+ //
10666
+ //
10667
+ //
10668
+ //
10669
+ //
10670
+ //
10671
+ //
10672
+ //
10673
+ //
10674
+ //
10675
+ //
10676
+ //
10677
+ //
10678
+ //
10679
+ //
10680
+ //
10549
10681
 
10550
10682
 
10551
10683
 
@@ -10696,6 +10828,8 @@ var events = [function (tabs, index, that) {
10696
10828
  },
10697
10829
  //人工智能配置
10698
10830
  ai: Object,
10831
+ //im
10832
+ im: Object,
10699
10833
  //iframeId
10700
10834
  iframeId: {
10701
10835
  type: String,
@@ -10766,9 +10900,15 @@ var events = [function (tabs, index, that) {
10766
10900
  fold: false,
10767
10901
  //人工智能配置
10768
10902
  aiConfig: null,
10903
+ //im配置
10904
+ imConfig: null,
10769
10905
  //公用窗口面板配置
10770
10906
  drawer: {
10771
- visible: false
10907
+ visible: false,
10908
+ direction: 'ltr',
10909
+ ai: {},
10910
+ im: {},
10911
+ active: ''
10772
10912
  },
10773
10913
  //所有应用
10774
10914
  applications: [],
@@ -10863,6 +11003,11 @@ var events = [function (tabs, index, that) {
10863
11003
  } : {};
10864
11004
  },
10865
11005
 
11006
+ //人工智能配置
11007
+ _imConfig: function _imConfig() {
11008
+ return this.imConfig || this.im;
11009
+ },
11010
+
10866
11011
  //用户信息
10867
11012
  user: function user() {
10868
11013
  return this.userModel ? this.userModel : store["a" /* default */].get('userModel');
@@ -10917,10 +11062,10 @@ var events = [function (tabs, index, that) {
10917
11062
  },
10918
11063
 
10919
11064
  methods: {
10920
- /**
10921
- * @desc:匹配路由
10922
- * @author huangbo
10923
- * @date 2024年9月7日
11065
+ /**
11066
+ * @desc:匹配路由
11067
+ * @author huangbo
11068
+ * @date 2024年9月7日
10924
11069
  **/
10925
11070
  hasRouter: function hasRouter(res, url, code) {
10926
11071
  if (!url) {
@@ -10964,10 +11109,10 @@ var events = [function (tabs, index, that) {
10964
11109
  return false;
10965
11110
  },
10966
11111
 
10967
- /**
10968
- * @desc:获取初始数据
10969
- * @author huangbo
10970
- * @date 2024年9月7日
11112
+ /**
11113
+ * @desc:获取初始数据
11114
+ * @author huangbo
11115
+ * @date 2024年9月7日
10971
11116
  **/
10972
11117
  init: function init(results, first) {
10973
11118
  this.setConfig(results);
@@ -10976,10 +11121,10 @@ var events = [function (tabs, index, that) {
10976
11121
  }
10977
11122
  },
10978
11123
 
10979
- /**
10980
- * @desc:设置用户配置及信息
10981
- * @author huangbo
10982
- * @date 2024年9月7日
11124
+ /**
11125
+ * @desc:设置用户配置及信息
11126
+ * @author huangbo
11127
+ * @date 2024年9月7日
10983
11128
  **/
10984
11129
  setConfig: function setConfig(results) {
10985
11130
  localStorage.setItem('mainConfig', JSON.stringify(results));
@@ -11062,6 +11207,17 @@ var events = [function (tabs, index, that) {
11062
11207
  this.aiConfig = results[i].aiConfig;
11063
11208
  }
11064
11209
  }
11210
+ if (results[i].imConfig) {
11211
+ if (typeof results[i].imConfig == 'string') {
11212
+ try {
11213
+ this.imConfig = JSON.parse(results[i].imConfig);
11214
+ } catch (error) {
11215
+ this.imConfig = { url: results[i].imConfig };
11216
+ }
11217
+ } else {
11218
+ this.imConfig = results[i].imConfig;
11219
+ }
11220
+ }
11065
11221
  if (results[i].portalPage || results[i].portalpage) {
11066
11222
  this.doorIndex = results[i].portalPage || results[i].portalpage;
11067
11223
  }
@@ -11097,10 +11253,10 @@ var events = [function (tabs, index, that) {
11097
11253
  }
11098
11254
  },
11099
11255
 
11100
- /**
11101
- * @desc:获取所有应用
11102
- * @author huangbo
11103
- * @date 2024年9月7日
11256
+ /**
11257
+ * @desc:获取所有应用
11258
+ * @author huangbo
11259
+ * @date 2024年9月7日
11104
11260
  **/
11105
11261
  getApplications: function getApplications() {
11106
11262
  var _this = this;
@@ -11148,10 +11304,10 @@ var events = [function (tabs, index, that) {
11148
11304
  });
11149
11305
  },
11150
11306
 
11151
- /**
11152
- * @desc:获取菜单列表
11153
- * @author huangbo
11154
- * @date 2024年9月7日
11307
+ /**
11308
+ * @desc:获取菜单列表
11309
+ * @author huangbo
11310
+ * @date 2024年9月7日
11155
11311
  **/
11156
11312
  getMenus: function getMenus(loading) {
11157
11313
  var _this2 = this;
@@ -11184,10 +11340,10 @@ var events = [function (tabs, index, that) {
11184
11340
  });
11185
11341
  },
11186
11342
 
11187
- /**
11188
- * @desc:处理菜单列表
11189
- * @author huangbo
11190
- * @date 2024年9月7日
11343
+ /**
11344
+ * @desc:处理菜单列表
11345
+ * @author huangbo
11346
+ * @date 2024年9月7日
11191
11347
  **/
11192
11348
  renderMenus: function renderMenus(res) {
11193
11349
  this.menus = res;
@@ -11277,10 +11433,10 @@ var events = [function (tabs, index, that) {
11277
11433
  }
11278
11434
  },
11279
11435
 
11280
- /**
11281
- * @desc:设置页面加载类型
11282
- * @author huangbo
11283
- * @date 2024年9月7日
11436
+ /**
11437
+ * @desc:设置页面加载类型
11438
+ * @author huangbo
11439
+ * @date 2024年9月7日
11284
11440
  **/
11285
11441
  setIframeType: function setIframeType(res) {
11286
11442
  var url = res.url;
@@ -11336,10 +11492,10 @@ var events = [function (tabs, index, that) {
11336
11492
  return res;
11337
11493
  },
11338
11494
 
11339
- /**
11340
- * @desc:获取菜单
11341
- * @author huangbo
11342
- * @date 2024年9月7日
11495
+ /**
11496
+ * @desc:获取菜单
11497
+ * @author huangbo
11498
+ * @date 2024年9月7日
11343
11499
  **/
11344
11500
  getMenu: function getMenu(menus, res, key) {
11345
11501
  if (Array.isArray(menus)) {
@@ -11368,10 +11524,10 @@ var events = [function (tabs, index, that) {
11368
11524
  return false;
11369
11525
  },
11370
11526
 
11371
- /**
11372
- * @desc:获取菜单第一条数据
11373
- * @author huangbo
11374
- * @date 2024年9月7日
11527
+ /**
11528
+ * @desc:获取菜单第一条数据
11529
+ * @author huangbo
11530
+ * @date 2024年9月7日
11375
11531
  **/
11376
11532
  getFirst: function getFirst(obj) {
11377
11533
  if (!obj) {
@@ -11390,10 +11546,10 @@ var events = [function (tabs, index, that) {
11390
11546
  }
11391
11547
  },
11392
11548
 
11393
- /**
11394
- * @desc:遍历设置菜单气泡提醒
11395
- * @author huangbo
11396
- * @date 2024年9月7日
11549
+ /**
11550
+ * @desc:遍历设置菜单气泡提醒
11551
+ * @author huangbo
11552
+ * @date 2024年9月7日
11397
11553
  **/
11398
11554
  setTips: function setTips(obj) {
11399
11555
  var _this3 = this;
@@ -11456,10 +11612,10 @@ var events = [function (tabs, index, that) {
11456
11612
  }
11457
11613
  },
11458
11614
 
11459
- /**
11460
- * @desc:获取气泡提醒
11461
- * @author huangbo
11462
- * @date 2024年9月7日
11615
+ /**
11616
+ * @desc:获取气泡提醒
11617
+ * @author huangbo
11618
+ * @date 2024年9月7日
11463
11619
  **/
11464
11620
  getBadge: function getBadge(res) {
11465
11621
  var num = res.tips || 0;
@@ -11473,10 +11629,10 @@ var events = [function (tabs, index, that) {
11473
11629
  };
11474
11630
  },
11475
11631
 
11476
- /**
11477
- * @desc:开启weosocket
11478
- * @author huangbo
11479
- * @date 2024年9月7日
11632
+ /**
11633
+ * @desc:开启weosocket
11634
+ * @author huangbo
11635
+ * @date 2024年9月7日
11480
11636
  **/
11481
11637
  initWebSocket: function initWebSocket() {
11482
11638
  var _this5 = this;
@@ -11524,10 +11680,10 @@ var events = [function (tabs, index, that) {
11524
11680
  });
11525
11681
  },
11526
11682
 
11527
- /**
11528
- * @desc:显示用户信息
11529
- * @author huangbo
11530
- * @date 2024年9月7日
11683
+ /**
11684
+ * @desc:显示用户信息
11685
+ * @author huangbo
11686
+ * @date 2024年9月7日
11531
11687
  **/
11532
11688
  showUserInfo: function showUserInfo() {
11533
11689
  if (this.showUser === false) {
@@ -11535,19 +11691,19 @@ var events = [function (tabs, index, that) {
11535
11691
  }
11536
11692
  },
11537
11693
 
11538
- /**
11539
- * @desc:删除更多应用菜单点击
11540
- * @author huangbo
11541
- * @date 2024年9月7日
11694
+ /**
11695
+ * @desc:删除更多应用菜单点击
11696
+ * @author huangbo
11697
+ * @date 2024年9月7日
11542
11698
  **/
11543
11699
  handleDelete: function handleDelete(index) {
11544
11700
  this.newApps.splice(index, 1);
11545
11701
  },
11546
11702
 
11547
- /**
11548
- * @desc:储存更多应用菜单点击
11549
- * @author huangbo
11550
- * @date 2024年9月7日
11703
+ /**
11704
+ * @desc:储存更多应用菜单点击
11705
+ * @author huangbo
11706
+ * @date 2024年9月7日
11551
11707
  **/
11552
11708
  handlerClickApps: function handlerClickApps(res) {
11553
11709
  if (res.permission === false) {
@@ -11560,10 +11716,10 @@ var events = [function (tabs, index, that) {
11560
11716
  this.handlerClickApp(res);
11561
11717
  },
11562
11718
 
11563
- /**
11564
- * @desc:侧边应用菜单点击
11565
- * @author huangbo
11566
- * @date 2024年9月7日
11719
+ /**
11720
+ * @desc:侧边应用菜单点击
11721
+ * @author huangbo
11722
+ * @date 2024年9月7日
11567
11723
  **/
11568
11724
  handlerClickApp: function handlerClickApp(res) {
11569
11725
  this.showMsg = false;
@@ -11646,33 +11802,42 @@ var events = [function (tabs, index, that) {
11646
11802
  }
11647
11803
  },
11648
11804
 
11649
- /**
11650
- * @desc:显示Drawer界面
11651
- * @author huangbo
11652
- * @date 2024年9月7日
11805
+ /**
11806
+ * @desc:显示Drawer界面
11807
+ * @author huangbo
11808
+ * @date 2024年9月7日
11653
11809
  **/
11654
- handlerSetDrawer: function handlerSetDrawer(res) {
11655
- this.drawer.visible = !this.drawer.visible;
11656
- this.drawer.mounted = res.mounted;
11657
- this.drawer.url = res.url;
11658
- if (res.mounted === 'wujie') {
11659
- this.drawer.name = res.name || util["a" /* default */].uuid();
11810
+ handlerSetDrawer: function handlerSetDrawer(res, type) {
11811
+ var direction = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'ltr';
11812
+
11813
+ this.drawer.visible = true;
11814
+ this.active = type;
11815
+ this.drawer.direction = direction;
11816
+ if (!this.drawer[type] && res) {
11817
+ var mounted = res.mounted,
11818
+ url = res.url;
11819
+
11820
+ this.drawer[type] = {
11821
+ mounted: mounted,
11822
+ url: url,
11823
+ name: res.name || util["a" /* default */].uuid()
11824
+ };
11660
11825
  }
11661
11826
  },
11662
11827
 
11663
- /**
11664
- * @desc:关闭Drawer界面
11665
- * @author huangbo
11666
- * @date 2024年9月7日
11828
+ /**
11829
+ * @desc:关闭Drawer界面
11830
+ * @author huangbo
11831
+ * @date 2024年9月7日
11667
11832
  **/
11668
11833
  handleCloseDrawer: function handleCloseDrawer() {
11669
11834
  this.drawer = { visible: false };
11670
11835
  },
11671
11836
 
11672
- /**
11673
- * @desc:菜单点击
11674
- * @author huangbo
11675
- * @date 2024年9月7日
11837
+ /**
11838
+ * @desc:菜单点击
11839
+ * @author huangbo
11840
+ * @date 2024年9月7日
11676
11841
  **/
11677
11842
  handlerClickMenu: function handlerClickMenu(res) {
11678
11843
  util["a" /* default */].ajax({
@@ -11711,19 +11876,19 @@ var events = [function (tabs, index, that) {
11711
11876
  },
11712
11877
 
11713
11878
 
11714
- /**
11715
- * @desc:用户详情请求成功
11716
- * @author huangbo
11717
- * @date 2024年9月7日
11879
+ /**
11880
+ * @desc:用户详情请求成功
11881
+ * @author huangbo
11882
+ * @date 2024年9月7日
11718
11883
  **/
11719
11884
  handleSuccess: function handleSuccess(res) {
11720
11885
  this.simpleUserInfo = res.simpleUserInfo;
11721
11886
  },
11722
11887
 
11723
- /**
11724
- * @desc:修改用户配置
11725
- * @author huangbo
11726
- * @date 2024年9月7日
11888
+ /**
11889
+ * @desc:修改用户配置
11890
+ * @author huangbo
11891
+ * @date 2024年9月7日
11727
11892
  **/
11728
11893
  handleChangeConfig: function handleChangeConfig(name, res) {
11729
11894
  if (name == 'userHeadUrl') {
@@ -11739,10 +11904,10 @@ var events = [function (tabs, index, that) {
11739
11904
  }
11740
11905
  },
11741
11906
 
11742
- /**
11743
- * @desc:关闭webSocket
11744
- * @author huangbo
11745
- * @date 2024年9月7日
11907
+ /**
11908
+ * @desc:关闭webSocket
11909
+ * @author huangbo
11910
+ * @date 2024年9月7日
11746
11911
  **/
11747
11912
  handlerClose: function handlerClose() {
11748
11913
  if (this.webSocket) {
@@ -11750,10 +11915,10 @@ var events = [function (tabs, index, that) {
11750
11915
  }
11751
11916
  },
11752
11917
 
11753
- /**
11754
- * @desc:刷新选中iframe页签
11755
- * @author huangbo
11756
- * @date 2024年9月7日
11918
+ /**
11919
+ * @desc:刷新选中iframe页签
11920
+ * @author huangbo
11921
+ * @date 2024年9月7日
11757
11922
  **/
11758
11923
  handleRefresh: function handleRefresh() {
11759
11924
  var i = util["a" /* default */].indexOfObj(this.tabs, this.activeName, 'id');
@@ -11774,10 +11939,10 @@ var events = [function (tabs, index, that) {
11774
11939
  }
11775
11940
  },
11776
11941
 
11777
- /**
11778
- * @desc:删除iframe
11779
- * @author huangbo
11780
- * @date 2024年9月7日
11942
+ /**
11943
+ * @desc:删除iframe
11944
+ * @author huangbo
11945
+ * @date 2024年9月7日
11781
11946
  **/
11782
11947
  handleRemove: function handleRemove(name) {
11783
11948
  var len = this.tabs.length - 1;
@@ -11794,10 +11959,10 @@ var events = [function (tabs, index, that) {
11794
11959
  }
11795
11960
  },
11796
11961
 
11797
- /**
11798
- * @desc:tabs鼠标右键事件
11799
- * @author huangbo
11800
- * @date 2024年9月7日
11962
+ /**
11963
+ * @desc:tabs鼠标右键事件
11964
+ * @author huangbo
11965
+ * @date 2024年9月7日
11801
11966
  **/
11802
11967
  handleContextmenu: function handleContextmenu(tabs, e) {
11803
11968
  var disabled = {};
@@ -11822,10 +11987,10 @@ var events = [function (tabs, index, that) {
11822
11987
  window.addEventListener('click', this.closeTabsEvents);
11823
11988
  },
11824
11989
 
11825
- /**
11826
- * @desc:tabs页签事件
11827
- * @author huangbo
11828
- * @date 2024年9月7日
11990
+ /**
11991
+ * @desc:tabs页签事件
11992
+ * @author huangbo
11993
+ * @date 2024年9月7日
11829
11994
  **/
11830
11995
  handleTabsEvents: function handleTabsEvents(num) {
11831
11996
  if (this.pane !== null) {
@@ -11843,10 +12008,10 @@ var events = [function (tabs, index, that) {
11843
12008
  window.removeEventListener('click', this.closeTabsEvents);
11844
12009
  },
11845
12010
 
11846
- /**
11847
- * @desc:handler工具栏点击事件
11848
- * @author huangbo
11849
- * @date 2024年9月7日
12011
+ /**
12012
+ * @desc:handler工具栏点击事件
12013
+ * @author huangbo
12014
+ * @date 2024年9月7日
11850
12015
  **/
11851
12016
  handleClick: function handleClick(res) {
11852
12017
  var type = res.type,
@@ -11906,14 +12071,16 @@ var events = [function (tabs, index, that) {
11906
12071
  this.showSet = false;
11907
12072
  break;
11908
12073
  case 'search':
11909
- if (res.url) {
11910
- this.handlerSetDrawer(res);
11911
- } else {
11912
- this.showSearch = true;
11913
- }
12074
+ this.showSearch = true;
11914
12075
  this.showMsg = false;
11915
12076
  this.showSet = false;
11916
12077
  break;
12078
+ case 'ai':
12079
+ this.handlerSetDrawer(this._aiConfig, 'ai', 'rtl');
12080
+ break;
12081
+ case 'im':
12082
+ this.handlerSetDrawer(this._imConfig, 'im', 'rtl');
12083
+ break;
11917
12084
  case 'goView':
11918
12085
  util["a" /* default */].win.open(res.path, '_blank');
11919
12086
  break;
@@ -11922,10 +12089,10 @@ var events = [function (tabs, index, that) {
11922
12089
  this.$emit('handler-click', res);
11923
12090
  },
11924
12091
 
11925
- /**
11926
- * @desc:退出登录
11927
- * @author huangbo
11928
- * @date 2024年9月7日
12092
+ /**
12093
+ * @desc:退出登录
12094
+ * @author huangbo
12095
+ * @date 2024年9月7日
11929
12096
  **/
11930
12097
  handleQuit: function handleQuit() {
11931
12098
  var _this6 = this;
@@ -11983,10 +12150,10 @@ var events = [function (tabs, index, that) {
11983
12150
  }).catch(function (e) {});
11984
12151
  },
11985
12152
 
11986
- /**
11987
- * @desc:主题、消息回调
11988
- * @author huangbo
11989
- * @date 2024年9月7日
12153
+ /**
12154
+ * @desc:主题、消息回调
12155
+ * @author huangbo
12156
+ * @date 2024年9月7日
11990
12157
  **/
11991
12158
  handleChange: function handleChange(res) {
11992
12159
  var type = res.type,
@@ -12002,10 +12169,10 @@ var events = [function (tabs, index, that) {
12002
12169
  }
12003
12170
  },
12004
12171
 
12005
- /**
12006
- * @desc:菜单布局样式切换
12007
- * @author huangbo
12008
- * @date 2024年9月7日
12172
+ /**
12173
+ * @desc:菜单布局样式切换
12174
+ * @author huangbo
12175
+ * @date 2024年9月7日
12009
12176
  **/
12010
12177
  handleLayout: function handleLayout(res, active) {
12011
12178
  if (active) {
@@ -12014,10 +12181,10 @@ var events = [function (tabs, index, that) {
12014
12181
  this.$emit('chang-layout', res, active);
12015
12182
  },
12016
12183
 
12017
- /**
12018
- * @desc:消息修改总数
12019
- * @author huangbo
12020
- * @date 2024年9月7日
12184
+ /**
12185
+ * @desc:消息修改总数
12186
+ * @author huangbo
12187
+ * @date 2024年9月7日
12021
12188
  **/
12022
12189
  handleMenuTips: function handleMenuTips(id, num) {
12023
12190
  if (num) {
@@ -12028,10 +12195,10 @@ var events = [function (tabs, index, that) {
12028
12195
  }
12029
12196
  },
12030
12197
 
12031
- /**
12032
- * @desc:处理即时消息
12033
- * @author huangbo
12034
- * @date 2024年9月7日
12198
+ /**
12199
+ * @desc:处理即时消息
12200
+ * @author huangbo
12201
+ * @date 2024年9月7日
12035
12202
  **/
12036
12203
  handleOpened: function handleOpened(res) {
12037
12204
  var _this7 = this;
@@ -12052,7 +12219,7 @@ var events = [function (tabs, index, that) {
12052
12219
  var reload = true;
12053
12220
  if (typeof res === 'string') {
12054
12221
  apps = res.split(',');
12055
- } else if ((typeof res === 'undefined' ? 'undefined' : _typeof(res)) === 'object') {
12222
+ } else if ((typeof res === 'undefined' ? 'undefined' : simplicityvue_type_script_lang_js_typeof(res)) === 'object') {
12056
12223
  apps = res.appCode.split(',');
12057
12224
  param = res.param;
12058
12225
  reload = Object.prototype.hasOwnProperty.call(res, 'reload') ? res.reload : true;
@@ -12152,18 +12319,18 @@ var events = [function (tabs, index, that) {
12152
12319
 
12153
12320
  var simplicity_component = Object(componentNormalizer["a" /* default */])(
12154
12321
  src_simplicityvue_type_script_lang_js_,
12155
- simplicityvue_type_template_id_22cde548_scoped_true_render,
12156
- simplicityvue_type_template_id_22cde548_scoped_true_staticRenderFns,
12322
+ simplicityvue_type_template_id_4aaec640_scoped_true_render,
12323
+ simplicityvue_type_template_id_4aaec640_scoped_true_staticRenderFns,
12157
12324
  false,
12158
12325
  null,
12159
- "22cde548",
12326
+ "4aaec640",
12160
12327
  null
12161
12328
 
12162
12329
  )
12163
12330
 
12164
12331
  /* harmony default export */ var simplicity = (simplicity_component.exports);
12165
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=3e631434&
12166
- var defaultvue_type_template_id_3e631434_render = function () {
12332
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=40cb21f4&
12333
+ var defaultvue_type_template_id_40cb21f4_render = function () {
12167
12334
  var _vm = this
12168
12335
  var _h = _vm.$createElement
12169
12336
  var _c = _vm._self._c || _h
@@ -12230,7 +12397,7 @@ var defaultvue_type_template_id_3e631434_render = function () {
12230
12397
  online: _vm.online,
12231
12398
  application: _vm.application,
12232
12399
  storage: _vm.storage,
12233
- notice: _vm.notice,
12400
+ noticeNum: _vm.notice,
12234
12401
  data: _vm.handleData,
12235
12402
  "max-height": _vm._maxHeight,
12236
12403
  },
@@ -12526,6 +12693,25 @@ var defaultvue_type_template_id_3e631434_render = function () {
12526
12693
  attrs: { data: _vm.sysMsg, winopen: _vm.winopen },
12527
12694
  on: { opened: _vm.handleOpened },
12528
12695
  }),
12696
+ _c(
12697
+ "es-dialog",
12698
+ {
12699
+ staticClass: "es-public-search-dialog",
12700
+ attrs: { visible: _vm.showSearch, size: "lg" },
12701
+ on: {
12702
+ "update:visible": function ($event) {
12703
+ _vm.showSearch = $event
12704
+ },
12705
+ },
12706
+ },
12707
+ [
12708
+ _c("search", {
12709
+ attrs: { menus: _vm.menus, menuIcon: _vm.menuIcon },
12710
+ on: { select: _vm.handleOnSearch },
12711
+ }),
12712
+ ],
12713
+ 1
12714
+ ),
12529
12715
  _c(
12530
12716
  "es-dialog",
12531
12717
  {
@@ -12560,11 +12746,11 @@ var defaultvue_type_template_id_3e631434_render = function () {
12560
12746
  1
12561
12747
  )
12562
12748
  }
12563
- var defaultvue_type_template_id_3e631434_staticRenderFns = []
12564
- defaultvue_type_template_id_3e631434_render._withStripped = true
12749
+ var defaultvue_type_template_id_40cb21f4_staticRenderFns = []
12750
+ defaultvue_type_template_id_40cb21f4_render._withStripped = true
12565
12751
 
12566
12752
 
12567
- // CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=3e631434&
12753
+ // CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=40cb21f4&
12568
12754
 
12569
12755
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=b6520920&
12570
12756
  var userinfovue_type_template_id_b6520920_render = function () {
@@ -14018,6 +14204,18 @@ var defaultvue_type_script_lang_js_extends = Object.assign || function (target)
14018
14204
  //
14019
14205
  //
14020
14206
  //
14207
+ //
14208
+ //
14209
+ //
14210
+ //
14211
+ //
14212
+ //
14213
+ //
14214
+ //
14215
+ //
14216
+ //
14217
+ //
14218
+
14021
14219
 
14022
14220
 
14023
14221
 
@@ -14046,7 +14244,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
14046
14244
  settings: settings,
14047
14245
  message: default_message,
14048
14246
  notice: default_notice,
14049
- online: online
14247
+ online: online,
14248
+ search: search
14050
14249
  },
14051
14250
  props: {
14052
14251
  jobScrollbar: Boolean,
@@ -14056,7 +14255,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
14056
14255
  //菜单展开关闭图标
14057
14256
  icons: Object,
14058
14257
  //菜单前置默认图标
14059
- menuIcon: String,
14258
+ menuIcon: {
14259
+ type: String,
14260
+ default: 'es-icon-application'
14261
+ },
14060
14262
  //子菜单是否显示前置图标
14061
14263
  subIcon: {
14062
14264
  type: Boolean,
@@ -14394,6 +14596,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
14394
14596
  showMsg: false,
14395
14597
  //即时消息
14396
14598
  sysMsg: [],
14599
+ //搜索
14600
+ showSearch: false,
14397
14601
  //定时关闭及时消息对象
14398
14602
  sysMsgOut: null,
14399
14603
  //额外信息数据
@@ -15451,6 +15655,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
15451
15655
  case 'set':
15452
15656
  this.handleSet();
15453
15657
  break;
15658
+ case 'search':
15659
+ this.showSearch = true;
15660
+ this.showMsg = false;
15661
+ break;
15454
15662
  case 'goView':
15455
15663
  util["a" /* default */].win.open(res.path, '_blank');
15456
15664
  break;
@@ -15771,6 +15979,14 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
15771
15979
  var n = parseInt(this.menuTips[id], 10) - 1;
15772
15980
  this.$set(this.menuTips, id, n);
15773
15981
  }
15982
+ },
15983
+
15984
+ //搜索
15985
+ handleOnSearch: function handleOnSearch(res, parent) {
15986
+ this.showSearch = false;
15987
+ if (parent.name === '菜单') {
15988
+ this.jumpMenu(res.appCode);
15989
+ }
15774
15990
  }
15775
15991
  },
15776
15992
  beforeDestroy: function beforeDestroy() {
@@ -15793,8 +16009,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
15793
16009
 
15794
16010
  var default_component = Object(componentNormalizer["a" /* default */])(
15795
16011
  src_defaultvue_type_script_lang_js_,
15796
- defaultvue_type_template_id_3e631434_render,
15797
- defaultvue_type_template_id_3e631434_staticRenderFns,
16012
+ defaultvue_type_template_id_40cb21f4_render,
16013
+ defaultvue_type_template_id_40cb21f4_staticRenderFns,
15798
16014
  false,
15799
16015
  null,
15800
16016
  null,