Commit e82ed470 authored by xioln's avatar xioln

【6685】表格列配置关联组件展示模式为弹框时无法设定大小;6664 【通飞MES】通用选人组件无法禁用;6662…

【6685】表格列配置关联组件展示模式为弹框时无法设定大小;6664 【通飞MES】通用选人组件无法禁用;6662 配置搜索条件时使用的基础组件为输入框的时候去除前后空格;6707 菜单配置-编辑菜单时数据不回显
parent cd0fcb26
(window["webpackJsonp-dee-config"]=window["webpackJsonp-dee-config"]||[]).push([["chunk-2d0e4e32"],{"91ae":function(e,n,o){var c={"./":"c717","./components/LogOrgSelect":"0331","./components/LogOrgSelect/":"0331","./components/LogOrgSelect/config":"2006","./components/LogOrgSelect/config.js":"2006","./components/LogOrgSelect/index":"0331","./components/LogOrgSelect/index.vue":"0331","./components/demo":"22d2","./components/demo/":"22d2","./components/demo/index":"22d2","./components/demo/index.vue":"22d2","./index":"c717","./index.js":"c717","./signConfig":"cb57","./signConfig.js":"cb57"};function t(e){var n=d(e);return o(n)}function d(e){if(!o.o(c,e)){var n=new Error("Cannot find module '"+e+"'");throw n.code="MODULE_NOT_FOUND",n}return c[e]}t.keys=function(){return Object.keys(c)},t.resolve=d,e.exports=t,t.id="91ae"}}]);
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -11,6 +11,7 @@
filterable
:multiple="isMultiple"
remote
:disabled="disabled"
:remote-method="remoteMethod"
:loading="loading"
@change="UserChange"
......@@ -44,6 +45,10 @@ export default {
type: Boolean,
default: false
},
disabled: {
type: Boolean,
default: false
},
value: {
type: [Object, String, Array, Number],
default: () => {
......
......@@ -21,7 +21,7 @@ export default {
})
}
} else if (this.allProp.component.toPageType === 'selfLink') {
this.customToolFun(this.allProp.component)
this.customToolFun({ ...this.allProp.component, drawerModal: this.allProp.drawerModal, drawerSize: this.allProp.drawerSize, dialogWidth: this.allProp.dialogWidth, drawerAppendToBody: this.allProp.drawerAppendToBody, drawerWrapperClosable: this.allProp.drawerWrapperClosable })
}
},
customToolFun(item) {
......@@ -29,8 +29,8 @@ export default {
if (this.allProp.component.bindParams) {
try {
let fun1
eval(`fun1 = function (obtainedParams, row){${this.allProp.component.bindParams}}`) // eslint-disable-line
passParameter = fun1.apply(this, [this, this.scope.row])// eslint-disable-line
eval(`fun1 = function (obtainedParams, row){${this.allProp.component.bindParams}}`) // eslint-disable-line
passParameter = fun1.apply(this, [this, this.scope.row])// eslint-disable-line
} catch (error) {
console.error(error)
}
......
......@@ -4,12 +4,13 @@
* @date 2022/01/22
*/
<template>
<div class="link-to-page-com">
<span class="link-to-page-com">
<span :class="{'link': allProp.component.toPageType !== 'detailPage' || (allProp.component.toPageType === 'detailPage' && passParameter)}" @click.stop="clickLink">{{ value }}</span>
<dee-dialog
v-if="selfDialogShow"
:dialog-visible="selfDialogShow"
:title="activeToolObj.componentProp.showTitle || '提示'"
:custom-class="activeToolObj.componentProp.dialogWidth"
@handleClose="selfDialogShow = false"
>
<div class="link-to-page-dialog-box">
......@@ -38,8 +39,10 @@
v-if="selfDrawerShow"
:title="activeToolObj.componentProp.showTitle || '提示'"
:dialog-visible.sync="selfDrawerShow"
modal-append-to-body
append-to-body
:size="activeToolObj.componentProp.drawerSize || '60%'"
:wrapper-closable="activeToolObj.componentProp.drawerWrapperClosable"
:modal="activeToolObj.componentProp.drawerModal"
:append-to-body="activeToolObj.componentProp.drawerAppendToBody || false"
>
<dee-as-com
v-if="activeToolObj.componentProp.componentType === 'configForm'&& activeToolObj.componentProp.model && activeToolObj.componentProp.layoutKey"
......@@ -59,7 +62,7 @@
@completeEven="completeEven"
/>
</dee-drawer>
</div>
</span>
</template>
<script>
......@@ -74,7 +77,11 @@ export default {
props: {
allProp: {
type: Object,
default: () => {}
default: () => {
return {
component: {}
}
}
},
scope: {
type: Object,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment