super-page-designer 2.0.82 → 2.0.86
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.
- package/dist/es/components/design/utils/assemblys-config.js +2 -2
- package/dist/es/components/design/utils/form-design-util.d.ts +15 -0
- package/dist/es/components/design/utils/form-design-util.js +54 -9
- package/dist/es/components/design/utils/interfaces/page-design-types.d.ts +1 -1
- package/dist/es/components/design/utils/page-table-util.d.ts +3 -1
- package/dist/es/components/design/utils/page-table-util.js +50 -23
- package/dist/es/components/design/views/assemblys/button/button/button-attr-advanced.vue.js +10 -13
- package/dist/es/components/design/views/assemblys/button/component/combination.vue.js +5 -4
- package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr-advanced.vue.js +2 -2
- package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr-advanced.vue.js +2 -2
- package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js +11 -7
- package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js +1 -1
- package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js +2 -1
- package/dist/es/components/design/views/assemblys/data/component/data-origin.vue.js +1 -1
- package/dist/es/components/design/views/assemblys/data/component/data-origin.vue2.js +5 -2
- package/dist/es/components/design/views/assemblys/data/table/table-attr-advanced.vue.js +7 -5
- package/dist/es/components/design/views/assemblys/data/table/table-attr.vue2.js +1 -1
- package/dist/es/components/design/views/assemblys/data/table/table-design.vue.js +1 -1
- package/dist/es/components/design/views/assemblys/data/table/table-design.vue2.js +2 -5
- package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js +1 -1
- package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue2.js +113 -65
- package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr-base.vue.js +6 -0
- package/dist/es/components/design/views/assemblys/object-design.vue.js +14 -2
- package/dist/es/components/design/views/assemblys/page/page-attr-base.vue.js +2 -5
- package/dist/es/components/design/views/design/page-design.vue.js +10 -7
- package/dist/es/components/design/views/design/page-event/config.vue.js +7 -1
- package/dist/es/components/design/views/design/page-event/config.vue2.js +1 -7
- package/dist/es/components/design/views/design/page-event/page-event-content.vue.js +6 -6
- package/dist/es/components/design/views/design/view/components/quick-add-dialog.vue.js +1 -1
- package/dist/es/components/design/views/design/view/components/quick-add-fields.vue.js +3 -0
- package/dist/es/components/design/views/design/view/view-design-display.vue.js +1 -1
- package/dist/es/style.css +84 -84
- package/package.json +5 -5
|
@@ -54,7 +54,7 @@ const tableOperateColumnConf = {
|
|
|
54
54
|
title: "操作",
|
|
55
55
|
prop: "operation",
|
|
56
56
|
columnWidth: 150,
|
|
57
|
-
sortable:
|
|
57
|
+
sortable: false,
|
|
58
58
|
displayOrder: 3,
|
|
59
59
|
visible: true,
|
|
60
60
|
alignTittle: "center",
|
|
@@ -289,7 +289,7 @@ const assemblyGroups = [{
|
|
|
289
289
|
name: "form",
|
|
290
290
|
label: "表单",
|
|
291
291
|
icon: containerForm,
|
|
292
|
-
props: { size: { widthType: "flex", flexSpan: 24 } },
|
|
292
|
+
props: { base: {}, size: { widthType: "flex", flexSpan: 24 } },
|
|
293
293
|
style: {},
|
|
294
294
|
events: [
|
|
295
295
|
{ name: "beforeFormLoad", label: "加载表单数据前", tip: "还没有加载表单数据时" },
|
|
@@ -184,3 +184,18 @@ export declare function deleteRule(pageDesign: any, configure: any): void;
|
|
|
184
184
|
*/
|
|
185
185
|
export declare function resetConfigIndo(configure: any, val: string): boolean;
|
|
186
186
|
export declare function componentNameChange(configure: Component, componentName: any, emit: any): void;
|
|
187
|
+
/**
|
|
188
|
+
* 获得引用表字段集合(例如:1对1子表字段、主表字段)
|
|
189
|
+
* @param configure 字段配置,主要使用prop属性名,例如:data.DEMO_SUPPPLIER.MY_NAME
|
|
190
|
+
* @param runtimePropMap
|
|
191
|
+
* @param oldProp 修改之前的属性名
|
|
192
|
+
* @return {tableName:[字段名,... ...],tableName:[字段名,... ...]}
|
|
193
|
+
*/
|
|
194
|
+
export declare function getRefrencePropMap(newProp: string, oldProp: string, runtimePropMap: any): void;
|
|
195
|
+
/**
|
|
196
|
+
* 删除指定引用字段
|
|
197
|
+
* @param prop
|
|
198
|
+
* @param runtimePropMap
|
|
199
|
+
* @returns
|
|
200
|
+
*/
|
|
201
|
+
export declare function removePropFromRefrencePropMap(prop: string, runtimePropMap: any): void;
|
|
@@ -380,18 +380,27 @@ function watchValidateType(configure, type, fieldInfo) {
|
|
|
380
380
|
if (type) {
|
|
381
381
|
const prop = configure.props.base.prop;
|
|
382
382
|
if (prop) {
|
|
383
|
-
|
|
384
|
-
type,
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
}
|
|
390
|
-
packageStringRuleByDataType(fieldInfo, type, rule);
|
|
391
|
-
configure.props.rules.push(rule);
|
|
383
|
+
if (typeof type === "string") {
|
|
384
|
+
addRuleToConfigure(configure, type, fieldInfo);
|
|
385
|
+
} else if (Array.isArray(type)) {
|
|
386
|
+
for (let i = 0; i < type.length; i++) {
|
|
387
|
+
addRuleToConfigure(configure, type[i], fieldInfo);
|
|
388
|
+
}
|
|
389
|
+
}
|
|
392
390
|
}
|
|
393
391
|
}
|
|
394
392
|
}
|
|
393
|
+
function addRuleToConfigure(configure, type, fieldInfo) {
|
|
394
|
+
const rule = {
|
|
395
|
+
type,
|
|
396
|
+
message: `${configure.props.base.title}格式不匹配`,
|
|
397
|
+
label: configure.props.base.title,
|
|
398
|
+
myType: type
|
|
399
|
+
// 删除格式时需要用该属性
|
|
400
|
+
};
|
|
401
|
+
packageStringRuleByDataType(fieldInfo, type, rule);
|
|
402
|
+
configure.props.rules.push(rule);
|
|
403
|
+
}
|
|
395
404
|
function watchPatternValidate(configure, pattern, fieldInfo) {
|
|
396
405
|
const prop = configure.props.base.prop;
|
|
397
406
|
if (prop) {
|
|
@@ -540,13 +549,49 @@ function componentNameChange(configure, componentName, emit) {
|
|
|
540
549
|
emit("changeAssembly", configure);
|
|
541
550
|
}
|
|
542
551
|
}
|
|
552
|
+
function getRefrencePropMap(newProp, oldProp, runtimePropMap) {
|
|
553
|
+
removePropFromRefrencePropMap(oldProp, runtimePropMap);
|
|
554
|
+
let props = [];
|
|
555
|
+
if (newProp) {
|
|
556
|
+
props = newProp.split(".");
|
|
557
|
+
}
|
|
558
|
+
if (props.length >= 3) {
|
|
559
|
+
const refrenceTableName = props[1];
|
|
560
|
+
const fieldName = props[2].substring(0, props[2].lastIndexOf("}"));
|
|
561
|
+
if (!runtimePropMap[refrenceTableName]) {
|
|
562
|
+
runtimePropMap[refrenceTableName] = [];
|
|
563
|
+
}
|
|
564
|
+
if (runtimePropMap[refrenceTableName].indexOf(fieldName) < 0) {
|
|
565
|
+
runtimePropMap[refrenceTableName].push(fieldName);
|
|
566
|
+
}
|
|
567
|
+
}
|
|
568
|
+
}
|
|
569
|
+
function removePropFromRefrencePropMap(prop, runtimePropMap) {
|
|
570
|
+
let props = [];
|
|
571
|
+
if (prop) {
|
|
572
|
+
props = prop.split(".");
|
|
573
|
+
}
|
|
574
|
+
if (props.length >= 3) {
|
|
575
|
+
const refrenceTableName = props[1];
|
|
576
|
+
const fieldName = props[2].substring(0, props[2].lastIndexOf("}"));
|
|
577
|
+
if (!runtimePropMap[refrenceTableName]) {
|
|
578
|
+
return;
|
|
579
|
+
}
|
|
580
|
+
if (runtimePropMap[refrenceTableName].indexOf(fieldName) > 0) {
|
|
581
|
+
const newArr = runtimePropMap[refrenceTableName].filter((item) => item !== fieldName);
|
|
582
|
+
runtimePropMap[refrenceTableName] = newArr;
|
|
583
|
+
}
|
|
584
|
+
}
|
|
585
|
+
}
|
|
543
586
|
export {
|
|
544
587
|
caculateComponentProps,
|
|
545
588
|
caculateDetailComponentStyle,
|
|
546
589
|
columnCustomTittleClass,
|
|
547
590
|
columnTittleStyle,
|
|
548
591
|
componentNameChange,
|
|
592
|
+
getRefrencePropMap,
|
|
549
593
|
removComponentOptionConfigs,
|
|
594
|
+
removePropFromRefrencePropMap,
|
|
550
595
|
resetConfigIndo,
|
|
551
596
|
watchMaxOrMinValidate,
|
|
552
597
|
watchPatternValidate,
|
|
@@ -249,7 +249,7 @@ export interface ListColumn {
|
|
|
249
249
|
displayOrder: number;
|
|
250
250
|
fileSet: string | null | undefined;
|
|
251
251
|
orgTreeSet: string | null | undefined;
|
|
252
|
-
dynamicColumnJson?: string;
|
|
252
|
+
dynamicColumnJson?: string | null | undefined;
|
|
253
253
|
valueSetOptions: string | null | undefined;
|
|
254
254
|
required: boolean;
|
|
255
255
|
pattern: string;
|
|
@@ -15,7 +15,7 @@ export declare function queryTableFields(systemCode: string, systemVersion: numb
|
|
|
15
15
|
* @param tableName
|
|
16
16
|
* @returns
|
|
17
17
|
*/
|
|
18
|
-
export declare function queryTableFieldsOrMap(
|
|
18
|
+
export declare function queryTableFieldsOrMap(systemVersion: number, tableName: string): Promise<any>;
|
|
19
19
|
/**
|
|
20
20
|
* 查询子表
|
|
21
21
|
* @param systemCode
|
|
@@ -35,3 +35,5 @@ 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;
|
|
39
|
+
export declare function getTableNameByTableUuid(pageDesign: any, tableUuid: any): any;
|
|
@@ -8,17 +8,6 @@ function queryTableFields(systemCode, systemVersion, tableName) {
|
|
|
8
8
|
url += "&tableName=" + (tableName ? tableName : "");
|
|
9
9
|
return http.get(url);
|
|
10
10
|
}
|
|
11
|
-
function queryTableFieldsOrMap(systemCode, systemVersion, tableName) {
|
|
12
|
-
const param = {
|
|
13
|
-
systemCode,
|
|
14
|
-
publishVersion: systemVersion,
|
|
15
|
-
tableName
|
|
16
|
-
};
|
|
17
|
-
return http.get(
|
|
18
|
-
window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns/findAttributeMap",
|
|
19
|
-
param
|
|
20
|
-
);
|
|
21
|
-
}
|
|
22
11
|
function querySublist(systemCode, systemVersion, publishVersion) {
|
|
23
12
|
const param = {
|
|
24
13
|
systemCode,
|
|
@@ -37,7 +26,12 @@ function setTableRuntimesFromConfigure(tableConfigure, pageDesign) {
|
|
|
37
26
|
delete tableConfigure.btnList;
|
|
38
27
|
delete tableConfigure.items;
|
|
39
28
|
delete tableConfigure.modelFields;
|
|
40
|
-
|
|
29
|
+
if (tableConfigure.runtime && tableConfigure.runtime.events) {
|
|
30
|
+
const { events } = tableConfigure.runtime;
|
|
31
|
+
tableConfigure.runtime = { events };
|
|
32
|
+
} else {
|
|
33
|
+
delete tableConfigure.runtime;
|
|
34
|
+
}
|
|
41
35
|
}
|
|
42
36
|
function getListView(configureCopy, pageDesign, tableConfigureStr) {
|
|
43
37
|
const listCode = "V" + pageDesign.version + "__" + pageDesign.code + "__" + configureCopy.uuid;
|
|
@@ -167,7 +161,7 @@ function getListColumns(configure, pageDesign) {
|
|
|
167
161
|
//组织结构树参数设置
|
|
168
162
|
orgTreeSet: getOrgTreeSet(item),
|
|
169
163
|
// 字段为动态列时,json
|
|
170
|
-
|
|
164
|
+
dynamicColumnJson: getDynamicColumnJson(item),
|
|
171
165
|
// 值设置,设置多个
|
|
172
166
|
valueSetOptions: getValueSetOptions(item),
|
|
173
167
|
// 是否必填
|
|
@@ -187,9 +181,6 @@ function getListColumns(configure, pageDesign) {
|
|
|
187
181
|
*/
|
|
188
182
|
// ifMultiData: boolean
|
|
189
183
|
};
|
|
190
|
-
if (item.props.base.prop && item.props.base.prop === "dynamicColumnSelect") {
|
|
191
|
-
formatDynamicColumnData(item, temp);
|
|
192
|
-
}
|
|
193
184
|
listColumns.push(temp);
|
|
194
185
|
});
|
|
195
186
|
return listColumns;
|
|
@@ -371,6 +362,19 @@ function getFileSet(item) {
|
|
|
371
362
|
if (propName) {
|
|
372
363
|
fileSet.serverNameData = { name: propName, dbName: propName.toUpperCase() };
|
|
373
364
|
}
|
|
365
|
+
if (item.props.uploadConfig) {
|
|
366
|
+
if (item.props.uploadConfig.multiple) {
|
|
367
|
+
fileSet.multiple = true;
|
|
368
|
+
} else {
|
|
369
|
+
fileSet.multiple = false;
|
|
370
|
+
}
|
|
371
|
+
if (item.props.uploadConfig.accept) {
|
|
372
|
+
fileSet.accept = item.props.uploadConfig.accept;
|
|
373
|
+
}
|
|
374
|
+
if (item.props.uploadConfig.limitFileSize) {
|
|
375
|
+
fileSet.limitFileSize = item.props.uploadConfig.limitFileSize;
|
|
376
|
+
}
|
|
377
|
+
}
|
|
374
378
|
return JSON.stringify(fileSet);
|
|
375
379
|
}
|
|
376
380
|
return null;
|
|
@@ -424,9 +428,6 @@ function getNameFromProp(prop) {
|
|
|
424
428
|
}
|
|
425
429
|
return prop;
|
|
426
430
|
}
|
|
427
|
-
function formatDynamicColumnData(item, temp) {
|
|
428
|
-
temp.dynamicColumnJson = JSON.stringify(item.props.dataOrigin.dynamicColumnJson);
|
|
429
|
-
}
|
|
430
431
|
function getListColumnEvent(item, pageDesign) {
|
|
431
432
|
let result = null;
|
|
432
433
|
if (item.events) {
|
|
@@ -435,7 +436,7 @@ function getListColumnEvent(item, pageDesign) {
|
|
|
435
436
|
if (!result) {
|
|
436
437
|
result = {};
|
|
437
438
|
}
|
|
438
|
-
result[event.name] = event.componentUuid;
|
|
439
|
+
result[event.name] = event.componentUuid + "_" + event.name;
|
|
439
440
|
}
|
|
440
441
|
});
|
|
441
442
|
if (result) {
|
|
@@ -444,6 +445,12 @@ function getListColumnEvent(item, pageDesign) {
|
|
|
444
445
|
}
|
|
445
446
|
return result;
|
|
446
447
|
}
|
|
448
|
+
function getDynamicColumnJson(item) {
|
|
449
|
+
if (item.props.base.prop && item.props.base.prop === "dynamicColumnSelect") {
|
|
450
|
+
return JSON.stringify(item.props.dynamicColumnData);
|
|
451
|
+
}
|
|
452
|
+
return null;
|
|
453
|
+
}
|
|
447
454
|
function tableResetConfigIndo(configure, moduleValue) {
|
|
448
455
|
let newColumnInfo = {
|
|
449
456
|
uuid: configure.uuid,
|
|
@@ -453,7 +460,8 @@ function tableResetConfigIndo(configure, moduleValue) {
|
|
|
453
460
|
editLine: configure.props.editLine,
|
|
454
461
|
format: configure.props.format,
|
|
455
462
|
verification: configure.props.verification,
|
|
456
|
-
definition: configure.props.definition
|
|
463
|
+
definition: configure.props.definition,
|
|
464
|
+
size: configure.props.size
|
|
457
465
|
};
|
|
458
466
|
configure.props = {};
|
|
459
467
|
configure.uuid = newColumnInfo.uuid;
|
|
@@ -464,13 +472,32 @@ function tableResetConfigIndo(configure, moduleValue) {
|
|
|
464
472
|
configure.props.format = newColumnInfo.format;
|
|
465
473
|
configure.props.verification = newColumnInfo.verification;
|
|
466
474
|
configure.props.definition = newColumnInfo.definition;
|
|
475
|
+
configure.props.size = newColumnInfo.size;
|
|
467
476
|
configure.events = getDesignEvents(moduleValue);
|
|
468
|
-
configure.name =
|
|
477
|
+
configure.name = moduleValue;
|
|
478
|
+
}
|
|
479
|
+
function changeFeieldToMap(modelFieldsMap, tableFields) {
|
|
480
|
+
modelFieldsMap = {};
|
|
481
|
+
tableFields.forEach((attrbt) => {
|
|
482
|
+
modelFieldsMap[attrbt.dbColumnName] = attrbt;
|
|
483
|
+
});
|
|
484
|
+
}
|
|
485
|
+
function getTableNameByTableUuid(pageDesign, tableUuid) {
|
|
486
|
+
let tableName = pageDesign.tableName;
|
|
487
|
+
if (!tableUuid && tableName) {
|
|
488
|
+
return tableName;
|
|
489
|
+
}
|
|
490
|
+
let tableConfigure;
|
|
491
|
+
if (pageDesign.tableRuntimes && tableUuid && pageDesign.tableRuntimes[tableUuid]) {
|
|
492
|
+
tableConfigure = JSON.parse(pageDesign.tableRuntimes[tableUuid].configure);
|
|
493
|
+
}
|
|
494
|
+
return tableConfigure && tableConfigure.props && tableConfigure.props.dataOrigin ? tableConfigure.props.dataOrigin.tableName : null;
|
|
469
495
|
}
|
|
470
496
|
export {
|
|
497
|
+
changeFeieldToMap,
|
|
498
|
+
getTableNameByTableUuid,
|
|
471
499
|
querySublist,
|
|
472
500
|
queryTableFields,
|
|
473
|
-
queryTableFieldsOrMap,
|
|
474
501
|
setTableRuntimesFromConfigure,
|
|
475
502
|
tableResetConfigIndo
|
|
476
503
|
};
|
|
@@ -91,7 +91,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
91
91
|
combinationVisible.value = false;
|
|
92
92
|
}
|
|
93
93
|
function saveCondition(table) {
|
|
94
|
-
props.configure.props.base.
|
|
94
|
+
props.configure.props.base.showConditions = JSON.stringify(table);
|
|
95
95
|
}
|
|
96
96
|
return (_ctx, _cache) => {
|
|
97
97
|
const _component_el_option = resolveComponent("el-option");
|
|
@@ -108,7 +108,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
108
108
|
default: withCtx(() => [
|
|
109
109
|
createVNode(_component_el_collapse, {
|
|
110
110
|
modelValue: openCollapseItems.value,
|
|
111
|
-
"onUpdate:modelValue": _cache[
|
|
111
|
+
"onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => openCollapseItems.value = $event),
|
|
112
112
|
style: { "margin-top": "6px" }
|
|
113
113
|
}, {
|
|
114
114
|
default: withCtx(() => [
|
|
@@ -203,6 +203,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
203
203
|
(openBlock(), createBlock(_sfc_main$1, {
|
|
204
204
|
key: __props.configure.uuid + "_edit",
|
|
205
205
|
configure: __props.configure,
|
|
206
|
+
title: "启用条件",
|
|
206
207
|
type: "editConditions"
|
|
207
208
|
}, null, 8, ["configure"]))
|
|
208
209
|
]),
|
|
@@ -230,15 +231,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
230
231
|
class: "amb-design-attr-item"
|
|
231
232
|
}, {
|
|
232
233
|
default: withCtx(() => [
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
createTextVNode("编辑")
|
|
239
|
-
]),
|
|
240
|
-
_: 1
|
|
241
|
-
})
|
|
234
|
+
(openBlock(), createBlock(_sfc_main$1, {
|
|
235
|
+
key: __props.configure.uuid + "_show",
|
|
236
|
+
configure: __props.configure,
|
|
237
|
+
type: "showConditions"
|
|
238
|
+
}, null, 8, ["configure"]))
|
|
242
239
|
]),
|
|
243
240
|
_: 1
|
|
244
241
|
}),
|
|
@@ -249,7 +246,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
249
246
|
default: withCtx(() => [
|
|
250
247
|
createVNode(_component_el_button, {
|
|
251
248
|
type: "primary",
|
|
252
|
-
onClick: _cache[
|
|
249
|
+
onClick: _cache[4] || (_cache[4] = ($event) => journalSetVisible.value = true)
|
|
253
250
|
}, {
|
|
254
251
|
default: withCtx(() => [
|
|
255
252
|
createTextVNode("编辑")
|
|
@@ -278,7 +275,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
278
275
|
}, null, 8, ["pageDesign", "configure"])) : createCommentVNode("", true),
|
|
279
276
|
combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
|
|
280
277
|
key: 2,
|
|
281
|
-
conditionList: __props.configure.props.base.
|
|
278
|
+
conditionList: __props.configure.props.base.showConditions,
|
|
282
279
|
fieldNameList: __props.pageDesign.modelFields,
|
|
283
280
|
fieldMap: __props.pageDesign.modelFieldsMap,
|
|
284
281
|
onSave: saveCondition,
|
|
@@ -69,10 +69,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
69
69
|
}
|
|
70
70
|
function savebuttonSetting() {
|
|
71
71
|
if (tableData.value && tableData.value.length > 0) {
|
|
72
|
-
for (
|
|
72
|
+
for (let i = 0; i < tableData.value.length; i++) {
|
|
73
73
|
const item = tableData.value[i];
|
|
74
|
-
if (!item.propName) {
|
|
75
|
-
return ElMessage.warning("
|
|
74
|
+
if (!item.propName || !item.propValue) {
|
|
75
|
+
return ElMessage.warning("第" + i + "行字段名或值有空白");
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
}
|
|
@@ -184,6 +184,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
184
184
|
modelValue: scope.row.propDbName,
|
|
185
185
|
"onUpdate:modelValue": ($event) => scope.row.propDbName = $event,
|
|
186
186
|
clearable: "",
|
|
187
|
+
filterable: "",
|
|
187
188
|
size: "default",
|
|
188
189
|
onChange: ($event) => changeFieldName(scope.$index, scope.row, scope.row.propDbName)
|
|
189
190
|
}, {
|
|
@@ -232,7 +233,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
232
233
|
}, {
|
|
233
234
|
default: withCtx((scope) => [
|
|
234
235
|
createVNode(BindVariable, {
|
|
235
|
-
modelValue: scope.row.
|
|
236
|
+
modelValue: scope.row.propValue,
|
|
236
237
|
"onUpdate:modelValue": (data) => afterBindDefaultValue(data, scope.row)
|
|
237
238
|
}, null, 8, ["modelValue", "onUpdate:modelValue"])
|
|
238
239
|
]),
|
package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr-advanced.vue.js
CHANGED
|
@@ -75,7 +75,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
75
75
|
combinationVisible.value = false;
|
|
76
76
|
}
|
|
77
77
|
function saveCondition(table) {
|
|
78
|
-
props.configure.props.base.
|
|
78
|
+
props.configure.props.base.showConditions = JSON.stringify(table);
|
|
79
79
|
}
|
|
80
80
|
return (_ctx, _cache) => {
|
|
81
81
|
const _component_el_option = resolveComponent("el-option");
|
|
@@ -216,7 +216,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
216
216
|
}, null, 8, ["configure"])) : createCommentVNode("", true),
|
|
217
217
|
combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
|
|
218
218
|
key: 2,
|
|
219
|
-
conditionList: __props.configure.props.base.
|
|
219
|
+
conditionList: __props.configure.props.base.showConditions,
|
|
220
220
|
fieldNameList: attributeMap.value,
|
|
221
221
|
fieldMap: fieldMap.value,
|
|
222
222
|
onSave: saveCondition,
|
package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr-advanced.vue.js
CHANGED
|
@@ -75,7 +75,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
75
75
|
combinationVisible.value = false;
|
|
76
76
|
}
|
|
77
77
|
function saveCondition(table) {
|
|
78
|
-
props.configure.props.base.
|
|
78
|
+
props.configure.props.base.showConditions = JSON.stringify(table);
|
|
79
79
|
}
|
|
80
80
|
return (_ctx, _cache) => {
|
|
81
81
|
const _component_el_option = resolveComponent("el-option");
|
|
@@ -216,7 +216,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
216
216
|
}, null, 8, ["configure"])) : createCommentVNode("", true),
|
|
217
217
|
combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
|
|
218
218
|
key: 2,
|
|
219
|
-
conditionList: __props.configure.props.base.
|
|
219
|
+
conditionList: __props.configure.props.base.showConditions,
|
|
220
220
|
fieldNameList: attributeMap.value,
|
|
221
221
|
fieldMap: fieldMap.value,
|
|
222
222
|
onSave: saveCondition,
|
package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js
CHANGED
|
@@ -25,19 +25,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
25
25
|
const pageDesignUtil = usePageContextStore();
|
|
26
26
|
const props = __props;
|
|
27
27
|
if (!props.configure.props) {
|
|
28
|
-
props.configure.props = {};
|
|
28
|
+
props.configure.props = { base: {} };
|
|
29
29
|
}
|
|
30
30
|
let tableDatas = null;
|
|
31
31
|
if (props.type === "editConditions") {
|
|
32
|
-
if (!props.configure.props.editConditions) {
|
|
33
|
-
props.configure.props.editConditions = [];
|
|
32
|
+
if (!props.configure.props.base.editConditions) {
|
|
33
|
+
props.configure.props.base.editConditions = [];
|
|
34
34
|
}
|
|
35
|
-
tableDatas = props.configure.props.editConditions;
|
|
35
|
+
tableDatas = props.configure.props.base.editConditions;
|
|
36
36
|
} else {
|
|
37
|
-
if (!props.configure.props.
|
|
38
|
-
props.configure.props.
|
|
37
|
+
if (!props.configure.props.base) {
|
|
38
|
+
props.configure.props.base = { showConditions: [] };
|
|
39
|
+
} else {
|
|
40
|
+
if (!props.configure.props.base.showConditions) {
|
|
41
|
+
props.configure.props.base.showConditions = [];
|
|
42
|
+
}
|
|
39
43
|
}
|
|
40
|
-
tableDatas = props.configure.props.showConditions;
|
|
44
|
+
tableDatas = props.configure.props.base.showConditions;
|
|
41
45
|
}
|
|
42
46
|
const tableHeight = ref(300);
|
|
43
47
|
const dialogTableVisible = ref(false);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _sfc_main from "./common-variable-bind.vue2.js";
|
|
2
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-
|
|
4
|
+
const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-34b580aa"]]);
|
|
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-
|
|
8
|
+
const _withScopeId = (n) => (pushScopeId("data-v-34b580aa"), 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));
|
|
@@ -323,6 +323,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
323
323
|
popoverRef.value.hide();
|
|
324
324
|
}
|
|
325
325
|
function selectRow(row) {
|
|
326
|
+
debugger;
|
|
326
327
|
if (row.type == "range") {
|
|
327
328
|
if (row.symbolNum === "") {
|
|
328
329
|
ElMessage.warning("周期不能为空!");
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _sfc_main from "./data-origin.vue2.js";
|
|
2
2
|
import "./data-origin.vue3.js";
|
|
3
3
|
import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
|
|
4
|
-
const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-
|
|
4
|
+
const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a8c75465"]]);
|
|
5
5
|
export {
|
|
6
6
|
DataOrigin as default
|
|
7
7
|
};
|
|
@@ -373,15 +373,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
373
373
|
modelValue: __props.configure.props.dataOrigin.tableName,
|
|
374
374
|
"onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.dataOrigin.tableName = $event),
|
|
375
375
|
title: __props.configure.props.dataOrigin.tableName,
|
|
376
|
+
onClick: selectTable,
|
|
376
377
|
clearable: "",
|
|
377
378
|
readonly: "true"
|
|
378
379
|
}, {
|
|
379
|
-
|
|
380
|
+
prepend: withCtx(() => [
|
|
380
381
|
createVNode(_component_el_button, {
|
|
381
382
|
icon: unref(Search),
|
|
382
383
|
onClick: selectTable,
|
|
383
384
|
size: "small"
|
|
384
|
-
}, null, 8, ["icon"])
|
|
385
|
+
}, null, 8, ["icon"])
|
|
386
|
+
]),
|
|
387
|
+
append: withCtx(() => [
|
|
385
388
|
createVNode(_component_el_button, {
|
|
386
389
|
icon: unref(Close),
|
|
387
390
|
onClick: clearTable,
|
|
@@ -4,7 +4,7 @@ import { Plus, Remove, Delete } from "@element-plus/icons-vue";
|
|
|
4
4
|
import _sfc_main$1 from "../component/variate-select.vue.js";
|
|
5
5
|
import CompositeHeader from "../component/composite-header.vue.js";
|
|
6
6
|
import _sfc_main$2 from "../component/import-header.vue.js";
|
|
7
|
-
import { querySublist,
|
|
7
|
+
import { querySublist, queryTableFields, changeFeieldToMap } from "../../../../utils/page-table-util.js";
|
|
8
8
|
import _sfc_main$4 from "../../workflow/component/combination.vue.js";
|
|
9
9
|
import _sfc_main$3 from "../../common/common-select-table.vue.js";
|
|
10
10
|
import { Search, Close } from "@element-plus/icons";
|
|
@@ -120,10 +120,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
120
120
|
props.configure.props.otherSettings.alias = tableInfo.alias;
|
|
121
121
|
const systemCode = tableInfo.systemCode ? tableInfo.systemCode : props.pageDesign.systemCode;
|
|
122
122
|
const systemVersion = tableInfo.systemVersion ? tableInfo.systemVersion : props.pageDesign.version;
|
|
123
|
-
|
|
124
|
-
props.configure.props["otherSettings"]["modelFields"] = tableFields
|
|
125
|
-
props.configure.props["otherSettings"]["modelFieldsMap"]
|
|
126
|
-
|
|
123
|
+
queryTableFields(systemCode, systemVersion, tableInfo.name).then((tableFields) => {
|
|
124
|
+
props.configure.props["otherSettings"]["modelFields"] = tableFields;
|
|
125
|
+
if (!props.configure.props["otherSettings"]["modelFieldsMap"]) {
|
|
126
|
+
props.configure.props["otherSettings"]["modelFieldsMap"] = {};
|
|
127
|
+
}
|
|
128
|
+
changeFeieldToMap(props.configure.props["otherSettings"]["modelFieldsMap"], tableFields);
|
|
127
129
|
});
|
|
128
130
|
}
|
|
129
131
|
}
|
|
@@ -43,7 +43,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
43
43
|
tableConfigure.value = val.tableConfigure;
|
|
44
44
|
});
|
|
45
45
|
return (_ctx, _cache) => {
|
|
46
|
-
return Object.keys(columnData.value).length > 0
|
|
46
|
+
return Object.keys(columnData.value).length > 0 ? (openBlock(), createElementBlock("div", _hoisted_1, [
|
|
47
47
|
createVNode(AttrHeader, {
|
|
48
48
|
modelValue: unref(currentConfigType),
|
|
49
49
|
"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(currentConfigType) ? currentConfigType.value = $event : currentConfigType = $event),
|
|
@@ -2,7 +2,7 @@ import _sfc_main from "./table-design.vue2.js";
|
|
|
2
2
|
import "./table-design.vue3.js";
|
|
3
3
|
import "./table-design.vue4.js";
|
|
4
4
|
import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
|
|
5
|
-
const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-
|
|
5
|
+
const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-81648b04"]]);
|
|
6
6
|
export {
|
|
7
7
|
tableDesign as default
|
|
8
8
|
};
|
|
@@ -11,7 +11,7 @@ import "@element-plus/icons";
|
|
|
11
11
|
import "super-page-runtime";
|
|
12
12
|
import "../../../../../../stores/page-store.js";
|
|
13
13
|
import _sfc_main$1 from "../component/table-children-column.vue.js";
|
|
14
|
-
import { queryTableFields } from "../../../../utils/page-table-util.js";
|
|
14
|
+
import { queryTableFields, changeFeieldToMap } from "../../../../utils/page-table-util.js";
|
|
15
15
|
const _hoisted_1 = {
|
|
16
16
|
id: "tableDesignMenu",
|
|
17
17
|
ref: "headerMenu",
|
|
@@ -143,10 +143,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
|
|
|
143
143
|
const systemVersion = props.configure.tableSysVersion ? props.configure.tableSysVersion : props.pageDesign.version;
|
|
144
144
|
const tableName = props.configure.props.dataOrigin.tableName;
|
|
145
145
|
queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
|
|
146
|
-
props.configure.modelFieldsMap
|
|
147
|
-
tableFields.forEach((attrbt) => {
|
|
148
|
-
props.configure.modelFieldsMap[attrbt.dbColumnName] = attrbt;
|
|
149
|
-
});
|
|
146
|
+
changeFeieldToMap(props.configure.modelFieldsMap, tableFields);
|
|
150
147
|
props.configure.modelFields = tableFields;
|
|
151
148
|
});
|
|
152
149
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _sfc_main from "./tablecolumn-attr-base.vue2.js";
|
|
2
2
|
import "./tablecolumn-attr-base.vue3.js";
|
|
3
3
|
import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
|
|
4
|
-
const TablecolumnAttrBase = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-
|
|
4
|
+
const TablecolumnAttrBase = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3560b979"]]);
|
|
5
5
|
export {
|
|
6
6
|
TablecolumnAttrBase as default
|
|
7
7
|
};
|