super-page-designer 2.0.89 → 2.0.92

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 (136) hide show
  1. package/dist/es/assets/design-attr.css.js +1 -0
  2. package/dist/es/assets/fonts/iconfont.css.js +1 -0
  3. package/dist/es/components/design/utils/assemblys-config.js +4 -2
  4. package/dist/es/components/design/utils/chart-design-util.js +2 -1
  5. package/dist/es/components/design/utils/form-design-util.js +2 -1
  6. package/dist/es/components/design/utils/page-table-util.d.ts +2 -1
  7. package/dist/es/components/design/utils/page-table-util.js +18 -2
  8. package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js +6 -7
  9. package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue.js +1 -1
  10. package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue3.js +1 -0
  11. package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue.js +1 -1
  12. package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue3.js +1 -0
  13. package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue.js +1 -1
  14. package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue3.js +1 -0
  15. package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr-base.vue.js +1 -1
  16. package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr.vue.js +1 -1
  17. package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr.vue3.js +1 -0
  18. package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue.js +1 -1
  19. package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue3.js +1 -0
  20. package/dist/es/components/design/views/assemblys/chart/common/common-attr-groupby.vue.js +4 -2
  21. package/dist/es/components/design/views/assemblys/chart/gauge/series/styles/style-axislabel.vue.js +2 -1
  22. package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js +2 -1
  23. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.d.ts +79 -0
  24. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js +2 -2
  25. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js +35 -12
  26. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue3.js +1 -0
  27. package/dist/es/components/design/views/assemblys/common/page-permission-select.vue.js +9 -5
  28. package/dist/es/components/design/views/assemblys/common/state-button.vue.js +1 -1
  29. package/dist/es/components/design/views/assemblys/common/state-button.vue3.js +1 -0
  30. package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr.vue.js +1 -1
  31. package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr.vue3.js +1 -0
  32. package/dist/es/components/design/views/assemblys/data/component/column-config.vue.js +1 -0
  33. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue.js +1 -1
  34. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue3.js +1 -0
  35. package/dist/es/components/design/views/assemblys/data/component/configuration-value.vue.js +1 -1
  36. package/dist/es/components/design/views/assemblys/data/component/data-origin-tree.vue.js +1 -1
  37. package/dist/es/components/design/views/assemblys/data/component/data-origin-tree.vue3.js +1 -0
  38. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue.js +1 -1
  39. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue3.js +1 -0
  40. package/dist/es/components/design/views/assemblys/data/component/formatting.vue.js +1 -1
  41. package/dist/es/components/design/views/assemblys/data/component/querySetting.vue.js +1 -1
  42. package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue.js +1 -1
  43. package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue3.js +1 -0
  44. package/dist/es/components/design/views/assemblys/data/component/table-children-column.vue.js +2 -1
  45. package/dist/es/components/design/views/assemblys/data/component/variate-select.vue.js +2 -1
  46. package/dist/es/components/design/views/assemblys/data/table/table-attr-advanced.vue.js +30 -17
  47. package/dist/es/components/design/views/assemblys/data/table/table-attr-base.vue.js +1 -1
  48. package/dist/es/components/design/views/assemblys/data/table/table-attr.vue.js +1 -1
  49. package/dist/es/components/design/views/assemblys/data/table/table-attr.vue3.js +1 -0
  50. package/dist/es/components/design/views/assemblys/data/table/table-design.vue.js +3 -3
  51. package/dist/es/components/design/views/assemblys/data/table/table-design.vue2.js +1 -1
  52. package/dist/es/components/design/views/assemblys/data/table/table-design.vue3.js +1 -0
  53. package/dist/es/components/design/views/assemblys/data/table/table-design.vue4.js +1 -0
  54. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js +2 -2
  55. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue2.js +62 -47
  56. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue3.js +1 -0
  57. package/dist/es/components/design/views/assemblys/data/tree/tree-attr-base.vue.js +5 -2
  58. package/dist/es/components/design/views/assemblys/data/tree/tree-attr.vue.js +1 -1
  59. package/dist/es/components/design/views/assemblys/data/tree/tree-attr.vue3.js +1 -0
  60. package/dist/es/components/design/views/assemblys/form/checkbox/checkbox-attr.vue.js +1 -1
  61. package/dist/es/components/design/views/assemblys/form/checkbox/checkbox-attr.vue3.js +1 -0
  62. package/dist/es/components/design/views/assemblys/form/common/attr-event.vue.js +1 -1
  63. package/dist/es/components/design/views/assemblys/form/common/attr-event.vue3.js +1 -0
  64. package/dist/es/components/design/views/assemblys/form/common/attr-header.vue.js +1 -1
  65. package/dist/es/components/design/views/assemblys/form/common/attr-header.vue3.js +1 -0
  66. package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js +1 -1
  67. package/dist/es/components/design/views/assemblys/form/common/data-origin-autoset.vue.js +1 -0
  68. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue.js +1 -1
  69. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue3.js +1 -0
  70. package/dist/es/components/design/views/assemblys/form/common/dimension-input.vue.js +1 -0
  71. package/dist/es/components/design/views/assemblys/form/common/icon-set-dialog.vue.js +2 -2
  72. package/dist/es/components/design/views/assemblys/form/common/icon-set-dialog.vue2.js +217 -0
  73. package/dist/es/components/design/views/assemblys/form/common/icon-set-dialog.vue3.js +1 -217
  74. package/dist/es/components/design/views/assemblys/form/custom/custom-attr-base.vue.js +1 -1
  75. package/dist/es/components/design/views/assemblys/form/custom/custom-attr.vue.js +1 -1
  76. package/dist/es/components/design/views/assemblys/form/custom/custom-attr.vue3.js +1 -0
  77. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue.js +1 -1
  78. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue3.js +1 -0
  79. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr-base.vue.js +44 -13
  80. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr.vue.js +1 -1
  81. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr.vue3.js +1 -0
  82. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-design.vue2.js +1 -1
  83. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr.vue.js +1 -1
  84. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr.vue3.js +1 -0
  85. package/dist/es/components/design/views/assemblys/form/divider/divider-attr.vue.js +1 -1
  86. package/dist/es/components/design/views/assemblys/form/divider/divider-attr.vue3.js +1 -0
  87. package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr.vue.js +1 -1
  88. package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr.vue3.js +1 -0
  89. package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr.vue.js +1 -1
  90. package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr.vue3.js +1 -0
  91. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue.js +1 -1
  92. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue3.js +1 -0
  93. package/dist/es/components/design/views/assemblys/form/label/label-attr.vue.js +1 -1
  94. package/dist/es/components/design/views/assemblys/form/label/label-attr.vue3.js +1 -0
  95. package/dist/es/components/design/views/assemblys/form/placeholder/placeholder-attr.vue.js +1 -1
  96. package/dist/es/components/design/views/assemblys/form/placeholder/placeholder-attr.vue3.js +1 -0
  97. package/dist/es/components/design/views/assemblys/form/radio/radio-attr.vue.js +1 -1
  98. package/dist/es/components/design/views/assemblys/form/radio/radio-attr.vue3.js +1 -0
  99. package/dist/es/components/design/views/assemblys/form/select/select-attr.vue.js +1 -1
  100. package/dist/es/components/design/views/assemblys/form/select/select-attr.vue3.js +1 -0
  101. package/dist/es/components/design/views/assemblys/form/select/select-design.vue.js +1 -1
  102. package/dist/es/components/design/views/assemblys/form/select/select-design.vue3.js +1 -0
  103. package/dist/es/components/design/views/assemblys/form/switch/switch-attr.vue.js +1 -1
  104. package/dist/es/components/design/views/assemblys/form/switch/switch-attr.vue3.js +1 -0
  105. package/dist/es/components/design/views/assemblys/form/switch/switch-design.vue.js +1 -1
  106. package/dist/es/components/design/views/assemblys/form/switch/switch-design.vue3.js +1 -0
  107. package/dist/es/components/design/views/assemblys/form/tag/tag-attr.vue.js +1 -1
  108. package/dist/es/components/design/views/assemblys/form/tag/tag-attr.vue3.js +1 -0
  109. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr.vue.js +1 -1
  110. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr.vue3.js +1 -0
  111. package/dist/es/components/design/views/assemblys/page/component/weight-field-input.vue.js +2 -1
  112. package/dist/es/components/design/views/assemblys/page/page-attr-base.vue.js +1 -1
  113. package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.d.ts +18 -0
  114. package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.js +24 -1
  115. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr-base.vue.js +1 -1
  116. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr.vue.js +1 -1
  117. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr.vue3.js +1 -0
  118. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr-base.vue.js +1 -1
  119. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr.vue.js +1 -1
  120. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr.vue3.js +1 -0
  121. package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr.vue.js +1 -1
  122. package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr.vue3.js +1 -0
  123. package/dist/es/components/design/views/design/page-design.vue.js +7 -4
  124. package/dist/es/components/design/views/design/page-event/config.vue.js +1 -7
  125. package/dist/es/components/design/views/design/page-event/config.vue2.js +7 -0
  126. package/dist/es/components/design/views/design/page-event/config.vue3.js +2 -1
  127. package/dist/es/components/design/views/design/page-event/page-event-content.vue.js +1 -1
  128. package/dist/es/components/design/views/design/view/components/quick-add-dialog.vue.js +8 -1
  129. package/dist/es/components/design/views/design/view/components/quick-add-fields.vue.js +2 -1
  130. package/dist/es/components/design/views/design/view/page-switch.vue.js +1 -1
  131. package/dist/es/components/design/views/design/view/page-switch.vue3.js +1 -0
  132. package/dist/es/components/design/views/design/view/view-design-display.vue.js +1 -1
  133. package/dist/es/index.js +2 -2
  134. package/dist/es/stores/page-store.js +4 -10
  135. package/dist/es/style.css +231 -231
  136. package/package.json +5 -5
@@ -0,0 +1 @@
1
+
@@ -51,7 +51,6 @@ const tableOperateColumnConf = {
51
51
  props: {
52
52
  base: {
53
53
  name: "操作",
54
- title: "操作",
55
54
  prop: "operation",
56
55
  columnWidth: 150,
57
56
  sortable: false,
@@ -453,6 +452,7 @@ const assemblyGroups = [{
453
452
  { name: "click", label: "点击", tip: "点击" },
454
453
  { name: "input", label: "输入", tip: "输入" },
455
454
  { name: "change", label: "更改", tip: "更改" },
455
+ { name: "clear", label: "清空", tip: "清空" },
456
456
  { name: "setValue", label: "弹框赋值回调", tip: "后缀图标弹框赋值回调" },
457
457
  { name: "closePopup", label: "关闭弹框回调", tip: "关闭弹框回调" },
458
458
  { name: "blur", label: "失去焦点", tip: "失去焦点" },
@@ -656,6 +656,7 @@ const assemblyGroups = [{
656
656
  events: [
657
657
  { name: "change", label: "确定更改日期", tip: "用户确认选定的值时触发" },
658
658
  { name: "blur", label: "获取焦点", tip: "获取焦点" },
659
+ { name: "clear", label: "清空", tip: "清空" },
659
660
  { name: "focus", label: "失去焦点", tip: "失去焦点" },
660
661
  // {name:'calendar-change',label: '日历更改所选日期事件', tip:'在日历所选日期更改时触发' },
661
662
  { name: "panel-change", label: "日期面板改变事件", tip: "当日期面板改变时触发" },
@@ -2689,7 +2690,8 @@ function getInitialInformationByName(name) {
2689
2690
  return null;
2690
2691
  }
2691
2692
  function getDesignEvents(name) {
2692
- if (!name) return [];
2693
+ if (!name)
2694
+ return [];
2693
2695
  for (let i = 0; i < assemblyGroups.length; i++) {
2694
2696
  let items = assemblyGroups[i].items;
2695
2697
  for (let j = 0; j < items.length; j++) {
@@ -142,7 +142,8 @@ function generateChartOption(configure, chartOption) {
142
142
  const isGauge = configure.name == "chart-gauge";
143
143
  const isRadar = configure.name == "chart-radar";
144
144
  const isScatter = configure.name == "chart-scatter";
145
- if (thisProps.title) ;
145
+ if (thisProps.title)
146
+ ;
146
147
  if (thisProps.subTitle) {
147
148
  tempOption.title[0].subtext = thisProps.subTitle;
148
149
  if (thisStyle.subtitleTextAlign) {
@@ -231,7 +231,8 @@ function caculateComponentProps(configure, property) {
231
231
  }
232
232
  const optionConf = getComponentOptionConfigs(configure, pageDesign);
233
233
  if (optionConf) {
234
- if (dataOrigin) pageDesign.initOptionConfigs.push(optionConf);
234
+ if (dataOrigin)
235
+ pageDesign.initOptionConfigs.push(optionConf);
235
236
  tempProps["optionconfigInfo"] = optionConf;
236
237
  if (optionConf.props && optionConf.props.monitorFields) {
237
238
  for (let fieldName of optionConf.props.monitorFields) {
@@ -35,5 +35,6 @@ export declare function setTableRuntimesFromConfigure(tableConfigure: Component,
35
35
  * @return {*}
36
36
  */
37
37
  export declare function tableResetConfigIndo(configure: object, moduleValue: any): void;
38
- export declare function changeFeieldToMap(modelFieldsMap: any, tableFields: any): void;
38
+ export declare function changeFeieldToMap(modelFieldsMap: any, tableFields: any): any;
39
39
  export declare function getTableNameByTableUuid(pageDesign: any, tableUuid: any): any;
40
+ export declare function getModelOptionsByFields(dataFieldList: any): any;
@@ -489,20 +489,36 @@ function changeFeieldToMap(modelFieldsMap, tableFields) {
489
489
  tableFields.forEach((attrbt) => {
490
490
  modelFieldsMap[attrbt.dbColumnName] = attrbt;
491
491
  });
492
+ return modelFieldsMap;
492
493
  }
493
494
  function getTableNameByTableUuid(pageDesign, tableUuid) {
494
495
  let tableName = pageDesign.tableName;
495
- if (!tableUuid && tableName) {
496
+ if (tableName) {
496
497
  return tableName;
497
498
  }
498
499
  let tableConfigure;
499
- if (pageDesign.tableRuntimes && tableUuid && pageDesign.tableRuntimes[tableUuid]) {
500
+ if (pageDesign.tableRuntimes && tableUuid && pageDesign.tableRuntimes[tableUuid] && pageDesign.pageType && pageDesign.pageType === "list") {
500
501
  tableConfigure = JSON.parse(pageDesign.tableRuntimes[tableUuid].configure);
501
502
  }
502
503
  return tableConfigure && tableConfigure.props && tableConfigure.props.dataOrigin ? tableConfigure.props.dataOrigin.tableName : null;
503
504
  }
505
+ function getModelOptionsByFields(dataFieldList) {
506
+ let dataModelOptions = [];
507
+ if (dataFieldList) {
508
+ dataFieldList.forEach((element) => {
509
+ dataModelOptions.push({
510
+ value: element.dbColumnName,
511
+ // element.name
512
+ label: element.alias,
513
+ alias: element.alias
514
+ });
515
+ });
516
+ }
517
+ return dataModelOptions;
518
+ }
504
519
  export {
505
520
  changeFeieldToMap,
521
+ getModelOptionsByFields,
506
522
  getTableNameByTableUuid,
507
523
  querySublist,
508
524
  queryTableFields,
@@ -1,7 +1,7 @@
1
1
  import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow } from "vue";
2
2
  import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
3
3
  import "../../../../../../stores/page-store.js";
4
- /* empty css */
4
+ 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";
@@ -41,13 +41,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
41
41
  }
42
42
  }
43
43
  function queryTemplateList() {
44
- let data = {
45
- searchParam: {
46
- code: "DC_TEMPLATE_MANAGEMENT"
47
- }
48
- };
44
+ var _a;
45
+ let data = {};
46
+ const systemVersion = (_a = props.pageDesign) == null ? void 0 : _a.systemVersion;
49
47
  http.post(
50
- window["$vueApp"].config.globalProperties.baseAPI + `/dc/template-management/list/${props.pageDesign.systemCode}`,
48
+ window["$vueApp"].config.globalProperties.baseAPI + `/dc/template-management/list/${props.pageDesign.systemCode}?publishVersion=${systemVersion}`,
51
49
  data
52
50
  ).then((res) => {
53
51
  templateList.value = res.data;
@@ -621,6 +619,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
621
619
  createVNode(_component_el_select, {
622
620
  modelValue: templateFileUuids.value,
623
621
  "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => templateFileUuids.value = $event),
622
+ filterable: "",
624
623
  multiple: "",
625
624
  onChange: templateFilesChange
626
625
  }, {
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./buttongroup-attr.vue2.js";
2
- /* empty css */
2
+ import "./buttongroup-attr.vue3.js";
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./journal-set-dialog.vue2.js";
2
- /* empty css */
2
+ import "./journal-set-dialog.vue3.js";
3
3
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
4
4
  const JournalSetDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-665d3bf4"]]);
5
5
  export {
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./dropdown-attr.vue2.js";
2
- /* empty css */
2
+ import "./dropdown-attr.vue3.js";
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
36
36
  props.configure.props.base.iconValue = iconValue;
37
37
  }
38
38
  function queryPdfTemplate() {
39
- let data = { searchParam: { code: "DC_PDF_TEMPLATE" } };
39
+ let data = {};
40
40
  http.post(
41
41
  window["$vueApp"].config.globalProperties.baseAPI + `/dc/pdf-templates/list/${props.pageDesign.systemCode}`,
42
42
  data
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./exportpdf-attr.vue2.js";
2
- /* empty css */
2
+ import "./exportpdf-attr.vue3.js";
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./printlabel-attr.vue2.js";
2
- /* empty css */
2
+ import "./printlabel-attr.vue3.js";
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -78,8 +78,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
78
78
  }
79
79
  }
80
80
  function afterBindVariable(modelValue, field) {
81
- {
81
+ if (field == "groupVariable") {
82
82
  props.configure.props.groupVariable = modelValue;
83
+ } else if (field == "selGroupVariable") {
84
+ props.configure.props.selGroupVariable = modelValue;
83
85
  }
84
86
  }
85
87
  const sourceFields = ref([]);
@@ -374,7 +376,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
374
376
  createVNode(BindVariable, {
375
377
  modelValue: __props.configure.props.groupVariable,
376
378
  paramTypes: ["data", "page"],
377
- "onUpdate:modelValue": _cache[4] || (_cache[4] = (value) => afterBindVariable(value))
379
+ "onUpdate:modelValue": _cache[4] || (_cache[4] = (value) => afterBindVariable(value, "groupVariable"))
378
380
  }, null, 8, ["modelValue"])
379
381
  ]),
380
382
  _: 1
@@ -13,7 +13,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
13
13
  const props = __props;
14
14
  const fontSizes = ["8", "10", "12", "14", "16", "18", "20", "24", "28"];
15
15
  const isPieAttr = ref(true);
16
- if (props.chartType == "seriesChart") ;
16
+ if (props.chartType == "seriesChart")
17
+ ;
17
18
  else {
18
19
  isPieAttr.value = false;
19
20
  }
@@ -118,7 +118,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
118
118
  let dataType = "";
119
119
  if (val && val.startsWith("${")) {
120
120
  let propName = val.substring(2, val.length - 1);
121
- if (propName.startsWith("page.")) ;
121
+ if (propName.startsWith("page."))
122
+ ;
122
123
  else if (propName.startsWith("data.")) {
123
124
  propName = propName.substring(5);
124
125
  dataType = pageDesignUtil.getModelField(propName);
@@ -40,6 +40,44 @@ declare const _default: import('vue').DefineComponent<{
40
40
  type: BooleanConstructor;
41
41
  default: boolean;
42
42
  };
43
+ dataModelOptions: {
44
+ type: {
45
+ (arrayLength: number): object[];
46
+ (...items: object[]): object[];
47
+ new (arrayLength: number): object[];
48
+ new (...items: object[]): object[];
49
+ isArray(arg: any): arg is any[];
50
+ readonly prototype: any[];
51
+ from<T>(arrayLike: ArrayLike<T>): T[];
52
+ from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
53
+ from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
54
+ from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
55
+ of<T_4>(...items: T_4[]): T_4[];
56
+ readonly [Symbol.species]: ArrayConstructor;
57
+ };
58
+ default: any;
59
+ };
60
+ objModelOptions: {
61
+ type: {
62
+ (arrayLength: number): object[];
63
+ (...items: object[]): object[];
64
+ new (arrayLength: number): object[];
65
+ new (...items: object[]): object[];
66
+ isArray(arg: any): arg is any[];
67
+ readonly prototype: any[];
68
+ from<T>(arrayLike: ArrayLike<T>): T[];
69
+ from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
70
+ from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
71
+ from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
72
+ of<T_4>(...items: T_4[]): T_4[];
73
+ readonly [Symbol.species]: ArrayConstructor;
74
+ };
75
+ default: any;
76
+ };
77
+ needData: {
78
+ type: BooleanConstructor;
79
+ default: boolean;
80
+ };
43
81
  }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
44
82
  "update:modelValue": (...args: any[]) => void;
45
83
  }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -84,6 +122,44 @@ declare const _default: import('vue').DefineComponent<{
84
122
  type: BooleanConstructor;
85
123
  default: boolean;
86
124
  };
125
+ dataModelOptions: {
126
+ type: {
127
+ (arrayLength: number): object[];
128
+ (...items: object[]): object[];
129
+ new (arrayLength: number): object[];
130
+ new (...items: object[]): object[];
131
+ isArray(arg: any): arg is any[];
132
+ readonly prototype: any[];
133
+ from<T>(arrayLike: ArrayLike<T>): T[];
134
+ from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
135
+ from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
136
+ from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
137
+ of<T_4>(...items: T_4[]): T_4[];
138
+ readonly [Symbol.species]: ArrayConstructor;
139
+ };
140
+ default: any;
141
+ };
142
+ objModelOptions: {
143
+ type: {
144
+ (arrayLength: number): object[];
145
+ (...items: object[]): object[];
146
+ new (arrayLength: number): object[];
147
+ new (...items: object[]): object[];
148
+ isArray(arg: any): arg is any[];
149
+ readonly prototype: any[];
150
+ from<T>(arrayLike: ArrayLike<T>): T[];
151
+ from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
152
+ from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
153
+ from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
154
+ of<T_4>(...items: T_4[]): T_4[];
155
+ readonly [Symbol.species]: ArrayConstructor;
156
+ };
157
+ default: any;
158
+ };
159
+ needData: {
160
+ type: BooleanConstructor;
161
+ default: boolean;
162
+ };
87
163
  }>> & {
88
164
  "onUpdate:modelValue"?: (...args: any[]) => any;
89
165
  }, {
@@ -94,5 +170,8 @@ declare const _default: import('vue').DefineComponent<{
94
170
  showLabel: boolean;
95
171
  needParams: boolean;
96
172
  isRange: boolean;
173
+ dataModelOptions: object[];
174
+ objModelOptions: object[];
175
+ needData: boolean;
97
176
  }, {}>;
98
177
  export default _default;
@@ -1,7 +1,7 @@
1
1
  import _sfc_main from "./common-variable-bind.vue2.js";
2
- /* empty css */
2
+ import "./common-variable-bind.vue3.js";
3
3
  import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
4
- const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-34b580aa"]]);
4
+ const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7fcec2fa"]]);
5
5
  export {
6
6
  BindVariable as default
7
7
  };
@@ -5,7 +5,7 @@ import { deepCopy, getUuidv4 } from "../../../utils/common-util.js";
5
5
  import { getTypeOptions, taskVarOptions, contextVarOptions } from "./common-variable-bind-option.js";
6
6
  import { usePageContextStore } from "../../../../../stores/page-store.js";
7
7
  import { tableField } from "../../../../../stores/table-store.js";
8
- const _withScopeId = (n) => (pushScopeId("data-v-34b580aa"), n = n(), popScopeId(), n);
8
+ const _withScopeId = (n) => (pushScopeId("data-v-7fcec2fa"), n = n(), popScopeId(), n);
9
9
  const _hoisted_1 = { key: 0 };
10
10
  const _hoisted_2 = { style: { "margin-top": "10px", "font-size": "10px", "display": "flex", "align-items": "center", "justify-self": "center" } };
11
11
  const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { style: { "margin-left": "5px" } }, "输入变量名后点击加号按钮添加", -1));
@@ -54,6 +54,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
54
54
  isTable: {
55
55
  type: Boolean,
56
56
  default: false
57
+ },
58
+ dataModelOptions: {
59
+ type: Array,
60
+ default: null
61
+ },
62
+ objModelOptions: {
63
+ type: Array,
64
+ default: null
65
+ },
66
+ // 是否需要data
67
+ needData: {
68
+ type: Boolean,
69
+ default: false
57
70
  }
58
71
  },
59
72
  emits: ["update:modelValue"],
@@ -80,9 +93,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
80
93
  window.addEventListener("click", handleClickOutside);
81
94
  const pageContext = pageContextUtil.pageContext;
82
95
  let hasTask = false;
83
- let hasData = false;
84
- if (props.isTable || pageContext && (!pageContext.pageType || pageContext.pageType == "form") && pageContext.tableName) {
85
- hasData = true;
96
+ let hasData = props.needData;
97
+ if (!hasData) {
98
+ if (props.isTable || pageContext && (!pageContext.pageType || pageContext.pageType == "form") && pageContext.tableName) {
99
+ hasData = true;
100
+ }
86
101
  }
87
102
  if (pageContext && pageContext.workflowCode && hasData) {
88
103
  hasTask = true;
@@ -150,7 +165,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
150
165
  }
151
166
  console.log("click contains--------not");
152
167
  if (popoverVisible.value) {
153
- closePopover();
168
+ closePopover(true);
154
169
  }
155
170
  }
156
171
  }
@@ -185,8 +200,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
185
200
  let popoverTimeout = null;
186
201
  function closePopover(immediate) {
187
202
  clearTimeout(popoverTimeout);
188
- {
203
+ if (immediate) {
189
204
  popoverVisible.value = false;
205
+ } else {
206
+ popoverTimeout = setTimeout(() => {
207
+ popoverVisible.value = false;
208
+ }, 2e3);
190
209
  }
191
210
  }
192
211
  function openPopover() {
@@ -244,11 +263,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
244
263
  return style;
245
264
  });
246
265
  function setSelectOptions() {
247
- if (props.isTable) {
266
+ if (props.dataModelOptions && props.dataModelOptions.length > 0) {
267
+ selectOptions.value.dataModelOptions = props.dataModelOptions;
268
+ } else if (props.isTable) {
248
269
  selectOptions.value.dataModelOptions = tableFieldStore.fieldList;
249
270
  } else {
250
271
  selectOptions.value.dataModelOptions = pageContextUtil.pageContextVarOptions.dataOptions;
251
272
  }
273
+ if (props.objModelOptions && props.objModelOptions.length > 0) {
274
+ selectOptions.value.objModelOptions = props.objModelOptions;
275
+ }
252
276
  selectOptions.value.pageVarOptions = pageContextUtil.pageContextVarOptions.pageVarOptions;
253
277
  }
254
278
  function formatter() {
@@ -305,7 +329,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
305
329
  } else if (value === "data") {
306
330
  valueOptions.value = selectOptions.value.dataModelOptions || [];
307
331
  } else if (value === "obj") {
308
- valueOptions.value = selectOptions.value.dataModelOptions || [];
332
+ valueOptions.value = selectOptions.value.objModelOptions && selectOptions.value.objModelOptions.length > 0 ? selectOptions.value.objModelOptions : selectOptions.value.dataModelOptions || [];
309
333
  console.log("%c描述-172007", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", valueOptions.value);
310
334
  } else if (value === "params") {
311
335
  valueOptions.value = selectOptions.value.paramsVarOptions || [];
@@ -319,7 +343,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
319
343
  popoverRef.value.hide();
320
344
  }
321
345
  function selectRow(row) {
322
- debugger;
323
346
  if (row.type == "range") {
324
347
  if (row.symbolNum === "") {
325
348
  ElMessage.warning("周期不能为空!");
@@ -339,7 +362,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
339
362
  }
340
363
  defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
341
364
  emits("update:modelValue", defalutValue.value, row.alias);
342
- closePopover();
365
+ closePopover(true);
343
366
  }
344
367
  function addRequestParam(paramName) {
345
368
  paramValue.value = paramName;
@@ -352,7 +375,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
352
375
  }
353
376
  defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
354
377
  emits("update:modelValue", defalutValue.value);
355
- closePopover();
378
+ closePopover(true);
356
379
  }
357
380
  function addPageParams() {
358
381
  searchValue.value = searchValue.value.trim();
@@ -385,7 +408,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
385
408
  defalutValue.value = "${" + paramType.value + "." + searchValue.value + "}";
386
409
  searchValue.value = "";
387
410
  emits("update:modelValue", defalutValue.value);
388
- closePopover();
411
+ closePopover(true);
389
412
  }
390
413
  function getValueLabel(valueType, value) {
391
414
  if (selectInputType.includes(valueType)) {
@@ -70,15 +70,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
70
70
  }
71
71
  console.log("click contains--------not");
72
72
  if (popoverVisible.value) {
73
- closePopover();
73
+ closePopover(true);
74
74
  }
75
75
  }
76
76
  }
77
77
  let popoverTimeout = null;
78
78
  function closePopover(immediate) {
79
79
  clearTimeout(popoverTimeout);
80
- {
80
+ if (immediate) {
81
81
  popoverVisible.value = false;
82
+ } else {
83
+ popoverTimeout = setTimeout(() => {
84
+ popoverVisible.value = false;
85
+ }, 2e3);
82
86
  }
83
87
  }
84
88
  function openPopover() {
@@ -265,12 +269,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
265
269
  codeType.value = "";
266
270
  thisValue.value = "";
267
271
  emits("update:modelValue", "", "", "");
268
- closePopover();
272
+ closePopover(true);
269
273
  }
270
274
  function selectRow(row) {
271
275
  thisValue.value = row.code;
272
276
  emits("update:modelValue", codeType.value, thisValue.value, row.name, row.id);
273
- closePopover();
277
+ closePopover(true);
274
278
  }
275
279
  function addCustom() {
276
280
  if (!inputCode.value) {
@@ -279,7 +283,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
279
283
  }
280
284
  thisValue.value = inputCode.value;
281
285
  emits("update:modelValue", codeType.value, thisValue.value, "");
282
- closePopover();
286
+ closePopover(true);
283
287
  }
284
288
  console.log("init", props.value, props.type);
285
289
  function showPopover() {
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./state-button.vue2.js";
2
- /* empty css */
2
+ import "./state-button.vue3.js";
3
3
  import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
4
4
  const StateButton = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ae2798fb"]]);
5
5
  export {
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./barcode-attr.vue2.js";
2
- /* empty css */
2
+ import "./barcode-attr.vue3.js";
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -126,6 +126,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
126
126
  operation.props.base.displayOrder = fieldColumns.length;
127
127
  fieldColumns.push(operation);
128
128
  }
129
+ debugger;
129
130
  return fieldColumns;
130
131
  }
131
132
  function onRowClick(obj) {
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./composite-header.vue2.js";
2
- /* empty css */
2
+ import "./composite-header.vue3.js";
3
3
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
4
4
  const CompositeHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b436905c"]]);
5
5
  export {
@@ -1,6 +1,6 @@
1
1
  import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, createCommentVNode, createElementBlock, Fragment, renderList } from "vue";
2
2
  import "@element-plus/icons-vue";
3
- /* empty css */
3
+ import "../../form/common/icon-set-dialog.vue3.js";
4
4
  import http from "agilebuilder-ui/src/utils/request";
5
5
  const _hoisted_1 = { class: "dialog-footer" };
6
6
  const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./data-origin-tree.vue2.js";
2
- /* empty css */
2
+ import "./data-origin-tree.vue3.js";
3
3
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
4
4
  const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-97438be5"]]);
5
5
  export {
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./data-origin.vue2.js";
2
- /* empty css */
2
+ import "./data-origin.vue3.js";
3
3
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
4
4
  const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a8c75465"]]);
5
5
  export {
@@ -1,7 +1,7 @@
1
1
  import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, createCommentVNode, unref } from "vue";
2
2
  import _sfc_main$1 from "../../form/common/suffixmodule.vue.js";
3
3
  import { Search } from "@element-plus/icons-vue";
4
- /* empty css */
4
+ import "../../form/common/icon-set-dialog.vue3.js";
5
5
  import _sfc_main$2 from "./formatting-icon-label.vue.js";
6
6
  const _hoisted_1 = { class: "dialog-footer" };
7
7
  const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -1,6 +1,6 @@
1
1
  import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode } from "vue";
2
2
  import "@element-plus/icons-vue";
3
- /* empty css */
3
+ import "../../form/common/icon-set-dialog.vue3.js";
4
4
  const _hoisted_1 = { class: "dialog-footer" };
5
5
  const _sfc_main = /* @__PURE__ */ defineComponent({
6
6
  __name: "querySetting",