@jeecg/online 3.4.3 → 3.4.4-beta2

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