lixiaoyu 2 anni fa
parent
commit
57cf4a56d9

+ 2 - 2
variant-form-pro(2.3.8.20230308)/src/api/form-common.js

@@ -174,7 +174,7 @@ let method = {
 		let tableName = table.widget.options.databaseName; //定义的表名
 
 		let form = _this.getFormRef().getFormData(false)
-		if (type.indexOf('add')) {
+		if (type == 'add') {
 
 			_this.getFormRef().validateForm(res => {
 				if (!res) {
@@ -189,7 +189,7 @@ let method = {
 					})
 
 			})
-		} else if (type.indexOf('edit')) {
+		} else if (type == 'edit') {
 			form.id = _this.formData.id
 
 			this.update('', tableName, form, 'update:form')

+ 3 - 3
variant-form-pro(2.3.8.20230308)/src/api/table-data.js

@@ -69,7 +69,7 @@ let Table = {
 	ObtainTableButton: function(buttonName, rowIndex, row, that) {
 		var options = that._props.widget.options
 		console.log('=======》', buttonName, rowIndex, row, that)
-		if (buttonName == 'delete') {
+		if (buttonName.indexOf('delete') != -1) {
 			that.$confirm("是否删除,继续?", "提示", {
 				confirmButtonText: "确定",
 				cance1ButtonText: "取消",
@@ -84,7 +84,7 @@ let Table = {
 					})
 				// this,$message.success("删除成功")
 			})
-		} else if (buttonName == 'edit') {
+		} else if (buttonName.indexOf('edit') != -1) {
 			// let form = that.getFormRef().getFormData(false)
 			// let tableName = options.databaseName; //定义的表名
 			// var paramList = []
@@ -110,7 +110,7 @@ let Table = {
 				operation: 'edit'
 			})
 
-		} else if (buttonName == 'detail') {
+		} else if (buttonName.indexOf('detail') != -1) {
 			that.getFormRef().showDialog('detail', row)
 		}
 	},

+ 2 - 2
variant-form-pro(2.3.8.20230308)/src/components/form-designer/setting-panel/property-editor/container-data-table/data-table-customClass-editor.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-		<el-form-item :label="i18nt('designer.setting.interface')">
+<!-- 		<el-form-item :label="i18nt('designer.setting.interface')">
 			<el-input v-model="optionModel.interface"></el-input>
-		</el-form-item>
+		</el-form-item> -->
 		<!-- 数据库表名 -->
 		<el-form-item :label="i18nt('designer.setting.databaseName')">
 			<el-input v-model="optionModel.databaseName"></el-input>

+ 2 - 2
variant-form-pro(2.3.8.20230308)/src/components/form-designer/setting-panel/property-editor/container-vf-dialog/title-editor.vue

@@ -5,9 +5,9 @@
 	  </el-form-item>
 	   
 	  <!-- 数据库表名 -->
-	  <el-form-item :label="i18nt('designer.setting.databaseName')">
+	<!-- <el-form-item :label="i18nt('designer.setting.databaseName')">
 	  	<el-input v-model="optionModel.databaseName"></el-input>
-	  </el-form-item>
+	  </el-form-item> -->
   </div>
 </template>
 

+ 2 - 2
variant-form-pro(2.3.8.20230308)/src/components/form-designer/setting-panel/property-editor/popupId-editor.vue

@@ -6,9 +6,9 @@
 			</el-input>
 		</el-form-item>
 		<!-- 数据表名 -->
-		<el-form-item :label="i18nt('designer.setting.databaseName')">
+	<!-- 	<el-form-item :label="i18nt('designer.setting.databaseName')">
 			<el-input v-model="optionModel.databaseName"></el-input>
-		</el-form-item>
+		</el-form-item> -->
 	</div>
 </template>
 

+ 6 - 8
variant-form-pro(2.3.8.20230308)/src/components/form-designer/widget-panel/widgetsConfig.js

@@ -140,7 +140,6 @@ export const containers = [{
 		icon: 'data-table',
 		widgetList: [],
 		options: {
-			interface: '',
 			databaseName: '', //数据库表名
 			name: '',
 			label: 'data-table',
@@ -177,7 +176,7 @@ export const containers = [{
 				label: '详情',
 				type: 'text',
 				size: 'small',
-				popid:'',
+				popid: '',
 				round: false,
 				hidden: true,
 				disabled: false,
@@ -186,7 +185,7 @@ export const containers = [{
 				label: '编辑',
 				type: 'text',
 				size: 'small',
-				popid:'',
+				popid: '',
 				round: false,
 				hidden: false,
 				disabled: false,
@@ -195,7 +194,7 @@ export const containers = [{
 				label: '删除',
 				type: 'text',
 				size: 'small',
-				popid:'',
+				popid: '',
 				round: false,
 				hidden: false,
 				disabled: false,
@@ -380,8 +379,8 @@ export const containers = [{
 			name: '',
 			title: '',
 			width: '50%',
-			databaseName:null,//表名
-			dataTableName:'',//数据表格唯一名称
+			databaseName: null, //表名
+			dataTableName: '', //数据表格唯一名称
 			fullscreen: false,
 			showModal: true,
 			showClose: true,
@@ -1090,10 +1089,9 @@ export const basicFields = [{
 			label: '',
 			columnWidth: '200px',
 			size: '',
-			databaseName:null,//table表名
 			labelModule: null, //新增标签调用方法
 			popupId: null, //弹出框id
-			dataTableName:'',//数据表格唯一名称
+			dataTableName: '', //数据表格唯一名称
 			displayStyle: 'block',
 			disabled: false,
 			hidden: false,