cloud-web-corejs 1.0.54-dev.330 → 1.0.54-dev.332
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/importDialogMixin.js +0 -2
- package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js +6 -0
- package/src/components/xform/form-designer/setting-panel/property-editor/formScriptEnabled-editor.vue +5 -5
- package/src/components/xform/form-render/container-item/data-table-mixin.js +0 -1
package/package.json
CHANGED
|
@@ -232,7 +232,6 @@ tmixins = {
|
|
|
232
232
|
},
|
|
233
233
|
handleBeforeImport(file, resultData, callback) {
|
|
234
234
|
let importOption = this.option.importOption;
|
|
235
|
-
let a = 1
|
|
236
235
|
let that = this;
|
|
237
236
|
if (importOption.onBeforeImport) {
|
|
238
237
|
const toDo = (res) => {
|
|
@@ -245,7 +244,6 @@ tmixins = {
|
|
|
245
244
|
})
|
|
246
245
|
callback && callback();
|
|
247
246
|
}
|
|
248
|
-
// debugger
|
|
249
247
|
this.getFieldTarget().handleCustomEvent(importOption.onBeforeImport, ['file', 'resultData', 'done'], [file, resultData, toDo])
|
|
250
248
|
} else {
|
|
251
249
|
callback && callback();
|
|
@@ -614,8 +614,14 @@ modules = {
|
|
|
614
614
|
}
|
|
615
615
|
this.setOptionItemsFlag(null)
|
|
616
616
|
}
|
|
617
|
+
let accessParam = this.handleCustomEvent(
|
|
618
|
+
this.field.options.formScriptParam
|
|
619
|
+
);
|
|
617
620
|
this.$getBaseDicts({
|
|
618
621
|
code: commonAttributeCode,
|
|
622
|
+
data:{
|
|
623
|
+
...accessParam
|
|
624
|
+
},
|
|
619
625
|
success: ({dicts, dictMap}) => {
|
|
620
626
|
this.loadGloatOptions(dicts, initFlag);
|
|
621
627
|
this.handleCustomEvent(
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
<el-form-item label="表单脚本编码" v-if="optionModel.formScriptEnabled">
|
|
15
15
|
<el-input v-model="optionModel.formScriptCode" clearable></el-input>
|
|
16
16
|
</el-form-item>
|
|
17
|
-
<el-form-item label="查询参数" v-if="optionModel.formScriptEnabled">
|
|
17
|
+
<el-form-item label="查询参数" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
|
|
18
18
|
<a href="javascript:void(0);" class="a-link link-oneLind"
|
|
19
19
|
@click="editEventHandler('formScriptParam', ['dataId', 'formCode'])">
|
|
20
20
|
<span>{{ optionModel.formScriptParam }}</span>
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
<el-form-item :label="i18nt('词汇编码')" v-if="optionModel.commonAttributeEnabled">
|
|
30
30
|
<el-input type="text" v-model="optionModel.commonAttributeCode"></el-input>
|
|
31
31
|
</el-form-item>
|
|
32
|
-
<el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled">
|
|
33
|
-
<el-input type="text" v-model="optionModel.labelKey"></el-input>
|
|
32
|
+
<el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
|
|
33
|
+
<el-input type="text" v-model="optionModel.labelKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
|
|
34
34
|
</el-form-item>
|
|
35
|
-
<el-form-item :label="i18nt('关联字段')" v-if="optionModel.formScriptEnabled">
|
|
36
|
-
<el-input type="text" v-model="optionModel.valueKey"></el-input>
|
|
35
|
+
<el-form-item :label="i18nt('关联字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
|
|
36
|
+
<el-input type="text" v-model="optionModel.valueKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
|
|
37
37
|
</el-form-item>
|
|
38
38
|
</template>
|
|
39
39
|
<el-form-item label="查询回调">
|