cloud-web-corejs 1.0.54-dev.524 → 1.0.54-dev.526
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/package.json +1 -1
- package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue +68 -6
- package/src/components/xform/mixins/scriptHttp.js +172 -1
- package/src/components/xform/utils/formula-util copy 2.js +945 -0
- package/src/components/xform/utils/formula-util copy.js +860 -0
- package/src/router/modules/customer.js +1 -1
- package/src/utils/request.js +368 -1
- package/src/views/user/user/edit.vue +687 -456
package/package.json
CHANGED
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
:dataTableOption="dataTableOption"
|
|
23
23
|
v-bind="formConfig"
|
|
24
24
|
:param="dialogParam"
|
|
25
|
-
class="data-table_height"
|
|
25
|
+
class="data-table_height labMargin"
|
|
26
26
|
/>
|
|
27
27
|
</div>
|
|
28
28
|
<label id="labBtn" class="transverse">
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
<script>
|
|
73
73
|
import { selectDialogMixins } from "../../../../../mixins/selectDialog/index.js";
|
|
74
74
|
import VFormRender from "../../../../../components/xform/form-render/index.vue";
|
|
75
|
-
import {traverseAllWidgetsNew} from "../../../../../components/xform/utils/util"
|
|
75
|
+
import { traverseAllWidgetsNew } from "../../../../../components/xform/utils/util";
|
|
76
76
|
|
|
77
77
|
export default {
|
|
78
78
|
// name: "vabSearchDialog",
|
|
@@ -234,12 +234,12 @@ export default {
|
|
|
234
234
|
},
|
|
235
235
|
});
|
|
236
236
|
},
|
|
237
|
-
getDataTableWidget(){
|
|
238
|
-
let result = null
|
|
237
|
+
getDataTableWidget() {
|
|
238
|
+
let result = null;
|
|
239
239
|
traverseAllWidgetsNew(this.formJson.widgetList, (widget) => {
|
|
240
240
|
//修复data-table旧数据表格列widget与editWidget为空的问题
|
|
241
241
|
if (!result && widget.type == "data-table") {
|
|
242
|
-
result = widget
|
|
242
|
+
result = widget;
|
|
243
243
|
}
|
|
244
244
|
});
|
|
245
245
|
return result;
|
|
@@ -463,8 +463,70 @@ export default {
|
|
|
463
463
|
};
|
|
464
464
|
</script>
|
|
465
465
|
|
|
466
|
-
<style scoped>
|
|
466
|
+
<style scoped lang="scss">
|
|
467
467
|
::v-deep .H5 .h5-fixed-bottom-btns {
|
|
468
468
|
bottom: 95px;
|
|
469
469
|
}
|
|
470
|
+
::v-deep .tree-container {
|
|
471
|
+
height: 100%;
|
|
472
|
+
.tree-box {
|
|
473
|
+
width: 14%;
|
|
474
|
+
height: 100%;
|
|
475
|
+
min-width: 13%;
|
|
476
|
+
border-right: solid 1px #f0f0f0;
|
|
477
|
+
.container-wrapper {
|
|
478
|
+
height: calc(100% - 34px);
|
|
479
|
+
> div {
|
|
480
|
+
height: 100%;
|
|
481
|
+
}
|
|
482
|
+
}
|
|
483
|
+
.tree-btns + .tree-list {
|
|
484
|
+
height: calc(100% - 41px);
|
|
485
|
+
}
|
|
486
|
+
}
|
|
487
|
+
.main-right {
|
|
488
|
+
width: calc(86% - 8px);
|
|
489
|
+
height: 100%;
|
|
490
|
+
}
|
|
491
|
+
.grid-height {
|
|
492
|
+
height: 100% !important;
|
|
493
|
+
}
|
|
494
|
+
#labBtn {
|
|
495
|
+
background-color: #f4f6fa;
|
|
496
|
+
position: relative;
|
|
497
|
+
width: 8px !important;
|
|
498
|
+
z-index: 8;
|
|
499
|
+
cursor: e-resize;
|
|
500
|
+
display: inline-block !important;
|
|
501
|
+
height: calc(100% + 8px);
|
|
502
|
+
margin: -8px 0px !important;
|
|
503
|
+
.icon {
|
|
504
|
+
position: absolute;
|
|
505
|
+
top: 50%;
|
|
506
|
+
left: -4.5px;
|
|
507
|
+
font-size: 17px;
|
|
508
|
+
margin-top: -16.8px;
|
|
509
|
+
color: #2a6494;
|
|
510
|
+
i {
|
|
511
|
+
display: block;
|
|
512
|
+
transform: rotate(90deg);
|
|
513
|
+
-ms-transform: rotate(90deg);
|
|
514
|
+
-moz-transform: rotate(90deg);
|
|
515
|
+
-webkit-transform: rotate(90deg);
|
|
516
|
+
-o-transform: rotate(90deg);
|
|
517
|
+
}
|
|
518
|
+
}
|
|
519
|
+
}
|
|
520
|
+
}
|
|
521
|
+
::v-deep .labMargin .tree-container{ display: flex;}
|
|
522
|
+
/* ::v-deep .tree-container #labBtn {
|
|
523
|
+
background-color: #f4f6fa;
|
|
524
|
+
position: relative;
|
|
525
|
+
width: 8px !important;
|
|
526
|
+
z-index: 8;
|
|
527
|
+
cursor: e-resize;
|
|
528
|
+
display: inline-block !important;
|
|
529
|
+
height: calc(100vh - 75px);
|
|
530
|
+
margin: -7px 0 !important;
|
|
531
|
+
} */
|
|
470
532
|
</style>
|