@fecp/designer 5.6.37 → 5.6.39

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 (25) hide show
  1. package/es/designer/package.json.mjs +1 -1
  2. package/es/designer/src/components/DataSourceSelect.vue.mjs +10 -4
  3. package/es/designer/src/packages/dialog/index.vue.mjs +28 -11
  4. package/es/designer/src/packages/dialog/index.vue2.mjs +28 -11
  5. package/es/designer/src/packages/dialog/useDialogDialog.mjs +1 -1
  6. package/es/designer/src/packages/dialogGlobal/index.vue.mjs +28 -11
  7. package/es/designer/src/packages/dialogGlobal/index.vue2.mjs +28 -11
  8. package/es/designer/src/packages/dialogGlobal/useDialogGlobalDialog.mjs +1 -1
  9. package/es/designer/src/packages/form/property/widgets.vue.mjs +2 -2
  10. package/es/designer/src/packages/utils/common.mjs +17 -0
  11. package/es/designer.css +122 -121
  12. package/es/packages/vue/src/components/forms/formItem/FormItem.vue.mjs +1 -1
  13. package/lib/designer/package.json.js +1 -1
  14. package/lib/designer/src/components/DataSourceSelect.vue.js +9 -3
  15. package/lib/designer/src/packages/dialog/index.vue.js +26 -9
  16. package/lib/designer/src/packages/dialog/index.vue2.js +351 -334
  17. package/lib/designer/src/packages/dialog/useDialogDialog.js +1 -1
  18. package/lib/designer/src/packages/dialogGlobal/index.vue.js +26 -9
  19. package/lib/designer/src/packages/dialogGlobal/index.vue2.js +321 -304
  20. package/lib/designer/src/packages/dialogGlobal/useDialogGlobalDialog.js +1 -1
  21. package/lib/designer/src/packages/form/property/widgets.vue.js +2 -2
  22. package/lib/designer/src/packages/utils/common.js +17 -0
  23. package/lib/designer.css +122 -121
  24. package/lib/packages/vue/src/components/forms/formItem/FormItem.vue.js +1 -1
  25. package/package.json +23 -23
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
- const index = require("./index.vue.js");
3
+ const index = require("./index.vue2.js");
4
4
  const vue = require("vue");
5
5
  function useDialogDialog() {
6
6
  const dialogDialogVisible = vue.ref(false);
@@ -161,14 +161,27 @@ const _sfc_main = {
161
161
  setup(__props) {
162
162
  const currentInstance = vue.getCurrentInstance();
163
163
  const ctx = currentInstance.proxy;
164
- const editConfigData = vue.computed(() => {
165
- return common.getEditConfigData();
166
- });
167
164
  const dialogVisible = vue.useModel(__props, "modelValue");
168
165
  const loading = vue.ref(false);
169
166
  const saving = vue.ref(false);
170
167
  const selectedDialogs = vue.ref([]);
171
168
  const activeDialogIndex = vue.ref(-1);
169
+ function normalizeDataSourceConfigs(dialogs) {
170
+ const globalDataSources = common.getEditConfigDataSources() || [];
171
+ (dialogs || []).forEach((dialog) => {
172
+ if (dialog.contentSource !== "table" || dialog.tableContent !== "custom") {
173
+ return;
174
+ }
175
+ if (!dialog.customTableConfig) {
176
+ dialog.customTableConfig = common.cloneDeep(_default.defaultTableConfig);
177
+ dialog.customTableConfig.fieldsData = [];
178
+ }
179
+ dialog.customTableConfig.dataSources = common.mergeDataSources(
180
+ globalDataSources,
181
+ dialog.customTableConfig.dataSources
182
+ );
183
+ });
184
+ }
172
185
  vue.watch(dialogVisible, async (val) => {
173
186
  if (val) {
174
187
  isEditingNew.value = false;
@@ -184,6 +197,7 @@ const _sfc_main = {
184
197
  ...JSON.parse(dialog.config)
185
198
  });
186
199
  }
200
+ normalizeDataSourceConfigs(selectedDialogs.value);
187
201
  if (selectedDialogs.value.length > 0 && activeDialogIndex.value === -1) {
188
202
  activeDialogIndex.value = 0;
189
203
  }
@@ -276,6 +290,7 @@ const _sfc_main = {
276
290
  const onConfirm = async () => {
277
291
  saving.value = true;
278
292
  try {
293
+ normalizeDataSourceConfigs(selectedDialogs.value);
279
294
  const dialogArr = selectedDialogs.value.map((dialog) => {
280
295
  const data = common.cloneDeep(dialog);
281
296
  const id = data.id;
@@ -308,10 +323,11 @@ const _sfc_main = {
308
323
  if (!data.customTableConfig) {
309
324
  data.customTableConfig = common.cloneDeep(_default.defaultTableConfig);
310
325
  data.customTableConfig.fieldsData = [];
311
- data.customTableConfig.dataSources = editConfigData.value.dataSources;
312
- } else {
313
- data.customTableConfig.dataSources = editConfigData.value.dataSources;
326
+ }
327
+ if (data.customTableConfig.queryConfig) {
314
328
  data.customTableConfig.queryConfig.enabled = false;
329
+ } else {
330
+ data.customTableConfig.queryConfig = { enabled: false };
315
331
  }
316
332
  if ((data == null ? void 0 : data.contentSource) == "table") {
317
333
  const pkId = data == null ? void 0 : data.subTableId;
@@ -890,8 +906,9 @@ const _sfc_main = {
890
906
  default: vue.withCtx(() => [
891
907
  vue.createVNode(DataSourceSelect.default, {
892
908
  modelValue: vue.unref(currentDialog).customTableConfig.dataSourceId,
893
- "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => vue.unref(currentDialog).customTableConfig.dataSourceId = $event)
894
- }, null, 8, ["modelValue"])
909
+ "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => vue.unref(currentDialog).customTableConfig.dataSourceId = $event),
910
+ "data-sources": vue.unref(currentDialog).customTableConfig.dataSources
911
+ }, null, 8, ["modelValue", "data-sources"])
895
912
  ]),
896
913
  _: 1
897
914
  })
@@ -1033,5 +1050,5 @@ const _sfc_main = {
1033
1050
  };
1034
1051
  }
1035
1052
  };
1036
- const DialogGlobalDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-6b9e1841"]]);
1053
+ const DialogGlobalDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-be95917a"]]);
1037
1054
  exports.default = DialogGlobalDialog;