super-page-designer 2.0.9 → 2.0.17

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 (90) hide show
  1. package/dist/es/components/design/utils/assemblys-config.js +85 -55
  2. package/dist/es/components/design/utils/chart-design-util.js +203 -160
  3. package/dist/es/components/design/utils/form-design-util.d.ts +5 -4
  4. package/dist/es/components/design/utils/form-design-util.js +55 -153
  5. package/dist/es/components/design/utils/interfaces/page-design-types.d.ts +0 -1
  6. package/dist/es/components/design/utils/page-design-util.d.ts +2 -1
  7. package/dist/es/components/design/utils/page-design-util.js +8 -2
  8. package/dist/es/components/design/utils/page-service-util.d.ts +15 -0
  9. package/dist/es/components/design/utils/page-service-util.js +5 -0
  10. package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js +19 -2
  11. package/dist/es/components/design/views/assemblys/button/button/button-attr-event.vue.js +6 -3
  12. package/dist/es/components/design/views/assemblys/chart/column-line/column-line-attr-base.vue.js +6 -3
  13. package/dist/es/components/design/views/assemblys/chart/column-line/column-line-attr-style.vue.js +1 -1
  14. package/dist/es/components/design/views/assemblys/chart/column-line/column-line-design.vue2.js +7 -3
  15. package/dist/es/components/design/views/assemblys/chart/column-line/series/column-line-series-attr-base.vue.js +3 -1
  16. package/dist/es/components/design/views/assemblys/chart/column-line/series/column-line-series-attr-style.vue.js +4 -1
  17. package/dist/es/components/design/views/assemblys/chart/common/common-attr-data.vue.js +68 -3
  18. package/dist/es/components/design/views/assemblys/chart/common/common-attr-groupby.vue.js +94 -16
  19. package/dist/es/components/design/views/assemblys/chart/common/common-attr-serieslist.vue.js +12 -6
  20. package/dist/es/components/design/views/assemblys/chart/common/common-attr-sortby.vue.js +30 -13
  21. package/dist/es/components/design/views/assemblys/chart/common-series/common-attr-dataset-columnline.vue.js +21 -3
  22. package/dist/es/components/design/views/assemblys/chart/common-series/common-attr-dynamic.vue.js +12 -66
  23. package/dist/es/components/design/views/assemblys/chart/gauge/gauge-attr-base.vue.js +20 -12
  24. package/dist/es/components/design/views/assemblys/chart/gauge/gauge-attr-data.vue.js +318 -0
  25. package/dist/es/components/design/views/assemblys/chart/gauge/gauge-attr-data.vue2.js +4 -0
  26. package/dist/es/components/design/views/assemblys/chart/gauge/gauge-attr-style.vue.js +5 -2
  27. package/dist/es/components/design/views/assemblys/chart/gauge/gauge-design.vue2.js +34 -15
  28. package/dist/es/components/design/views/assemblys/chart/gauge/series/gauge-series-attr-base.vue.js +4 -19
  29. package/dist/es/components/design/views/assemblys/chart/gauge/series/gauge-series-attr-style.vue.js +5 -2
  30. package/dist/es/components/design/views/assemblys/chart/pie/pie-attr-base.vue.js +18 -5
  31. package/dist/es/components/design/views/assemblys/chart/pie/pie-attr-style.vue.js +5 -2
  32. package/dist/es/components/design/views/assemblys/chart/pie/pie-design.vue2.js +34 -16
  33. package/dist/es/components/design/views/assemblys/chart/pie/series/pie-series-attr-base.vue.js +4 -22
  34. package/dist/es/components/design/views/assemblys/chart/pie/series/pie-series-attr-style.vue.js +4 -1
  35. package/dist/es/components/design/views/assemblys/chart/radar/radar-attr-base.vue.js +23 -9
  36. package/dist/es/components/design/views/assemblys/chart/radar/radar-attr-data.vue.js +318 -0
  37. package/dist/es/components/design/views/assemblys/chart/radar/radar-attr-data.vue2.js +4 -0
  38. package/dist/es/components/design/views/assemblys/chart/radar/radar-attr-style.vue.js +25 -12
  39. package/dist/es/components/design/views/assemblys/chart/radar/radar-design.vue2.js +37 -13
  40. package/dist/es/components/design/views/assemblys/chart/radar/series/series-attr-base.vue.js +4 -17
  41. package/dist/es/components/design/views/assemblys/chart/radar/series/series-attr-dataset.vue.js +82 -256
  42. package/dist/es/components/design/views/assemblys/chart/radar/series/series-attr-style.vue.js +12 -17
  43. package/dist/es/components/design/views/assemblys/chart/scatter/scatter-attr-base.vue.js +23 -13
  44. package/dist/es/components/design/views/assemblys/chart/scatter/scatter-attr-data.vue.js +205 -0
  45. package/dist/es/components/design/views/assemblys/chart/scatter/scatter-attr-data.vue2.js +4 -0
  46. package/dist/es/components/design/views/assemblys/chart/scatter/scatter-attr-style.vue.js +5 -7
  47. package/dist/es/components/design/views/assemblys/chart/scatter/scatter-design.vue2.js +35 -12
  48. package/dist/es/components/design/views/assemblys/chart/scatter/series/scatter-series-attr-base.vue.js +6 -77
  49. package/dist/es/components/design/views/assemblys/chart/scatter/series/scatter-series-attr-style.vue.js +4 -1
  50. package/dist/es/components/design/views/assemblys/chart/scatter/series/scatter-series-data.vue.js +191 -0
  51. package/dist/es/components/design/views/assemblys/chart/scatter/series/scatter-series-data.vue2.js +4 -0
  52. package/dist/es/components/design/views/assemblys/container/tabs/tabs-attr-event.vue.js +30 -0
  53. package/dist/es/components/design/views/assemblys/container/tabs/tabs-attr-event.vue2.js +4 -0
  54. package/dist/es/components/design/views/assemblys/container/tabs/tabs-attr.vue2.js +2 -1
  55. package/dist/es/components/design/views/assemblys/form/common/parameter-table.vue.js +186 -0
  56. package/dist/es/components/design/views/assemblys/form/common/parameter-table.vue2.js +4 -0
  57. package/dist/es/components/design/views/assemblys/form/common/suffixmodule.vue.js +28 -4
  58. package/dist/es/components/design/views/assemblys/form/custom/custom-attr-base.vue.js +11 -169
  59. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue.js +1 -1
  60. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue2.js +3 -12
  61. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr-base.vue.js +33 -10
  62. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue2.js +10 -1
  63. package/dist/es/components/design/views/assemblys/form/link/link-attr-base.vue.js +15 -3
  64. package/dist/es/components/design/views/assemblys/object-design.vue.js +52 -77
  65. package/dist/es/components/design/views/assemblys/page/component/setting-form-rule-base-input.vue.d.ts +2 -2
  66. package/dist/es/components/design/views/design/page-design.vue.d.ts +13 -1
  67. package/dist/es/components/design/views/design/page-design.vue.js +218 -100
  68. package/dist/es/components/design/views/design/page-event/page-event-content.vue.js +1 -1
  69. package/dist/es/components/design/views/design/page-event/page-event-content.vue2.js +19 -9
  70. package/dist/es/components/design/views/design/view/page-switch.vue.d.ts +18 -0
  71. package/dist/es/components/design/views/design/view/page-switch.vue.js +7 -0
  72. package/dist/es/components/design/views/design/view/page-switch.vue2.js +185 -0
  73. package/dist/es/components/design/views/design/view/page-switch.vue3.js +1 -0
  74. package/dist/es/components/design/views/design/view/view-design-display.vue.js +1 -1
  75. package/dist/es/components/design/views/design/view/view-design-preview.vue.js +2 -2
  76. package/dist/es/components/design/views/design/view/view-design.vue.js +7 -9
  77. package/dist/es/style.css +350 -133
  78. package/package.json +7 -6
  79. package/dist/es/components/design/views/assemblys/chart/common/common-attr-drill.vue.js +0 -108
  80. package/dist/es/components/design/views/assemblys/chart/common/common-attr-drill.vue2.js +0 -4
  81. package/dist/es/components/design/views/assemblys/chart/common-series/common-attr-dataset.vue.js +0 -166
  82. package/dist/es/components/design/views/assemblys/chart/common-series/common-attr-dataset.vue2.js +0 -4
  83. package/dist/es/components/design/views/assemblys/chart/gauge/series/gauge-series-attr-dataset.vue.js +0 -153
  84. package/dist/es/components/design/views/assemblys/chart/gauge/series/gauge-series-attr-dataset.vue2.js +0 -4
  85. package/dist/es/components/design/views/assemblys/chart/radar/series/attrs/attr-testdatas.vue.js +0 -58
  86. package/dist/es/components/design/views/assemblys/chart/radar/series/attrs/attr-testdatas.vue2.js +0 -4
  87. package/dist/es/components/design/views/assemblys/form/common/linkpage-params-in.vue.js +0 -154
  88. package/dist/es/components/design/views/assemblys/form/common/linkpage-params-in.vue2.js +0 -4
  89. package/dist/es/components/design/views/assemblys/form/common/title.vue.js +0 -45
  90. package/dist/es/components/design/views/assemblys/form/common/title.vue2.js +0 -4
@@ -313,60 +313,45 @@ function columnCustomTittleClass(configure) {
313
313
  }
314
314
  return tempTittleClass;
315
315
  }
316
- function watchRequiredValidate(pageDesign, configure, isRequired, fieldInfo) {
317
- if (isRequired) {
318
- if (!pageDesign.rules) {
319
- pageDesign.rules = {};
320
- }
321
- const prop = configure.props.base.prop;
322
- if (prop) {
323
- const propName = getFormPropName(prop);
324
- if (!pageDesign.rules[propName]) {
325
- pageDesign.rules[propName] = [];
316
+ function watchRequiredValidate(configure, fieldInfo) {
317
+ const prop = configure.props.base.prop;
318
+ if (prop) {
319
+ const rule = {
320
+ required: true,
321
+ message: `${configure.props.base.title}必填`,
322
+ label: configure.props.base.title
323
+ };
324
+ packageRuleByDataType(fieldInfo, rule);
325
+ configure.props.rules.push(rule);
326
+ }
327
+ }
328
+ function watchValidate(configure, verification, fieldInfo) {
329
+ configure.props.rules = [];
330
+ const prop = configure.props.base.prop;
331
+ if (prop) {
332
+ if (verification) {
333
+ if (verification.required) {
334
+ watchRequiredValidate(configure, fieldInfo);
326
335
  }
327
- const validations = pageDesign.rules[propName];
328
- const ruleIndex = validations.findIndex((item) => item.required);
329
- if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
330
- validations.splice(ruleIndex, 1);
336
+ if (verification.type) {
337
+ watchValidateType(configure, verification.type, fieldInfo);
331
338
  }
332
- const rule = {
333
- required: true,
334
- message: `${configure.props.base.title}必填`,
335
- label: configure.props.base.title
336
- };
337
- packageRuleByDataType(fieldInfo, rule);
338
- pageDesign.rules[propName].push(rule);
339
- }
340
- } else {
341
- const prop = configure.props.base.prop;
342
- if (prop) {
343
- const propName = getFormPropName(prop);
344
- if (pageDesign.rules && pageDesign.rules[propName]) {
345
- const validations = pageDesign.rules[propName];
346
- const ruleIndex = validations.findIndex((item) => item.required);
347
- if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
348
- validations.splice(ruleIndex, 1);
349
- }
339
+ if (verification.verifyRegex && verification.regex) {
340
+ watchPatternValidate(configure, verification.regex, fieldInfo);
341
+ }
342
+ if (verification.verifyMaxLength && verification.maxLength) {
343
+ watchMaxOrMinValidate(configure, "max", verification.maxLength, fieldInfo);
344
+ }
345
+ if (verification.verifyMinLength && verification.minLength) {
346
+ watchMaxOrMinValidate(configure, "min", verification.minLength, fieldInfo);
350
347
  }
351
348
  }
352
349
  }
353
350
  }
354
- function watchValidateType(pageDesign, configure, type, fieldInfo) {
351
+ function watchValidateType(configure, type, fieldInfo) {
355
352
  if (type) {
356
- if (!pageDesign.rules) {
357
- pageDesign.rules = {};
358
- }
359
353
  const prop = configure.props.base.prop;
360
354
  if (prop) {
361
- const propName = getFormPropName(prop);
362
- if (!pageDesign.rules[propName]) {
363
- pageDesign.rules[propName] = [];
364
- }
365
- const validations = pageDesign.rules[propName];
366
- const ruleIndex = validations.findIndex((item) => item.type === type);
367
- if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
368
- validations.splice(ruleIndex, 1);
369
- }
370
355
  const rule = {
371
356
  type,
372
357
  message: `${configure.props.base.title}格式不匹配`,
@@ -375,121 +360,38 @@ function watchValidateType(pageDesign, configure, type, fieldInfo) {
375
360
  // 删除格式时需要用该属性
376
361
  };
377
362
  packageStringRuleByDataType(fieldInfo, type, rule);
378
- pageDesign.rules[propName].push(rule);
379
- }
380
- } else {
381
- const prop = configure.props.base.prop;
382
- if (prop) {
383
- const propName = getFormPropName(prop);
384
- if (pageDesign.rules && pageDesign.rules[propName]) {
385
- const validations = pageDesign.rules[propName];
386
- const ruleIndex = validations.findIndex((item) => item.myType);
387
- if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
388
- validations.splice(ruleIndex, 1);
389
- }
390
- }
391
- }
392
- }
393
- }
394
- function watchPatternValidate(pageDesign, configure, pattern, fieldInfo) {
395
- if (configure.props.verification && configure.props.verification.verifyRegex && pattern) {
396
- if (!pageDesign.rules) {
397
- pageDesign.rules = {};
398
- }
399
- const prop = configure.props.base.prop;
400
- if (prop) {
401
- const propName = getFormPropName(prop);
402
- if (!pageDesign.rules[propName]) {
403
- pageDesign.rules[propName] = [];
404
- }
405
- const validations = pageDesign.rules[propName];
406
- const ruleIndex = validations.findIndex((item) => item.patternType);
407
- if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
408
- validations.splice(ruleIndex, 1);
409
- }
410
- const rule = {
411
- pattern,
412
- message: `${configure.props.base.title}格式不匹配`,
413
- label: configure.props.base.title,
414
- patternType: "pattern"
415
- // 删除格式时需要用该属性
416
- };
417
- packageRuleByDataType(fieldInfo, rule);
418
- pageDesign.rules[propName].push(rule);
419
- }
420
- } else {
421
- const prop = configure.props.base.prop;
422
- if (prop) {
423
- const propName = getFormPropName(prop);
424
- if (pageDesign.rules && pageDesign.rules[propName]) {
425
- const validations = pageDesign.rules[propName];
426
- const ruleIndex = validations.findIndex((item) => item.patternType);
427
- if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
428
- validations.splice(ruleIndex, 1);
429
- }
430
- }
363
+ configure.props.rules.push(rule);
431
364
  }
432
365
  }
433
366
  }
434
- function watchMaxOrMinValidate(pageDesign, configure, type, isEnable, value, fieldInfo) {
435
- if (isEnable && type && value !== void 0 && value !== null) {
436
- if (!pageDesign.rules) {
437
- pageDesign.rules = {};
438
- }
439
- const prop = configure.props.base.prop;
440
- if (prop) {
441
- const propName = getFormPropName(prop);
442
- if (!pageDesign.rules[propName]) {
443
- pageDesign.rules[propName] = [];
444
- }
445
- const validations = pageDesign.rules[propName];
446
- const ruleIndex = validations.findIndex((item) => item[type]);
447
- if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
448
- validations.splice(ruleIndex, 1);
449
- }
450
- const rule = {
451
- label: configure.props.base.title
452
- };
453
- rule[type] = value;
454
- if (type === "max") {
455
- rule["message"] = `${configure.props.base.title}最多只能输入${value}字符`;
456
- } else {
457
- rule["message"] = `${configure.props.base.title}至少输入${value}字符`;
458
- }
459
- packageRuleByDataType(fieldInfo, rule);
460
- pageDesign.rules[propName].push(rule);
461
- }
462
- } else {
463
- const prop = configure.props.base.prop;
464
- if (prop) {
465
- const propName = getFormPropName(prop);
466
- if (pageDesign.rules && pageDesign.rules[propName]) {
467
- const validations = pageDesign.rules[propName];
468
- const ruleIndex = validations.findIndex((item) => item[type]);
469
- if (ruleIndex !== void 0 && ruleIndex !== null && ruleIndex >= 0) {
470
- validations.splice(ruleIndex, 1);
471
- }
472
- }
473
- }
367
+ function watchPatternValidate(configure, pattern, fieldInfo) {
368
+ const prop = configure.props.base.prop;
369
+ if (prop) {
370
+ const rule = {
371
+ pattern,
372
+ message: `${configure.props.base.title}格式不匹配`,
373
+ label: configure.props.base.title,
374
+ patternType: "pattern"
375
+ // 删除格式时需要用该属性
376
+ };
377
+ packageRuleByDataType(fieldInfo, rule);
378
+ configure.props.rules.push(rule);
474
379
  }
475
380
  }
476
- function deleteRule(pageDesign, configure) {
477
- if (!configure.props || !configure.props.base) {
478
- return;
479
- }
381
+ function watchMaxOrMinValidate(configure, type, value, fieldInfo) {
480
382
  const prop = configure.props.base.prop;
481
383
  if (prop) {
482
- const propName = getFormPropName(prop);
483
- if (pageDesign.rules && pageDesign.rules[propName]) {
484
- delete pageDesign.rules[propName];
384
+ const rule = {
385
+ label: configure.props.base.title
386
+ };
387
+ rule[type] = value;
388
+ if (type === "max") {
389
+ rule["message"] = `${configure.props.base.title}最多只能输入${value}字符`;
390
+ } else {
391
+ rule["message"] = `${configure.props.base.title}至少输入${value}字符`;
485
392
  }
486
- }
487
- }
488
- function getFormPropName(prop) {
489
- if (prop && prop.indexOf("${") >= 0) {
490
- return prop.substring(prop.indexOf(".") + 1, prop.lastIndexOf("}"));
491
- } else {
492
- return prop;
393
+ packageRuleByDataType(fieldInfo, rule);
394
+ configure.props.rules.push(rule);
493
395
  }
494
396
  }
495
397
  function packageRuleByDataType(fieldInfo, rule) {
@@ -540,10 +442,10 @@ export {
540
442
  caculateDetailComponentStyle,
541
443
  columnCustomTittleClass,
542
444
  columnTittleStyle,
543
- deleteRule,
544
445
  removComponentOptionConfigs,
545
446
  watchMaxOrMinValidate,
546
447
  watchPatternValidate,
547
448
  watchRequiredValidate,
449
+ watchValidate,
548
450
  watchValidateType
549
451
  };
@@ -69,7 +69,6 @@ export interface PageDesign extends Component {
69
69
  label: string;
70
70
  notIdInitializationList?: Array<any>;
71
71
  subTablePageInfo?: object;
72
- customValidatorUuids?: Array<string>;
73
72
  customEvents?: Array<any>;
74
73
  tableRuntimes?: {
75
74
  [uuid: string]: object;
@@ -1,3 +1,4 @@
1
1
  export declare function queryWorkflowsRequest(tableName: any): any;
2
2
  export declare function createWorkflowRequest(tableName: any, pageName: any): any;
3
- export declare function getHighestVersionDefinition(wfDefinitionCode: any, defVersion: any): any;
3
+ export declare function getHighestVersionDefinition(wfDefinitionCode: any, defVersion: any, publishVersion: any): any;
4
+ export declare function getPublishVersionsByCode(systemCode: any): any;
@@ -23,10 +23,10 @@ function createWorkflowRequest(tableName, pageName) {
23
23
  params
24
24
  );
25
25
  }
26
- function getHighestVersionDefinition(wfDefinitionCode, defVersion) {
26
+ function getHighestVersionDefinition(wfDefinitionCode, defVersion, publishVersion) {
27
27
  const params = {
28
28
  wfDefinitionCode,
29
- publishVersion: getPublishVersion()
29
+ publishVersion
30
30
  };
31
31
  if (defVersion !== void 0) {
32
32
  params["defVersion"] = defVersion;
@@ -36,8 +36,14 @@ function getHighestVersionDefinition(wfDefinitionCode, defVersion) {
36
36
  params
37
37
  );
38
38
  }
39
+ function getPublishVersionsByCode(systemCode) {
40
+ return http.get(
41
+ window["$vueApp"].config.globalProperties.baseAPI + `/mms/systems/getPublishVersionsByCode/${systemCode}`
42
+ );
43
+ }
39
44
  export {
40
45
  createWorkflowRequest,
41
46
  getHighestVersionDefinition,
47
+ getPublishVersionsByCode,
42
48
  queryWorkflowsRequest
43
49
  };
@@ -0,0 +1,15 @@
1
+ /**
2
+ * 查询服务信息
3
+ * @param systemCode
4
+ * @param systemVersion
5
+ * @param tableName
6
+ * @returns
7
+ */
8
+ export declare function queryServiceInfo(serivceId: number): Promise<any>;
9
+ /**
10
+ * 查询服务的返回字段信息
11
+ * @param serviceInfo
12
+ * @returns
13
+ */
14
+ export declare function queryServiceReturnFields(serivceId: number): Promise<any>;
15
+ export declare function fetchPageDesignData(pageId: number): any;
@@ -49,7 +49,12 @@ function convertReturnValuesToFields(parentFieldName, returnValues, fieldInfos)
49
49
  }
50
50
  }
51
51
  }
52
+ function fetchPageDesignData(pageId) {
53
+ let url = window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/" + pageId;
54
+ return http.get(url);
55
+ }
52
56
  export {
57
+ fetchPageDesignData,
53
58
  queryServiceInfo,
54
59
  queryServiceReturnFields
55
60
  };
@@ -5,9 +5,11 @@ import "../../form/common/dimension-input.vue.js";
5
5
  import _sfc_main$2 from "../../common/common-icon-bind.vue.js";
6
6
  import http from "agilebuilder-ui/src/utils/request";
7
7
  import _sfc_main$1 from "../../common/common-function-code.vue.js";
8
+ import _sfc_main$3 from "../../form/common/suffixmodule.vue.js";
8
9
  const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
9
10
  const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
10
11
  const _hoisted_3 = { style: { "padding": "8px 0px 0px 0px" } };
12
+ const _hoisted_4 = { style: { "padding": "8px 0px 0px 0px" } };
11
13
  const _sfc_main = /* @__PURE__ */ defineComponent({
12
14
  __name: "button-attr-base",
13
15
  props: {
@@ -22,7 +24,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
22
24
  },
23
25
  setup(__props) {
24
26
  const props = __props;
25
- const openCollapseItems = ref(["base", "appearance", "otherSettings"]);
27
+ const openCollapseItems = ref(["base", "appearance", "otherSettings", "linkPage"]);
26
28
  const templateList = ref({});
27
29
  const tableList = ref([]);
28
30
  function getTableList() {
@@ -493,13 +495,28 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
493
495
  ]),
494
496
  _: 1
495
497
  }),
498
+ createVNode(_component_el_collapse_item, {
499
+ title: "跳转配置",
500
+ name: "linkPage",
501
+ class: "amb-design-attr-group-header"
502
+ }, {
503
+ default: withCtx(() => [
504
+ createElementVNode("div", _hoisted_3, [
505
+ createVNode(_sfc_main$3, {
506
+ configure: __props.configure,
507
+ pageDesign: __props.pageDesign
508
+ }, null, 8, ["configure", "pageDesign"])
509
+ ])
510
+ ]),
511
+ _: 1
512
+ }),
496
513
  createVNode(_component_el_collapse_item, {
497
514
  title: "其他设置",
498
515
  name: "otherSettings",
499
516
  class: "amb-design-attr-group-header"
500
517
  }, {
501
518
  default: withCtx(() => [
502
- createElementVNode("div", _hoisted_3, [
519
+ createElementVNode("div", _hoisted_4, [
503
520
  createVNode(_component_el_form_item, {
504
521
  label: "回填赋值",
505
522
  class: "amb-design-attr-item"
@@ -1,4 +1,4 @@
1
- import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createVNode, unref } from "vue";
1
+ import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode } from "vue";
2
2
  import AttrEvent from "../../form/common/attr-event.vue.js";
3
3
  const _sfc_main = /* @__PURE__ */ defineComponent({
4
4
  __name: "button-attr-event",
@@ -7,7 +7,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
7
7
  },
8
8
  setup(__props) {
9
9
  const props = __props;
10
- const events = props.configure.events;
10
+ const events = ref([]);
11
+ watch(() => props.configure.events, (newVal) => {
12
+ events.value = props.configure.events;
13
+ }, { immediate: true });
11
14
  return (_ctx, _cache) => {
12
15
  const _component_el_form = resolveComponent("el-form");
13
16
  return openBlock(), createBlock(_component_el_form, {
@@ -17,7 +20,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
17
20
  default: withCtx(() => [
18
21
  createVNode(AttrEvent, {
19
22
  configure: __props.configure,
20
- events: unref(events)
23
+ events: events.value
21
24
  }, null, 8, ["configure", "events"])
22
25
  ]),
23
26
  _: 1
@@ -3,7 +3,7 @@ import _sfc_main$1 from "../common/common-attr-base.vue.js";
3
3
  import _sfc_main$2 from "../common/common-attr-serieslist.vue.js";
4
4
  import _sfc_main$4 from "../common/common-attr-groupby.vue.js";
5
5
  import _sfc_main$5 from "../common/common-attr-sortby.vue.js";
6
- import _sfc_main$6 from "../common/common-attr-drill.vue.js";
6
+ import _sfc_main$6 from "../../form/common/data-linkage.vue.js";
7
7
  import _sfc_main$7 from "../common/common-attr-assistant.vue.js";
8
8
  import _sfc_main$8 from "../../common/common-attr-size.vue.js";
9
9
  import _sfc_main$3 from "../common/common-attr-data.vue.js";
@@ -24,7 +24,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
24
24
  "attrSize",
25
25
  "propsSort",
26
26
  "propsDrill",
27
- "propsAssistant"
27
+ "propsAssistant",
28
+ "linkage"
28
29
  ]);
29
30
  return (_ctx, _cache) => {
30
31
  const _component_el_collapse = resolveComponent("el-collapse");
@@ -51,7 +52,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
51
52
  createVNode(_sfc_main$3, { configure: __props.configure }, null, 8, ["configure"]),
52
53
  createVNode(_sfc_main$4, { configure: __props.configure }, null, 8, ["configure"]),
53
54
  createVNode(_sfc_main$5, { configure: __props.configure }, null, 8, ["configure"]),
54
- createVNode(_sfc_main$6, { configure: __props.configure }, null, 8, ["configure"]),
55
+ createVNode(_sfc_main$6, {
56
+ configureProps: __props.configure.props
57
+ }, null, 8, ["configureProps"]),
55
58
  createVNode(_sfc_main$7, { configure: __props.configure }, null, 8, ["configure"]),
56
59
  createVNode(_sfc_main$8, {
57
60
  size: __props.configure.props.size
@@ -29,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
29
29
  if (props.configure.style.yaxisRight == void 0) {
30
30
  props.configure.style.yaxisRight = {};
31
31
  }
32
- const openCollapseItems = ref(["titleFont"]);
32
+ const openCollapseItems = ref(["titleFont", "subtitleFont", "styleLegend", "styleGrid"]);
33
33
  return (_ctx, _cache) => {
34
34
  const _component_el_input_number = resolveComponent("el-input-number");
35
35
  const _component_el_text = resolveComponent("el-text");
@@ -1,7 +1,7 @@
1
1
  import { defineComponent, ref, watch, onUnmounted, openBlock, createElementBlock, normalizeStyle, normalizeClass, withModifiers, withDirectives, createVNode, vShow, unref, createElementVNode, Fragment, renderList, toDisplayString } from "vue";
2
2
  import { getUuidv4 } from "../../../../utils/common-util.js";
3
3
  import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
4
- import { initComponentDataConfig, removComponentDataConfig, generateChartHeader, generateChartOption } from "../../../../utils/chart-design-util.js";
4
+ import { removComponentDataConfig, generateChartHeader, generateChartOption, initComponentDataConfig } from "../../../../utils/chart-design-util.js";
5
5
  import { getCustomTheme } from "super-page-runtime";
6
6
  import _sfc_main$2 from "./series/column-line-series-attr.vue.js";
7
7
  import _sfc_main$1 from "../common/common-chart-header.vue.js";
@@ -69,15 +69,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
69
69
  },
70
70
  { immediate: true }
71
71
  );
72
+ function updateDataConfig() {
73
+ const dataConfig = initComponentDataConfig(props.configure, headerInfo.value);
74
+ props.configure.runtime.dataConfig = dataConfig;
75
+ }
72
76
  watch(props.configure.props, () => {
73
77
  customChartOption();
74
- initComponentDataConfig(props.configure, headerInfo.value);
78
+ updateDataConfig();
75
79
  });
76
80
  watch(props.configure.items, () => {
77
81
  customChartOption();
78
82
  });
79
83
  setTimeout(() => {
80
- initComponentDataConfig(props.configure, headerInfo.value);
84
+ updateDataConfig();
81
85
  }, 100);
82
86
  onUnmounted(() => {
83
87
  removComponentDataConfig(props.configure);
@@ -126,7 +126,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
126
126
  _: 1
127
127
  }),
128
128
  createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"]),
129
- createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]),
129
+ withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [
130
+ [vShow, __props.configure.props.yaxisSource != "fix"]
131
+ ]),
130
132
  createVNode(_sfc_main$3, { configure: __props.configure }, null, 8, ["configure"])
131
133
  ]),
132
134
  _: 1
@@ -17,7 +17,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
17
17
  return (_ctx, _cache) => {
18
18
  const _component_el_collapse = resolveComponent("el-collapse");
19
19
  const _component_el_form = resolveComponent("el-form");
20
- return openBlock(), createBlock(_component_el_form, { "label-width": "80px" }, {
20
+ return openBlock(), createBlock(_component_el_form, {
21
+ "label-width": "80px",
22
+ size: "small"
23
+ }, {
21
24
  default: withCtx(() => [
22
25
  createVNode(_component_el_collapse, {
23
26
  modelValue: openCollapseItems.value,
@@ -1,10 +1,12 @@
1
- import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createElementBlock, Fragment, renderList, toDisplayString, createTextVNode } from "vue";
1
+ import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createElementBlock, Fragment, renderList, toDisplayString, createTextVNode, withDirectives, vShow } from "vue";
2
2
  import _sfc_main$1 from "../../common/page-permission-select.vue.js";
3
3
  import { usePageContextStore } from "../../../../../../stores/page-store.js";
4
4
  import { queryServiceReturnFields } from "../../../../utils/page-service-util.js";
5
5
  const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
6
6
  const _hoisted_2 = { style: { "float": "left" } };
7
7
  const _hoisted_3 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
8
+ const _hoisted_4 = { style: { "float": "left" } };
9
+ const _hoisted_5 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
8
10
  const _sfc_main = /* @__PURE__ */ defineComponent({
9
11
  __name: "common-attr-data",
10
12
  props: {
@@ -15,6 +17,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
15
17
  defaultType: {
16
18
  type: String,
17
19
  default: ""
20
+ },
21
+ chartType: {
22
+ type: String,
23
+ default: ""
18
24
  }
19
25
  },
20
26
  setup(__props) {
@@ -24,7 +30,28 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
24
30
  const serviceFields = ref([]);
25
31
  const showFields = computed(() => {
26
32
  return serviceFields.value.filter((item) => {
27
- return true;
33
+ return item.type == "array" || item.type == "any" || !item.type;
34
+ });
35
+ });
36
+ const yaxisFields = computed(() => {
37
+ return serviceFields.value.filter((item) => {
38
+ if (item.type == "number" || item.type == "any" || !item.type) {
39
+ const prevField = props.configure.serviceDataField;
40
+ if (!prevField || item.value.startsWith(prevField + ".")) {
41
+ let numValue = item.value;
42
+ let numLabel = item.label;
43
+ if (prevField) {
44
+ numValue = numValue.substring(prevField.length + 1);
45
+ if (numLabel) {
46
+ numLabel = numLabel.replace(prevField + ".", "");
47
+ }
48
+ }
49
+ item.numValue = numValue;
50
+ item.numLabel = numLabel;
51
+ return true;
52
+ }
53
+ }
54
+ return false;
28
55
  });
29
56
  });
30
57
  if (!props.configure.props.dataOrigin) {
@@ -147,7 +174,45 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
147
174
  })
148
175
  ]),
149
176
  _: 1
150
- })
177
+ }),
178
+ withDirectives(createVNode(_component_el_form_item, {
179
+ label: "数据字段",
180
+ style: { "margin-top": "15px", "margin-bottom": "-15px" }
181
+ }, {
182
+ default: withCtx(() => [
183
+ createVNode(_component_el_select, {
184
+ size: "small",
185
+ modelValue: __props.configure.props.yaxisField,
186
+ "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.yaxisField = $event),
187
+ title: __props.configure.props.yaxisField,
188
+ style: { "width": "160px" },
189
+ filterable: "",
190
+ "allow-create": "",
191
+ clearable: "",
192
+ placeholder: "请选择"
193
+ }, {
194
+ default: withCtx(() => [
195
+ (openBlock(true), createElementBlock(Fragment, null, renderList(yaxisFields.value, (item) => {
196
+ return openBlock(), createBlock(_component_el_option, {
197
+ key: item.numValue,
198
+ label: item.numLabel,
199
+ value: item.numValue
200
+ }, {
201
+ default: withCtx(() => [
202
+ createElementVNode("span", _hoisted_4, toDisplayString(item.numLabel), 1),
203
+ createElementVNode("span", _hoisted_5, toDisplayString(item.type), 1)
204
+ ]),
205
+ _: 2
206
+ }, 1032, ["label", "value"]);
207
+ }), 128))
208
+ ]),
209
+ _: 1
210
+ }, 8, ["modelValue", "title"])
211
+ ]),
212
+ _: 1
213
+ }, 512), [
214
+ [vShow, __props.chartType == "pie"]
215
+ ])
151
216
  ])
152
217
  ]),
153
218
  _: 1