super-page-designer 2.0.48 → 2.0.51-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 (128) hide show
  1. package/dist/es/components/design/utils/assemblys-config.js +1 -2
  2. package/dist/es/components/design/utils/chart-design-util.js +1 -2
  3. package/dist/es/components/design/utils/data-table-util.js +3 -3
  4. package/dist/es/components/design/utils/form-design-util.js +1 -2
  5. package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js +1 -1
  6. package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue.js +1 -1
  7. package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue.js +1 -1
  8. package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue.js +1 -1
  9. package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue.js +1 -1
  10. package/dist/es/components/design/views/assemblys/chart/common/common-attr-groupby.vue.js +2 -4
  11. package/dist/es/components/design/views/assemblys/chart/gauge/series/styles/style-axislabel.vue.js +1 -2
  12. package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js +1 -2
  13. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.d.ts +9 -0
  14. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js +2 -2
  15. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue3.js +18 -12
  16. package/dist/es/components/design/views/assemblys/common/page-permission-select.vue.js +5 -9
  17. package/dist/es/components/design/views/assemblys/common/state-button.vue.js +1 -1
  18. package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr.vue.js +1 -1
  19. package/dist/es/components/design/views/assemblys/data/component/column-config.vue.js +1 -2
  20. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue.js +1 -1
  21. package/dist/es/components/design/views/assemblys/data/component/configuration-value.vue.js +1 -1
  22. package/dist/es/components/design/views/assemblys/data/component/data-origin-tree.vue.js +1 -1
  23. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue.js +2 -2
  24. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue2.js +3 -2
  25. package/dist/es/components/design/views/assemblys/data/component/querySetting.vue.js +1 -1
  26. package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue.js +1 -1
  27. package/dist/es/components/design/views/assemblys/data/component/table-children-column.vue.js +3 -1
  28. package/dist/es/components/design/views/assemblys/data/component/variate-select.vue.js +1 -2
  29. package/dist/es/components/design/views/assemblys/data/table/table-attr-advanced.vue.js +2 -2
  30. package/dist/es/components/design/views/assemblys/data/table/table-attr-base.vue.js +2 -1
  31. package/dist/es/components/design/views/assemblys/data/table/table-attr.vue.js +1 -1
  32. package/dist/es/components/design/views/assemblys/data/table/table-design.vue.js +3 -3
  33. package/dist/es/components/design/views/assemblys/data/table/table-design.vue2.js +16 -5
  34. package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js +52 -37
  35. package/dist/es/components/design/views/assemblys/data/tree/tree-attr-base.vue.js +2 -5
  36. package/dist/es/components/design/views/assemblys/data/tree/tree-attr.vue.js +1 -1
  37. package/dist/es/components/design/views/assemblys/data/tree/tree-design.vue2.js +12 -5
  38. package/dist/es/components/design/views/assemblys/form/checkbox/checkbox-attr.vue.js +1 -1
  39. package/dist/es/components/design/views/assemblys/form/common/attr-event.vue.js +1 -1
  40. package/dist/es/components/design/views/assemblys/form/common/attr-header.vue.js +1 -1
  41. package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js +25 -32
  42. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue.js +2 -2
  43. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue2.js +20 -30
  44. package/dist/es/components/design/views/assemblys/form/common/icon-set-dialog.vue.js +1 -1
  45. package/dist/es/components/design/views/assemblys/form/common/suffixmodule.vue.js +1 -0
  46. package/dist/es/components/design/views/assemblys/form/custom/custom-attr-base.vue.js +1 -1
  47. package/dist/es/components/design/views/assemblys/form/custom/custom-attr.vue.js +1 -1
  48. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue.js +1 -1
  49. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr.vue.js +1 -1
  50. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr.vue.js +1 -1
  51. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-autoset.vue.js +6 -1
  52. package/dist/es/components/design/views/assemblys/form/divider/divider-attr.vue.js +1 -1
  53. package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr-base.vue.js +12 -10
  54. package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr.vue.js +1 -1
  55. package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr.vue.js +1 -1
  56. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue.js +1 -1
  57. package/dist/es/components/design/views/assemblys/form/label/label-attr.vue.js +1 -1
  58. package/dist/es/components/design/views/assemblys/form/link/link-attr-base.vue.js +27 -2
  59. package/dist/es/components/design/views/assemblys/form/link/link-design.vue2.js +20 -14
  60. package/dist/es/components/design/views/assemblys/form/placeholder/placeholder-attr.vue.js +1 -1
  61. package/dist/es/components/design/views/assemblys/form/radio/radio-attr.vue.js +1 -1
  62. package/dist/es/components/design/views/assemblys/form/select/select-attr.vue.js +1 -1
  63. package/dist/es/components/design/views/assemblys/form/select/select-design.vue2.js +4 -1
  64. package/dist/es/components/design/views/assemblys/form/switch/switch-attr.vue.js +1 -1
  65. package/dist/es/components/design/views/assemblys/form/tag/tag-attr-base.vue.js +14 -1
  66. package/dist/es/components/design/views/assemblys/form/tag/tag-attr.vue.js +1 -1
  67. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr.vue.js +1 -1
  68. package/dist/es/components/design/views/assemblys/object-design.vue.js +0 -1
  69. package/dist/es/components/design/views/assemblys/page/component/weight-field-input.vue.js +1 -2
  70. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr-base.vue.js +1 -1
  71. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr.vue.js +1 -1
  72. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr-base.vue.js +1 -1
  73. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr.vue.js +1 -1
  74. package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr.vue.js +1 -1
  75. package/dist/es/components/design/views/design/page-design.vue.js +6 -7
  76. package/dist/es/components/design/views/design/page-event/config.vue.js +1 -1
  77. package/dist/es/components/design/views/design/page-event/config.vue3.js +1 -2
  78. package/dist/es/components/design/views/design/view/page-switch.vue.js +1 -1
  79. package/dist/es/components/design/views/design/view/view-design-display.vue.js +1 -1
  80. package/dist/es/index.js +2 -2
  81. package/dist/es/stores/page-store.js +1 -2
  82. package/dist/es/stores/table-store.d.ts +10 -0
  83. package/dist/es/stores/table-store.js +20 -0
  84. package/dist/es/style.css +177 -177
  85. package/package.json +4 -4
  86. package/dist/es/assets/design-attr.css.js +0 -1
  87. package/dist/es/assets/fonts/iconfont.css.js +0 -1
  88. package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue3.js +0 -1
  89. package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue3.js +0 -1
  90. package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue3.js +0 -1
  91. package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue3.js +0 -1
  92. package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js +0 -1
  93. package/dist/es/components/design/views/assemblys/common/state-button.vue3.js +0 -1
  94. package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr.vue3.js +0 -1
  95. package/dist/es/components/design/views/assemblys/data/component/composite-header.vue3.js +0 -1
  96. package/dist/es/components/design/views/assemblys/data/component/data-origin-tree.vue3.js +0 -1
  97. package/dist/es/components/design/views/assemblys/data/component/data-origin.vue3.js +0 -1
  98. package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue3.js +0 -1
  99. package/dist/es/components/design/views/assemblys/data/table/table-attr.vue3.js +0 -1
  100. package/dist/es/components/design/views/assemblys/data/table/table-design.vue3.js +0 -1
  101. package/dist/es/components/design/views/assemblys/data/table/table-design.vue4.js +0 -1
  102. package/dist/es/components/design/views/assemblys/data/tree/tree-attr.vue3.js +0 -1
  103. package/dist/es/components/design/views/assemblys/form/checkbox/checkbox-attr.vue3.js +0 -1
  104. package/dist/es/components/design/views/assemblys/form/common/attr-event.vue3.js +0 -1
  105. package/dist/es/components/design/views/assemblys/form/common/attr-header.vue3.js +0 -1
  106. package/dist/es/components/design/views/assemblys/form/common/data-origin.vue3.js +0 -1
  107. package/dist/es/components/design/views/assemblys/form/common/dimension-input.vue.js +0 -1
  108. package/dist/es/components/design/views/assemblys/form/common/icon-set-dialog.vue3.js +0 -1
  109. package/dist/es/components/design/views/assemblys/form/custom/custom-attr.vue3.js +0 -1
  110. package/dist/es/components/design/views/assemblys/form/custom/custom-design.vue3.js +0 -1
  111. package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr.vue3.js +0 -1
  112. package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr.vue3.js +0 -1
  113. package/dist/es/components/design/views/assemblys/form/divider/divider-attr.vue3.js +0 -1
  114. package/dist/es/components/design/views/assemblys/form/file-upload/fileupload-attr.vue3.js +0 -1
  115. package/dist/es/components/design/views/assemblys/form/input-number/input-number-attr.vue3.js +0 -1
  116. package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr.vue3.js +0 -1
  117. package/dist/es/components/design/views/assemblys/form/label/label-attr.vue3.js +0 -1
  118. package/dist/es/components/design/views/assemblys/form/placeholder/placeholder-attr.vue3.js +0 -1
  119. package/dist/es/components/design/views/assemblys/form/radio/radio-attr.vue3.js +0 -1
  120. package/dist/es/components/design/views/assemblys/form/select/select-attr.vue3.js +0 -1
  121. package/dist/es/components/design/views/assemblys/form/switch/switch-attr.vue3.js +0 -1
  122. package/dist/es/components/design/views/assemblys/form/tag/tag-attr.vue3.js +0 -1
  123. package/dist/es/components/design/views/assemblys/form/textarea/textarea-attr.vue3.js +0 -1
  124. package/dist/es/components/design/views/assemblys/workflow/picture-flow/pictureflow-attr.vue3.js +0 -1
  125. package/dist/es/components/design/views/assemblys/workflow/text-history/texthistory-attr.vue3.js +0 -1
  126. package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr.vue3.js +0 -1
  127. package/dist/es/components/design/views/design/page-event/config.vue2.js +0 -1
  128. package/dist/es/components/design/views/design/view/page-switch.vue3.js +0 -1
@@ -2613,8 +2613,7 @@ function getDesignComponentByName(name) {
2613
2613
  return null;
2614
2614
  }
2615
2615
  function getDesignEvents(name) {
2616
- if (!name)
2617
- return [];
2616
+ if (!name) return [];
2618
2617
  for (let i = 0; i < assemblyGroups.length; i++) {
2619
2618
  let items = assemblyGroups[i].items;
2620
2619
  for (let j = 0; j < items.length; j++) {
@@ -142,8 +142,7 @@ 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)
146
- ;
145
+ if (thisProps.title) ;
147
146
  if (thisProps.subTitle) {
148
147
  tempOption.title[0].subtext = thisProps.subTitle;
149
148
  if (thisStyle.subtitleTextAlign) {
@@ -49,7 +49,7 @@ function formatConditionList(conditionList, attributeMap, fieldMap) {
49
49
  }
50
50
  function getOperators(item) {
51
51
  if (item) {
52
- if (item.dataType === "integer" || item.dataType === "long" || item.dataType === "double" || item.dataType === "float") {
52
+ if (item.dataType === "INTEGER" || item.dataType === "LONG" || item.dataType === "DOUBLE" || item.dataType === "FLOAT") {
53
53
  return [
54
54
  {
55
55
  name: "GT",
@@ -84,7 +84,7 @@ function getOperators(item) {
84
84
  label: "不等于Null"
85
85
  }
86
86
  ];
87
- } else if (item.dataType === "date" || item.dataType === "time") {
87
+ } else if (item.dataType === "DATE" || item.dataType === "TIME") {
88
88
  return [
89
89
  {
90
90
  name: "GT",
@@ -119,7 +119,7 @@ function getOperators(item) {
119
119
  label: "时间范围"
120
120
  }
121
121
  ];
122
- } else if (item.dataType === "text" || item.dataType === "string") {
122
+ } else if (item.dataType === "TEXT" || item.dataType === "STRING") {
123
123
  return [
124
124
  {
125
125
  name: "EQ",
@@ -227,8 +227,7 @@ function caculateComponentProps(configure, property) {
227
227
  }
228
228
  const optionConf = getComponentOptionConfigs(configure, pageDesign);
229
229
  if (optionConf) {
230
- if (dataOrigin)
231
- pageDesign.initOptionConfigs.push(optionConf);
230
+ if (dataOrigin) pageDesign.initOptionConfigs.push(optionConf);
232
231
  tempProps["optionconfigInfo"] = optionConf;
233
232
  if (optionConf.props && optionConf.props.monitorFields) {
234
233
  for (let fieldName of optionConf.props.monitorFields) {
@@ -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
- import "../../form/common/dimension-input.vue.js";
4
+ /* empty css */
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";
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./buttongroup-attr.vue2.js";
2
- import "./buttongroup-attr.vue3.js";
2
+ /* empty css */
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
- import "./journal-set-dialog.vue3.js";
2
+ /* empty css */
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
- import "./dropdown-attr.vue3.js";
2
+ /* empty css */
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
- import "./printlabel-attr.vue3.js";
2
+ /* empty css */
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -78,10 +78,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
78
78
  }
79
79
  }
80
80
  function afterBindVariable(modelValue, field) {
81
- if (field == "groupVariable") {
81
+ {
82
82
  props.configure.props.groupVariable = modelValue;
83
- } else if (field == "selGroupVariable") {
84
- props.configure.props.selGroupVariable = modelValue;
85
83
  }
86
84
  }
87
85
  const sourceFields = ref([]);
@@ -376,7 +374,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
376
374
  createVNode(BindVariable, {
377
375
  modelValue: __props.configure.props.groupVariable,
378
376
  paramTypes: ["data", "page"],
379
- "onUpdate:modelValue": _cache[4] || (_cache[4] = (value) => afterBindVariable(value, "groupVariable"))
377
+ "onUpdate:modelValue": _cache[4] || (_cache[4] = (value) => afterBindVariable(value))
380
378
  }, null, 8, ["modelValue"])
381
379
  ]),
382
380
  _: 1
@@ -13,8 +13,7 @@ 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")
17
- ;
16
+ if (props.chartType == "seriesChart") ;
18
17
  else {
19
18
  isPieAttr.value = false;
20
19
  }
@@ -114,8 +114,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
114
114
  let dataType = "";
115
115
  if (val && val.startsWith("${")) {
116
116
  let propName = val.substring(2, val.length - 1);
117
- if (propName.startsWith("page."))
118
- ;
117
+ if (propName.startsWith("page.")) ;
119
118
  else if (propName.startsWith("data.")) {
120
119
  propName = propName.substring(5);
121
120
  dataType = pageDesignUtil.getModelField(propName);
@@ -36,6 +36,10 @@ declare const _default: import('vue').DefineComponent<{
36
36
  type: BooleanConstructor;
37
37
  default: boolean;
38
38
  };
39
+ isTable: {
40
+ type: BooleanConstructor;
41
+ default: boolean;
42
+ };
39
43
  }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
40
44
  "update:modelValue": (...args: any[]) => void;
41
45
  }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -76,6 +80,10 @@ declare const _default: import('vue').DefineComponent<{
76
80
  type: BooleanConstructor;
77
81
  default: boolean;
78
82
  };
83
+ isTable: {
84
+ type: BooleanConstructor;
85
+ default: boolean;
86
+ };
79
87
  }>> & {
80
88
  "onUpdate:modelValue"?: (...args: any[]) => any;
81
89
  }, {
@@ -85,5 +93,6 @@ declare const _default: import('vue').DefineComponent<{
85
93
  showLabel: boolean;
86
94
  needParams: boolean;
87
95
  isRange: boolean;
96
+ isTable: boolean;
88
97
  }, {}>;
89
98
  export default _default;
@@ -1,7 +1,7 @@
1
1
  import _sfc_main from "./common-variable-bind.vue3.js";
2
- import "./common-variable-bind.vue2.js";
2
+ /* empty css */
3
3
  import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
4
- const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8cdbf8c5"]]);
4
+ const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-48d27f9e"]]);
5
5
  export {
6
6
  BindVariable as default
7
7
  };
@@ -4,7 +4,8 @@ import http from "agilebuilder-ui/src/utils/request";
4
4
  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
- const _withScopeId = (n) => (pushScopeId("data-v-8cdbf8c5"), n = n(), popScopeId(), n);
7
+ import { tableField } from "../../../../../stores/table-store.js";
8
+ const _withScopeId = (n) => (pushScopeId("data-v-48d27f9e"), n = n(), popScopeId(), n);
8
9
  const _hoisted_1 = { key: 0 };
9
10
  const _hoisted_2 = { style: { "margin-top": "10px", "font-size": "10px", "display": "flex", "align-items": "center", "justify-self": "center" } };
10
11
  const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { style: { "margin-left": "5px" } }, "输入变量名后点击加号按钮添加", -1));
@@ -49,6 +50,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
49
50
  isRange: {
50
51
  type: Boolean,
51
52
  default: false
53
+ },
54
+ isTable: {
55
+ type: Boolean,
56
+ default: false
52
57
  }
53
58
  },
54
59
  emits: ["update:modelValue"],
@@ -70,12 +75,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
70
75
  const searchValue = ref("");
71
76
  const popoverRef = ref(null);
72
77
  const selectInputType = ["context", "system", "task", "data", "page"];
78
+ const tableFieldStore = tableField();
73
79
  onMounted(() => {
74
80
  window.addEventListener("click", handleClickOutside);
75
81
  const pageContext = pageContextUtil.pageContext;
76
82
  let hasTask = false;
77
83
  let hasData = false;
78
- if (pageContext && (!pageContext.pageType || pageContext.pageType == "form") && pageContext.tableName) {
84
+ if (props.isTable || pageContext && (!pageContext.pageType || pageContext.pageType == "form") && pageContext.tableName) {
79
85
  hasData = true;
80
86
  }
81
87
  if (pageContext && pageContext.workflowCode && hasData) {
@@ -144,7 +150,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
144
150
  }
145
151
  console.log("click contains--------not");
146
152
  if (popoverVisible.value) {
147
- closePopover(true);
153
+ closePopover();
148
154
  }
149
155
  }
150
156
  }
@@ -179,12 +185,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
179
185
  let popoverTimeout = null;
180
186
  function closePopover(immediate) {
181
187
  clearTimeout(popoverTimeout);
182
- if (immediate) {
188
+ {
183
189
  popoverVisible.value = false;
184
- } else {
185
- popoverTimeout = setTimeout(() => {
186
- popoverVisible.value = false;
187
- }, 2e3);
188
190
  }
189
191
  }
190
192
  function openPopover() {
@@ -242,7 +244,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
242
244
  return style;
243
245
  });
244
246
  function setSelectOptions() {
245
- selectOptions.value.dataModelOptions = pageContextUtil.pageContextVarOptions.dataOptions;
247
+ if (props.isTable) {
248
+ selectOptions.value.dataModelOptions = tableFieldStore.fieldList;
249
+ } else {
250
+ selectOptions.value.dataModelOptions = pageContextUtil.pageContextVarOptions.dataOptions;
251
+ }
246
252
  selectOptions.value.pageVarOptions = pageContextUtil.pageContextVarOptions.pageVarOptions;
247
253
  }
248
254
  function formatter() {
@@ -329,7 +335,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
329
335
  }
330
336
  defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
331
337
  emits("update:modelValue", defalutValue.value, row.alias);
332
- closePopover(true);
338
+ closePopover();
333
339
  }
334
340
  function addRequestParam(paramName) {
335
341
  paramValue.value = paramName;
@@ -342,7 +348,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
342
348
  }
343
349
  defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
344
350
  emits("update:modelValue", defalutValue.value);
345
- closePopover(true);
351
+ closePopover();
346
352
  }
347
353
  function addPageParams() {
348
354
  searchValue.value = searchValue.value.trim();
@@ -375,7 +381,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
375
381
  defalutValue.value = "${" + paramType.value + "." + searchValue.value + "}";
376
382
  searchValue.value = "";
377
383
  emits("update:modelValue", defalutValue.value);
378
- closePopover(true);
384
+ closePopover();
379
385
  }
380
386
  function getValueLabel(valueType, value) {
381
387
  if (selectInputType.includes(valueType)) {
@@ -70,19 +70,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
70
70
  }
71
71
  console.log("click contains--------not");
72
72
  if (popoverVisible.value) {
73
- closePopover(true);
73
+ closePopover();
74
74
  }
75
75
  }
76
76
  }
77
77
  let popoverTimeout = null;
78
78
  function closePopover(immediate) {
79
79
  clearTimeout(popoverTimeout);
80
- if (immediate) {
80
+ {
81
81
  popoverVisible.value = false;
82
- } else {
83
- popoverTimeout = setTimeout(() => {
84
- popoverVisible.value = false;
85
- }, 2e3);
86
82
  }
87
83
  }
88
84
  function openPopover() {
@@ -269,12 +265,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
269
265
  codeType.value = "";
270
266
  thisValue.value = "";
271
267
  emits("update:modelValue", "", "", "");
272
- closePopover(true);
268
+ closePopover();
273
269
  }
274
270
  function selectRow(row) {
275
271
  thisValue.value = row.code;
276
272
  emits("update:modelValue", codeType.value, thisValue.value, row.name, row.id);
277
- closePopover(true);
273
+ closePopover();
278
274
  }
279
275
  function addCustom() {
280
276
  if (!inputCode.value) {
@@ -283,7 +279,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
283
279
  }
284
280
  thisValue.value = inputCode.value;
285
281
  emits("update:modelValue", codeType.value, thisValue.value, "");
286
- closePopover(true);
282
+ closePopover();
287
283
  }
288
284
  console.log("init", props.value, props.type);
289
285
  function showPopover() {
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./state-button.vue2.js";
2
- import "./state-button.vue3.js";
2
+ /* empty css */
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
- import "./barcode-attr.vue3.js";
2
+ /* empty css */
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -69,7 +69,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
69
69
  }
70
70
  tableHeight.value = tempHeight;
71
71
  if (props.configure) {
72
- debugger;
73
72
  if (props.isChangeTable) {
74
73
  const fieldColumns = getFieldColumns();
75
74
  tableData.value = fieldColumns ? fieldColumns : [];
@@ -97,7 +96,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
97
96
  let baseFieldArr = [];
98
97
  props.modelFields.forEach((attrbt) => {
99
98
  modelFieldsMap[attrbt.dbColumnName] = attrbt;
100
- if (attrbt.dbColumnName === "MODIFIER_NAME" || attrbt.dbColumnName === "MODIFIED_TIME") {
99
+ if (attrbt.dbColumnName === "MODIFIER_NAME" || attrbt.dbColumnName === "MODIFIED_TIME" || attrbt.dbColumnName === "modifier_name" || attrbt.dbColumnName === "modified_time") {
101
100
  baseFieldArr.push(attrbt);
102
101
  } else if (!attrbt.edit && attrbt.dbColumnName !== "operation") {
103
102
  attrbt.displayOrder = displayOrderStart++;
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./composite-header.vue2.js";
2
- import "./composite-header.vue3.js";
2
+ /* empty css */
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
- import "../../form/common/icon-set-dialog.vue3.js";
3
+ /* empty css */
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
- import "./data-origin-tree.vue3.js";
2
+ /* empty css */
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,7 +1,7 @@
1
1
  import _sfc_main from "./data-origin.vue2.js";
2
- import "./data-origin.vue3.js";
2
+ /* empty css */
3
3
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
4
- const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-33ccef42"]]);
4
+ const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4978a9d6"]]);
5
5
  export {
6
6
  DataOrigin as default
7
7
  };
@@ -15,6 +15,7 @@ import _sfc_main$2 from "../../common/page-permission-select.vue.js";
15
15
  import { queryServiceReturnFields } from "../../../../utils/page-service-util.js";
16
16
  import "../../../../utils/assemblys-config.js";
17
17
  import { ElLoading } from "element-plus";
18
+ import { tableField } from "../../../../../../stores/table-store.js";
18
19
  const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
19
20
  const _hoisted_2 = ["onClick"];
20
21
  const _hoisted_3 = { style: { "float": "left" } };
@@ -47,6 +48,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
47
48
  },
48
49
  setup(__props) {
49
50
  const props = __props;
51
+ const tableFieldStore = tableField();
50
52
  const cmOptions = {
51
53
  tabSize: 4,
52
54
  lineNumbers: true,
@@ -100,7 +102,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
100
102
  background: "rgba(0, 0, 0, 0.7)"
101
103
  });
102
104
  if (isChangeTable.value) {
103
- debugger;
104
105
  props.configure.tableSysCode = tableInfo ? tableInfo.value.systemCode : null;
105
106
  props.configure.tableSysVersion = tableInfo ? tableInfo.value.systemVersion : null;
106
107
  props.configure.props.dataOrigin.tableName = tableInfo ? tableInfo.value.name : null;
@@ -145,9 +146,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
145
146
  queryTableFields(systemCode, systemVersion, myTableInfo.name).then((tableFields) => {
146
147
  isChangeTable.value = true;
147
148
  modelFields.value = tableFields;
149
+ tableFieldStore.addFieldList(tableFields);
148
150
  columnConfigVisible.value = true;
149
151
  loading.close();
150
- eventBus.$emit("reloadTable");
151
152
  });
152
153
  }
153
154
  }
@@ -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
- import "../../form/common/icon-set-dialog.vue3.js";
3
+ /* empty css */
4
4
  const _hoisted_1 = { class: "dialog-footer" };
5
5
  const _sfc_main = /* @__PURE__ */ defineComponent({
6
6
  __name: "querySetting",
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./row-backgroud-color.vue2.js";
2
- import "./row-backgroud-color.vue3.js";
2
+ /* empty css */
3
3
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
4
4
  const RowBackgroudColor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b203475d"]]);
5
5
  export {
@@ -45,6 +45,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
45
45
  setup(__props, { emit: __emit }) {
46
46
  const props = __props;
47
47
  const emit = __emit;
48
+ console.log("%c描述-170030", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.pageDesign);
48
49
  function headerClick(item, column) {
49
50
  if (item.props.base) {
50
51
  setColumnData(item);
@@ -143,6 +144,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
143
144
  const _component_el_table_column = resolveComponent("el-table-column");
144
145
  return openBlock(), createBlock(_component_el_table_column, {
145
146
  fixed: false,
147
+ "column-key": __props.listColumns.uuid,
146
148
  width: __props.listColumns.props && __props.listColumns.props.base && __props.listColumns.props.base.columnWidth ? __props.listColumns.props.base.columnWidth : 200,
147
149
  label: getTableHeaderName(__props.listColumns),
148
150
  align: __props.listColumns.props && __props.listColumns.props.base && __props.listColumns.props.base.alignContent ? __props.listColumns.props.base.alignContent : __props.designProperty.alignContent,
@@ -220,7 +222,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
220
222
  ]),
221
223
  key: "1"
222
224
  } : void 0
223
- ]), 1032, ["width", "label", "align", "header-align"]);
225
+ ]), 1032, ["column-key", "width", "label", "align", "header-align"]);
224
226
  };
225
227
  }
226
228
  });
@@ -35,8 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
35
35
  const selectValue = ref("");
36
36
  function selectChange() {
37
37
  emit("update:prop", selectValue);
38
- if (selectValue === "dynamicColumnSelect" || selectValue === null)
39
- return;
38
+ if (selectValue === "dynamicColumnSelect" || selectValue === null) return;
40
39
  if (props.propType != "") {
41
40
  props.tableConfigure.modelFields.forEach((item) => {
42
41
  if (item.dbColumnName === selectValue.value) {
@@ -274,8 +274,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
274
274
  }, {
275
275
  default: withCtx(() => [
276
276
  createVNode(_component_el_radio_group, {
277
- modelValue: __props.configure.props.dataOrigin.defaultExpandAll,
278
- "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.dataOrigin.defaultExpandAll = $event),
277
+ modelValue: __props.configure.props.dataOrigin.defaultExpand,
278
+ "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.dataOrigin.defaultExpand = $event),
279
279
  class: "ml-4"
280
280
  }, {
281
281
  default: withCtx(() => [
@@ -7,7 +7,8 @@ import "@element-plus/icons-vue";
7
7
  import "agilebuilder-ui/src/utils/request";
8
8
  import "uuid";
9
9
  import "../../../../../../stores/page-store.js";
10
- import "../../common/common-variable-bind.vue2.js";
10
+ import "../../../../../../stores/table-store.js";
11
+ /* empty css */
11
12
  import "../../../../utils/eventBus.js";
12
13
  import _sfc_main$1 from "../../common/common-function-code.vue.js";
13
14
  const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -1,5 +1,5 @@
1
1
  import _sfc_main from "./table-attr.vue2.js";
2
- import "./table-attr.vue3.js";
2
+ /* empty css */
3
3
  export {
4
4
  _sfc_main as default
5
5
  };
@@ -1,8 +1,8 @@
1
1
  import _sfc_main from "./table-design.vue2.js";
2
- import "./table-design.vue3.js";
3
- import "./table-design.vue4.js";
2
+ /* empty css */
3
+ /* empty css */
4
4
  import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
5
- const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-130db8b6"]]);
5
+ const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8cf7f2d0"]]);
6
6
  export {
7
7
  tableDesign as default
8
8
  };
@@ -116,7 +116,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
116
116
  }
117
117
  );
118
118
  eventBus.$on("reloadTable", (tableData2) => {
119
- props.configure.items = JSON.parse(JSON.stringify(tableData2));
119
+ props.configure.items = tableData2;
120
120
  listColumns.value = getColumnsWithGroupHeader(props.configure);
121
121
  if (tableRef.value) {
122
122
  tableRef.value.doLayout();
@@ -213,10 +213,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
213
213
  columnData.value = item;
214
214
  }
215
215
  function headerDragend(newWidth, oldWidth, column, event) {
216
- event.stopPropagation();
217
- if (columnData.value.props && columnData.value.props.base) {
218
- columnData.value.props.base.columnWidth = newWidth;
219
- }
216
+ let data = getColumnsConfigure(listColumns.value, column.columnKey);
217
+ data.props.base.columnWidth = newWidth;
218
+ }
219
+ function getColumnsConfigure(columnData2, uuid) {
220
+ let dataObj = {};
221
+ columnData2.forEach((item) => {
222
+ if (item.uuid && item.uuid === uuid) {
223
+ console.log("%c描述-193228", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", item);
224
+ return dataObj = item;
225
+ }
226
+ if (item.children && item.children.length > 0) {
227
+ dataObj = getColumnsConfigure(item.children, uuid);
228
+ }
229
+ });
230
+ return dataObj;
220
231
  }
221
232
  function addClass({ row, column, rowIndex, columnIndex }) {
222
233
  let className = "";