@jeecg/online 3.4.3 → 3.4.4-RC

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 (76) hide show
  1. package/AuthButtonConfig.js +2 -1
  2. package/AuthButtonTree.js +2 -1
  3. package/AuthDataConfig.js +2 -1
  4. package/AuthDataTree.js +2 -1
  5. package/AuthFieldConfig.js +3 -2
  6. package/AuthFieldTree.js +2 -1
  7. package/AuthManagerDrawer.js +2 -1
  8. package/AuthSetterModal.js +2 -1
  9. package/CgformCopyList.js +5 -1
  10. package/CgformModal.js +19 -2
  11. package/CgreportModal.js +1 -0
  12. package/CheckDictTable.js +2 -2
  13. package/CodeFileListModal.js +2 -1
  14. package/CodeFileViewModal.js +2 -1
  15. package/CodeGeneratorModal.js +2 -1
  16. package/CustomButtonList.js +2 -1
  17. package/DBAttributeTable.js +2 -2
  18. package/DbToOnlineModal.js +2 -1
  19. package/DetailForm.js +4 -2
  20. package/EnhanceJavaModal.js +2 -1
  21. package/EnhanceJsHistory.js +1 -1
  22. package/EnhanceJsModal.js +2 -1
  23. package/EnhanceSqlModal.js +2 -1
  24. package/ExtendConfigModal.js +3 -3
  25. package/FieldExtendJsonModal.js +270 -0
  26. package/FileSelectModal.js +2 -1
  27. package/ForeignKeyTable.js +2 -2
  28. package/FormSchemaFactory.js +150 -10
  29. package/IndexTable.js +2 -2
  30. package/JModalTip.js +2 -2
  31. package/JOnlineSearchSelect.js +115 -0
  32. package/LICENSE +7 -0
  33. package/LeftDepart.js +2 -2
  34. package/LeftRole.js +2 -1
  35. package/LeftUser.js +2 -1
  36. package/LinkTableConfigModal.js +2 -1
  37. package/LinkTableFieldConfigModal.js +2 -1
  38. package/LinkTableListPiece.js +2 -2
  39. package/ModalFormDemo.js +2 -1
  40. package/OnlineAutoList.js +7 -5
  41. package/OnlineAutoModal.js +4 -2
  42. package/OnlineAutoTreeList.js +7 -5
  43. package/OnlineCustomModal.js +5 -3
  44. package/OnlineDetailModal.js +5 -3
  45. package/OnlineForm.js +49 -39
  46. package/OnlineFormDetail.js +4 -2
  47. package/OnlineQueryForm.js +12 -6
  48. package/OnlineSearchFormItem.js +8 -5
  49. package/OnlineSelectCascade.js +228 -0
  50. package/OnlineSubFormDetail.js +4 -2
  51. package/PageAttributeTable.js +70 -28
  52. package/ProcessOnlineForm.js +4 -2
  53. package/QueryTable.js +2 -2
  54. package/README.md +6 -1
  55. package/{OnlineSuperQuery.js → SuperQuery.js} +216 -129
  56. package/SuperQueryValComponent.js +8 -0
  57. package/{OnlineSuperQueryValComponent.vue_vue_type_script_lang.js → SuperQueryValComponent.vue_vue_type_script_lang.js} +15 -3
  58. package/_arrayPush.js +1 -1
  59. package/_baseClone.js +1 -1
  60. package/_flatRest.js +1 -1
  61. package/cgform.data.js +8 -8
  62. package/clipboard.js +565 -0
  63. package/index.js +37 -340
  64. package/index2.js +8 -4
  65. package/index3.js +33 -571
  66. package/isArray.js +1 -1
  67. package/main.index.js +3 -3
  68. package/omit.js +1 -1
  69. package/package.json +1 -1
  70. package/pick.js +1 -1
  71. package/style.css +1 -1
  72. package/toString.js +1 -1
  73. package/useAutoForm.js +22 -5
  74. package/useCgformList.js +97 -5
  75. package/OnlCgReportList.js +0 -34
  76. package/OnlineSuperQueryValComponent.js +0 -9
@@ -1,23 +1,50 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __defProps = Object.defineProperties;
3
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
7
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
8
+ var __spreadValues = (a, b) => {
9
+ for (var prop in b || (b = {}))
10
+ if (__hasOwnProp.call(b, prop))
11
+ __defNormalProp(a, prop, b[prop]);
12
+ if (__getOwnPropSymbols)
13
+ for (var prop of __getOwnPropSymbols(b)) {
14
+ if (__propIsEnum.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ }
17
+ return a;
18
+ };
19
+ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
1
20
  import { ref, reactive, watch, toRaw, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, createBlock, withCtx, createVNode, createTextVNode, Teleport, createCommentVNode, normalizeClass, withDirectives, vShow, renderList, toDisplayString, pushScopeId, popScopeId } from "vue";
2
21
  import { useModalInner, BasicModal, useModal } from "/@/components/Modal";
3
22
  import { randomString } from "/@/utils/common/compUtils";
4
23
  import { useMessage } from "/@/hooks/web/useMessage";
5
- import { Modal, Divider } from "ant-design-vue";
24
+ import { Modal, Divider, Empty } from "ant-design-vue";
6
25
  import { createLocalStorage } from "/@/utils/cache";
7
26
  import { useRoute } from "vue-router";
8
- import { c as FORM_VIEW_TO_QUERY_VIEW, F as FormSchemaFactory } from "./FormSchemaFactory.js";
9
- import { _ as _sfc_main$1 } from "./OnlineSuperQueryValComponent.vue_vue_type_script_lang.js";
27
+ import { F as FormSchemaFactory } from "./FormSchemaFactory.js";
28
+ import { _ as _sfc_main$1 } from "./SuperQueryValComponent.vue_vue_type_script_lang.js";
10
29
  import { MinusCircleOutlined, PlusOutlined, FileTextOutlined, CloseCircleOutlined, AppstoreTwoTone } from "@ant-design/icons-vue";
11
30
  import { _ as _export_sfc } from "./index.js";
12
31
  import "/@/components/Form/src/jeecg/components/JUpload";
13
32
  import "/@/components/Form/src/componentMap";
14
- import "/@/components/Form/src/helper";
15
33
  import "/@/utils/is";
16
34
  import "./_baseSlice.js";
17
35
  import "./toString.js";
18
36
  import "./isArray.js";
19
- import "/@/utils/http/axios";
20
- import "@vueuse/core";
37
+ import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
38
+ const FORM_VIEW_TO_QUERY_VIEW = {
39
+ "password": "text",
40
+ "file": "text",
41
+ "image": "text",
42
+ "textarea": "text",
43
+ "umeditor": "text",
44
+ "markdown": "text",
45
+ "checkbox": "list_multi",
46
+ "radio": "list"
47
+ };
21
48
  const SAVE_CODE_PRE = "JSuperQuerySaved_";
22
49
  function useSuperQuery() {
23
50
  const { createMessage: $message } = useMessage();
@@ -29,7 +56,7 @@ function useSuperQuery() {
29
56
  const [registerModal, { setModalProps }] = useModalInner(() => {
30
57
  setModalProps({ confirmLoading: false });
31
58
  });
32
- const view2QueryViewMap = Object.assign({}, { link_down: "text" }, FORM_VIEW_TO_QUERY_VIEW);
59
+ const view2QueryViewMap = Object.assign({}, { "link_down": "text" }, FORM_VIEW_TO_QUERY_VIEW);
33
60
  function handleSubmit() {
34
61
  console.log("handleSubmit", dynamicRowValues.values);
35
62
  }
@@ -42,6 +69,9 @@ function useSuperQuery() {
42
69
  const fieldProperties = ref({});
43
70
  const fieldTreeData = ref([]);
44
71
  function init(json) {
72
+ console.log("=============");
73
+ console.log("=============", json);
74
+ console.log("=============");
45
75
  let { allFields, treeData } = getAllFields(json);
46
76
  fieldProperties.value = allFields;
47
77
  fieldTreeData.value = treeData;
@@ -100,6 +130,9 @@ function useSuperQuery() {
100
130
  };
101
131
  temp.setFunctionForFieldValue(setFieldValue);
102
132
  let schema = temp.getFormItemSchema();
133
+ if (["empty", "not_empty"].includes(item.rule)) {
134
+ schema.componentProps = __spreadProps(__spreadValues({}, schema.componentProps), { disabled: true });
135
+ }
103
136
  return schema;
104
137
  }
105
138
  const saveTreeData = ref("");
@@ -112,32 +145,25 @@ function useSuperQuery() {
112
145
  });
113
146
  const loading = ref(false);
114
147
  const route = useRoute();
115
- watch(
116
- () => route.fullPath,
117
- (val) => {
118
- console.log("fullpath", val);
119
- initSaveQueryInfoCode();
120
- }
121
- );
148
+ watch(() => route.fullPath, (val) => {
149
+ console.log("fullpath", val);
150
+ initSaveQueryInfoCode();
151
+ });
122
152
  const currentPageSavedArray = ref([]);
123
- watch(
124
- () => currentPageSavedArray.value,
125
- (val) => {
126
- let temp = [];
127
- if (val && val.length > 0) {
128
- val.map((item) => {
129
- let key = randomString(16);
130
- temp.push({
131
- title: item.title,
132
- slots: { icon: "custom" },
133
- value: key
134
- });
153
+ watch(() => currentPageSavedArray.value, (val) => {
154
+ let temp = [];
155
+ if (val && val.length > 0) {
156
+ val.map((item) => {
157
+ let key = randomString(16);
158
+ temp.push({
159
+ title: item.title,
160
+ slots: { icon: "custom" },
161
+ value: key
135
162
  });
136
- }
137
- saveTreeData.value = temp;
138
- },
139
- { immediate: true, deep: true }
140
- );
163
+ });
164
+ }
165
+ saveTreeData.value = temp;
166
+ }, { immediate: true, deep: true });
141
167
  function initSaveQueryInfoCode() {
142
168
  let code = SAVE_CODE_PRE + route.fullPath;
143
169
  saveInfo.saveCode = code;
@@ -178,6 +204,7 @@ function useSuperQuery() {
178
204
  });
179
205
  $ls.set(saveCode, currentPageSavedArray.value);
180
206
  saveInfo.visible = false;
207
+ $message.success("\u4FDD\u5B58\u6210\u529F");
181
208
  }
182
209
  });
183
210
  } else {
@@ -188,6 +215,7 @@ function useSuperQuery() {
188
215
  });
189
216
  $ls.set(saveCode, currentPageSavedArray.value);
190
217
  saveInfo.visible = false;
218
+ $message.success("\u4FDD\u5B58\u6210\u529F");
191
219
  }
192
220
  }
193
221
  function getTitleIndex(title) {
@@ -202,6 +230,7 @@ function useSuperQuery() {
202
230
  return index;
203
231
  }
204
232
  function getQueryInfo(isEmit = false) {
233
+ var _a;
205
234
  let arr = dynamicRowValues.values;
206
235
  if (!arr || arr.length == 0) {
207
236
  return false;
@@ -209,21 +238,27 @@ function useSuperQuery() {
209
238
  let fieldArray = [];
210
239
  let fieldProps = fieldProperties.value;
211
240
  for (let item of arr) {
212
- if (item.field && (item.val || item.val === 0) && item.rule) {
241
+ let allowEmpty = ["empty", "not_empty"].includes(item.rule);
242
+ if (item.field && (allowEmpty || item.val || item.val === 0) && item.rule) {
243
+ let prop = fieldProps[item.field];
244
+ let formatValue = (_a = prop == null ? void 0 : prop.formatValue) != null ? _a : (v) => v;
213
245
  let tempVal = toRaw(item.val);
214
246
  if (tempVal instanceof Array) {
215
- tempVal = tempVal.join(",");
247
+ tempVal = tempVal.map((v) => formatValue(v)).join(",");
248
+ } else {
249
+ tempVal = formatValue(tempVal);
216
250
  }
251
+ let fieldName = getRealFieldName(item);
217
252
  let obj = {
218
- field: item.field,
253
+ field: fieldName,
219
254
  rule: item.rule,
220
255
  val: tempVal
221
256
  };
222
257
  if (isEmit === true) {
223
- let prop = fieldProps[item.field];
224
- if (prop) {
225
- obj["type"] = prop.view;
226
- obj["dbType"] = prop.type;
258
+ let prop2 = fieldProps[item.field];
259
+ if (prop2) {
260
+ obj["type"] = prop2.view;
261
+ obj["dbType"] = prop2.type;
227
262
  }
228
263
  }
229
264
  fieldArray.push(obj);
@@ -234,6 +269,13 @@ function useSuperQuery() {
234
269
  }
235
270
  return fieldArray;
236
271
  }
272
+ function getRealFieldName(item) {
273
+ let fieldName = item.field;
274
+ if (fieldName.indexOf("@") > 0) {
275
+ fieldName = fieldName.replace("@", ",");
276
+ }
277
+ return fieldName;
278
+ }
237
279
  function handleTreeSelect(key, { node }) {
238
280
  console.log(key, node);
239
281
  let title = node.dataRef.title;
@@ -257,33 +299,29 @@ function useSuperQuery() {
257
299
  $ls.set(saveInfo.saveCode, currentPageSavedArray.value);
258
300
  }
259
301
  }
260
- function getAllFields(json) {
261
- const { properties, table, title } = json;
302
+ function getAllFields(properties) {
262
303
  let allFields = {};
263
304
  let order = 1;
264
305
  let treeData = [];
265
- let mainNode = {
266
- title,
267
- value: table,
268
- disabled: true,
269
- children: []
270
- };
271
- treeData.push(mainNode);
306
+ if (properties.properties) {
307
+ properties = properties.properties;
308
+ }
272
309
  Object.keys(properties).map((field) => {
273
310
  let item = properties[field];
274
311
  if (item.view == "table") {
275
- let subProps = item["properties"];
312
+ let subProps = item["properties"] || item["fields"];
276
313
  let subTableOrder = order * 100;
277
314
  let subNode = {
278
315
  title: item.title,
279
316
  value: field,
280
317
  disabled: true,
281
- children: []
318
+ children: [],
319
+ order: subTableOrder
282
320
  };
283
321
  Object.keys(subProps).map((subField) => {
284
322
  let subItem = subProps[subField];
285
323
  subItem["order"] = subTableOrder + subItem["order"];
286
- let subFieldKey = field + "," + subField;
324
+ let subFieldKey = field + "@" + subField;
287
325
  allFields[subFieldKey] = subItem;
288
326
  subNode.children.push({
289
327
  title: subItem.title,
@@ -296,9 +334,9 @@ function useSuperQuery() {
296
334
  treeData.push(subNode);
297
335
  order++;
298
336
  } else {
299
- let fieldKey = table + "@" + field;
337
+ let fieldKey = field;
300
338
  allFields[fieldKey] = item;
301
- mainNode.children.push({
339
+ treeData.push({
302
340
  title: item.title,
303
341
  value: fieldKey,
304
342
  isLeaf: true,
@@ -306,11 +344,11 @@ function useSuperQuery() {
306
344
  });
307
345
  }
308
346
  });
309
- orderField(mainNode);
347
+ orderField(treeData);
310
348
  return { allFields, treeData };
311
349
  }
312
350
  function orderField(data) {
313
- let arr = data.children;
351
+ let arr = data.children || data;
314
352
  arr.sort(function(a, b) {
315
353
  return a.order - b.order;
316
354
  });
@@ -350,7 +388,7 @@ function useSuperQuery() {
350
388
  initDefaultValues
351
389
  };
352
390
  }
353
- var OnlineSuperQuery_vue_vue_type_style_index_0_scoped_true_lang = "";
391
+ var SuperQuery_vue_vue_type_style_index_0_scoped_true_lang = "";
354
392
  const _sfc_main = {
355
393
  name: "OnlineSuperQuery",
356
394
  props: {
@@ -361,6 +399,10 @@ const _sfc_main = {
361
399
  status: {
362
400
  type: Boolean,
363
401
  default: false
402
+ },
403
+ online: {
404
+ type: Boolean,
405
+ default: false
364
406
  }
365
407
  },
366
408
  components: {
@@ -377,22 +419,57 @@ const _sfc_main = {
377
419
  setup(props, { emit }) {
378
420
  const [registerFormModal, formModal] = useModal();
379
421
  const { createMessage: $message } = useMessage();
422
+ const historyCollapsed = ref(true);
380
423
  function handleCancel() {
381
424
  formModal.closeModal();
382
425
  }
383
426
  function handleSubmit() {
384
- console.log("handleSubmit", dynamicRowValues.values);
385
- let dataArray = getQueryInfo(true);
386
- if (dataArray && dataArray.length > 0) {
387
- emit("search", dataArray, matchType.value);
427
+ if (props.online === true) {
428
+ let dataArray = getQueryInfo(true);
429
+ if (dataArray && dataArray.length > 0) {
430
+ emit("search", dataArray, matchType.value);
431
+ } else {
432
+ $message.warning("\u7A7A\u6761\u4EF6\u65E0\u6CD5\u67E5\u8BE2\uFF01");
433
+ }
434
+ } else {
435
+ let dataArray = getQueryInfo(true);
436
+ if (dataArray && dataArray.length > 0) {
437
+ let result = getSuperQueryParams(dataArray);
438
+ emit("search", result);
439
+ } else {
440
+ $message.warning("\u7A7A\u6761\u4EF6\u65E0\u6CD5\u67E5\u8BE2\uFF01");
441
+ }
442
+ }
443
+ }
444
+ function getSuperQueryParams(dataArray) {
445
+ let arr = [];
446
+ for (let item of dataArray) {
447
+ let field = item.field;
448
+ let val = item.val;
449
+ if (val instanceof Array) {
450
+ val = val.join(",");
451
+ }
452
+ arr.push(__spreadProps(__spreadValues({}, item), {
453
+ field,
454
+ val
455
+ }));
456
+ }
457
+ if (arr.length > 0) {
458
+ superQueryFlag.value = true;
388
459
  } else {
389
- $message.warning("\u7A7A\u6761\u4EF6\u65E0\u6CD5\u67E5\u8BE2\uFF01");
460
+ superQueryFlag.value = false;
390
461
  }
462
+ let result = {
463
+ superQueryMatchType: matchType.value,
464
+ superQueryParams: encodeURI(JSON.stringify(arr))
465
+ };
466
+ return result;
391
467
  }
392
468
  function handleReset() {
393
469
  dynamicRowValues.values = [];
394
470
  addOne(false);
395
- emit("search", [], matchType.value);
471
+ let result = getSuperQueryParams([]);
472
+ emit("search", result);
396
473
  }
397
474
  const {
398
475
  formRef,
@@ -416,13 +493,9 @@ const _sfc_main = {
416
493
  initDefaultValues
417
494
  } = useSuperQuery();
418
495
  const superQueryFlag = ref(false);
419
- watch(
420
- () => props.status,
421
- (val) => {
422
- superQueryFlag.value = val;
423
- },
424
- { immediate: true }
425
- );
496
+ watch(() => props.status, (val) => {
497
+ superQueryFlag.value = val;
498
+ }, { immediate: true });
426
499
  function handleOpen() {
427
500
  formModal.openModal();
428
501
  addOne(true);
@@ -436,6 +509,11 @@ const _sfc_main = {
436
509
  function handleChangeField(item) {
437
510
  item["val"] = "";
438
511
  }
512
+ watch(() => props.config, (val) => {
513
+ if (val) {
514
+ init(val);
515
+ }
516
+ }, { immediate: true });
439
517
  return {
440
518
  formRef,
441
519
  registerFormModal,
@@ -443,6 +521,7 @@ const _sfc_main = {
443
521
  handleChangeField,
444
522
  dynamicRowValues,
445
523
  matchType,
524
+ historyCollapsed,
446
525
  registerModal,
447
526
  handleSubmit,
448
527
  handleCancel,
@@ -463,11 +542,12 @@ const _sfc_main = {
463
542
  getPopupContainer,
464
543
  superQueryFlag,
465
544
  handleOpen,
466
- initDefaultValues
545
+ initDefaultValues,
546
+ simpleImage: Empty.PRESENTED_IMAGE_SIMPLE
467
547
  };
468
548
  }
469
549
  };
470
- const _withScopeId = (n) => (pushScopeId("data-v-2878ef8e"), n = n(), popScopeId(), n);
550
+ const _withScopeId = (n) => (pushScopeId("data-v-050f6852"), n = n(), popScopeId(), n);
471
551
  const _hoisted_1 = { class: "j-super-query-button" };
472
552
  const _hoisted_2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", null, "\u5DF2\u6709\u9AD8\u7EA7\u67E5\u8BE2\u6761\u4EF6\u751F\u6548", -1));
473
553
  const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", null, "\u9AD8\u7EA7\u67E5\u8BE2", -1));
@@ -500,6 +580,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
500
580
  const _component_close_circle_outlined = resolveComponent("close-circle-outlined");
501
581
  const _component_file_text_outlined = resolveComponent("file-text-outlined");
502
582
  const _component_a_tree = resolveComponent("a-tree");
583
+ const _component_Icon = resolveComponent("Icon");
503
584
  const _component_a_card = resolveComponent("a-card");
504
585
  const _component_BasicModal = resolveComponent("BasicModal");
505
586
  const _component_a_input = resolveComponent("a-input");
@@ -554,7 +635,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
554
635
  createVNode(_component_BasicModal, {
555
636
  title: "\u9AD8\u7EA7\u67E5\u8BE2\u6784\u9020\u5668",
556
637
  canFullscreen: false,
557
- width: 1055,
638
+ width: 700,
558
639
  onRegister: $setup.registerFormModal,
559
640
  onOk: $setup.handleSubmit
560
641
  }, {
@@ -574,7 +655,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
574
655
  onClick: $setup.handleSave
575
656
  }, {
576
657
  default: withCtx(() => [
577
- createTextVNode("\u4FDD\u5B58\u67E5\u8BE2\u6761\u4EF6")
658
+ createTextVNode("\u4FDD\u5B58\u67E5\u8BE2")
578
659
  ]),
579
660
  _: 1
580
661
  }, 8, ["loading", "onClick"])
@@ -618,7 +699,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
618
699
  default: withCtx(() => [
619
700
  createVNode(_component_a_col, {
620
701
  sm: 24,
621
- md: 18
702
+ md: 24
622
703
  }, {
623
704
  default: withCtx(() => [
624
705
  withDirectives(createVNode(_component_a_row, null, {
@@ -629,7 +710,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
629
710
  }, {
630
711
  default: withCtx(() => [
631
712
  createVNode(_component_a_form_item, {
632
- label: "\u8FC7\u6EE4\u6761\u4EF6\u5339\u914D",
713
+ label: "\u5339\u914D\u6A21\u5F0F",
633
714
  labelCol: { md: 6, xs: 24 },
634
715
  wrapperCol: { md: 18, xs: 24 },
635
716
  style: { "width": "100%" }
@@ -644,13 +725,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
644
725
  default: withCtx(() => [
645
726
  createVNode(_component_a_select_option, { value: "and" }, {
646
727
  default: withCtx(() => [
647
- createTextVNode("AND\uFF08\u6240\u6709\u6761\u4EF6\u90FD\u8981\u6C42\u5339\u914D\uFF09")
728
+ createTextVNode("AND\uFF08\u6240\u6709\u6761\u4EF6\u5339\u914D\uFF09")
648
729
  ]),
649
730
  _: 1
650
731
  }),
651
732
  createVNode(_component_a_select_option, { value: "or" }, {
652
733
  default: withCtx(() => [
653
- createTextVNode("OR\uFF08\u6761\u4EF6\u4E2D\u7684\u4EFB\u610F\u4E00\u4E2A\u5339\u914D\uFF09")
734
+ createTextVNode("OR\uFF08\u4EFB\u610F\u4E00\u4E2A\u5339\u914D\uFF09")
654
735
  ]),
655
736
  _: 1
656
737
  })
@@ -684,7 +765,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
684
765
  default: withCtx(() => [
685
766
  createVNode(_component_a_form_item, {
686
767
  name: ["values", index, "field"],
687
- style: { "width": "180px" }
768
+ style: { "width": "150px" }
688
769
  }, {
689
770
  default: withCtx(() => [
690
771
  createVNode(_component_a_tree_select, {
@@ -705,7 +786,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
705
786
  }, 1032, ["name"]),
706
787
  createVNode(_component_a_form_item, {
707
788
  name: ["values", index, "rule"],
708
- style: { "width": "180px" }
789
+ style: { "width": "100px" }
709
790
  }, {
710
791
  default: withCtx(() => [
711
792
  createVNode(_component_a_select, {
@@ -783,7 +864,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
783
864
  }, 1032, ["name"]),
784
865
  createVNode(_component_a_form_item, {
785
866
  name: ["values", index, "val"],
786
- style: { "width": "280px" }
867
+ style: { "width": "180px" }
787
868
  }, {
788
869
  default: withCtx(() => [
789
870
  createVNode(_component_online_super_query_val_component, {
@@ -792,8 +873,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
792
873
  formModel: item,
793
874
  setFormModel: (key, value) => {
794
875
  $setup.setFormModel(key, value, item);
795
- }
796
- }, null, 8, ["schema", "formModel", "setFormModel"])
876
+ },
877
+ onSubmit: $setup.handleSubmit
878
+ }, null, 8, ["schema", "formModel", "setFormModel", "onSubmit"])
797
879
  ]),
798
880
  _: 2
799
881
  }, 1032, ["name"]),
@@ -830,56 +912,61 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
830
912
  ])
831
913
  ]),
832
914
  _: 1
833
- }),
834
- createVNode(_component_a_col, {
835
- sm: 24,
836
- md: 6
915
+ })
916
+ ]),
917
+ _: 1
918
+ }),
919
+ createVNode(_component_a_card, {
920
+ class: normalizeClass(["j-super-query-history-card", { "collapsed": $setup.historyCollapsed }]),
921
+ bordered: false
922
+ }, {
923
+ title: withCtx(() => [
924
+ _hoisted_7
925
+ ]),
926
+ default: withCtx(() => [
927
+ $setup.saveTreeData.length === 0 ? (openBlock(), createBlock(_component_a_empty, {
928
+ key: 0,
929
+ class: "j-super-query-history-empty",
930
+ image: $setup.simpleImage,
931
+ description: "\u6CA1\u6709\u4FDD\u5B58\u7684\u67E5\u8BE2"
932
+ }, null, 8, ["image"])) : (openBlock(), createBlock(_component_a_tree, {
933
+ key: 1,
934
+ class: "j-super-query-history-tree",
935
+ treeData: $setup.saveTreeData,
936
+ selectedKeys: [],
937
+ "show-icon": true,
938
+ onSelect: $setup.handleTreeSelect
837
939
  }, {
838
- default: withCtx(() => [
839
- createVNode(_component_a_card, {
840
- class: "j-super-query-history-card",
841
- bordered: true
842
- }, {
843
- title: withCtx(() => [
844
- _hoisted_7
845
- ]),
846
- default: withCtx(() => [
847
- $setup.saveTreeData.length === 0 ? (openBlock(), createBlock(_component_a_empty, {
848
- key: 0,
849
- class: "j-super-query-history-empty",
850
- description: "\u6CA1\u6709\u4FDD\u5B58\u4EFB\u4F55\u67E5\u8BE2"
851
- })) : (openBlock(), createBlock(_component_a_tree, {
852
- key: 1,
853
- class: "j-super-query-history-tree",
854
- treeData: $setup.saveTreeData,
855
- selectedKeys: [],
856
- "show-icon": true,
857
- onSelect: $setup.handleTreeSelect
858
- }, {
859
- title: withCtx(({ title }) => [
860
- createElementVNode("div", null, [
861
- createElementVNode("span", { title }, toDisplayString(title.length > 10 ? title.substring(0, 10) + "..." : title), 9, _hoisted_8),
862
- createElementVNode("span", _hoisted_9, [
863
- createVNode(_component_close_circle_outlined, {
864
- onClick: ($event) => $setup.handleRemoveSaveInfo(title)
865
- }, null, 8, ["onClick"])
866
- ])
867
- ])
868
- ]),
869
- custom: withCtx(() => [
870
- createVNode(_component_file_text_outlined)
871
- ]),
872
- _: 1
873
- }, 8, ["treeData", "onSelect"]))
874
- ]),
875
- _: 1
876
- })
940
+ title: withCtx(({ title }) => [
941
+ createElementVNode("div", null, [
942
+ createElementVNode("span", { title }, toDisplayString(title.length > 10 ? title.substring(0, 10) + "..." : title), 9, _hoisted_8),
943
+ createElementVNode("span", _hoisted_9, [
944
+ createVNode(_component_close_circle_outlined, {
945
+ onClick: ($event) => $setup.handleRemoveSaveInfo(title)
946
+ }, null, 8, ["onClick"])
947
+ ])
948
+ ])
949
+ ]),
950
+ custom: withCtx(() => [
951
+ createVNode(_component_file_text_outlined)
877
952
  ]),
878
953
  _: 1
879
- })
954
+ }, 8, ["treeData", "onSelect"])),
955
+ createElementVNode("div", {
956
+ class: "collapse-box",
957
+ onClick: _cache[3] || (_cache[3] = ($event) => $setup.historyCollapsed = !$setup.historyCollapsed)
958
+ }, [
959
+ $setup.historyCollapsed ? (openBlock(), createBlock(_component_Icon, {
960
+ key: 0,
961
+ icon: "ant-design:caret-left"
962
+ })) : (openBlock(), createBlock(_component_Icon, {
963
+ key: 1,
964
+ icon: "ant-design:caret-right"
965
+ }))
966
+ ])
880
967
  ]),
881
968
  _: 1
882
- })
969
+ }, 8, ["class"])
883
970
  ]),
884
971
  _: 1
885
972
  }, 8, ["onRegister", "onOk"])
@@ -887,14 +974,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
887
974
  createVNode(_component_a_modal, {
888
975
  title: "\u8BF7\u8F93\u5165\u4FDD\u5B58\u7684\u540D\u79F0",
889
976
  visible: $setup.saveInfo.visible,
890
- onCancel: _cache[4] || (_cache[4] = ($event) => $setup.saveInfo.visible = false),
977
+ onCancel: _cache[5] || (_cache[5] = ($event) => $setup.saveInfo.visible = false),
891
978
  onOk: $setup.doSaveQueryInfo
892
979
  }, {
893
980
  default: withCtx(() => [
894
981
  createElementVNode("div", _hoisted_10, [
895
982
  createVNode(_component_a_input, {
896
983
  value: $setup.saveInfo.title,
897
- "onUpdate:value": _cache[3] || (_cache[3] = ($event) => $setup.saveInfo.title = $event),
984
+ "onUpdate:value": _cache[4] || (_cache[4] = ($event) => $setup.saveInfo.title = $event),
898
985
  style: { "width": "90%" },
899
986
  placeholder: "\u8BF7\u8F93\u5165\u4FDD\u5B58\u7684\u540D\u79F0"
900
987
  }, null, 8, ["value"])
@@ -904,5 +991,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
904
991
  }, 8, ["visible", "onOk"])
905
992
  ], 64);
906
993
  }
907
- var OnlineSuperQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-2878ef8e"]]);
994
+ var OnlineSuperQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-050f6852"]]);
908
995
  export { OnlineSuperQuery as default };
@@ -0,0 +1,8 @@
1
+ import { _ as _sfc_main } from "./SuperQueryValComponent.vue_vue_type_script_lang.js";
2
+ export { _ as default } from "./SuperQueryValComponent.vue_vue_type_script_lang.js";
3
+ import "vue";
4
+ import "/@/components/Form/src/componentMap";
5
+ import "/@/utils/is";
6
+ import "./_baseSlice.js";
7
+ import "./toString.js";
8
+ import "./isArray.js";