diff --git a/public/index.html b/public/index.html
index 9014f93..a7b1477 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,11 +4,8 @@
- AnshareAdmin
-
+
+ <%= webpackConfig.name %>
diff --git a/src/api/Public/file.js b/src/api/Public/file.js
index 1a30501..02b6d82 100644
--- a/src/api/Public/file.js
+++ b/src/api/Public/file.js
@@ -1,12 +1,13 @@
import fetch from '@/utils/fetch'
-export function upload(MasterID) {
+export function upload(data) {
return fetch({
url: '/file/Upload',
method: 'post',
contentType: false,
params: {
- MasterID,
+ MasterID: data.MasterID,
+ Type: data.Type,
},
})
}
@@ -30,13 +31,13 @@ export function deletefile(AffixID) {
})
}
-export function GetFileList(MasterID) {
+export function GetFileList(data) {
return fetch({
url: '/file/list',
method: 'post',
-
params: {
- MasterID,
+ MasterID: data.MasterID,
+ Type: data.Type,
},
})
}
diff --git a/src/components/CommonTable/index.vue b/src/components/CommonTable/index.vue
index 8496e89..dff24d2 100644
--- a/src/components/CommonTable/index.vue
+++ b/src/components/CommonTable/index.vue
@@ -114,8 +114,6 @@ export default {
this.$emit('handleCurrentChange', this.listQuery)
},
handleOperation(eventName, id) {
- console.log(eventName);
- console.log(id);
this.$emit(eventName, id)
},
},
diff --git a/src/components/CrudTable/index.vue b/src/components/CrudTable/index.vue
index f17672f..08b5922 100644
--- a/src/components/CrudTable/index.vue
+++ b/src/components/CrudTable/index.vue
@@ -40,7 +40,6 @@
ref="generateForm"
:data="jsonData"
:value="entity"
- :upload_params="uploadParams"
/>
{
this.jsonData = JSON.parse(res.data.formJson);
- console.log(this.jsonData);
});
},
@@ -168,8 +159,6 @@ export default {
New() {
this.dialogStatus = 'create';
- this.uploadParams.Param.MasterID = '';
- this.filelist = null;
this.dialogFormVisible = true;
Object.keys(this.entity).forEach((k) => {
this.entity[k] = ''
@@ -209,8 +198,6 @@ export default {
}).then((response) => {
this.fetchData(this.listQuery);
this.entity = response.data;
- this.id = id;
- this.uploadParams.Param.MasterID = id;
this.dialogFormVisible = true;
});
},
@@ -242,7 +229,7 @@ export default {
.getData()
.then((data) => {
this.entity = data;
- this.entity.id = this.id;
+ // this.entity.id = this.id;
this.axios({
url: `/${this.tableName}/update`,
method: 'post',
diff --git a/src/components/FormDesigner/GenerateForm.vue b/src/components/FormDesigner/GenerateForm.vue
index acd0c9e..7fe129c 100644
--- a/src/components/FormDesigner/GenerateForm.vue
+++ b/src/components/FormDesigner/GenerateForm.vue
@@ -26,27 +26,19 @@
-
-
-
-
-
+ />
@@ -58,22 +50,16 @@
// 常规组件
import GenetateFormItem from './GenerateFormItem';
-// /自定义组件
-import UploadAffix from '@/components/UploadAffix'; // 上传模块
-
export default {
name: 'FmGenerateForm',
components: {
GenetateFormItem,
- UploadAffix,
},
- props: ['data', 'remote', 'value', 'disabled', 'upload_params'],
+ props: ['data', 'value', 'disabled', 'clear'],
// data 初始化表单
- // remote 异步远程请求方法
// value 表单赋值
// clear 清空表单
// disabled 表单只读
- // upload_params 自定义 文件上传模块的参数
data() {
return {
models: {},
@@ -94,6 +80,19 @@ export default {
},
methods: {
generateModle(genList) {
+ // 添加一个ID隐藏域
+ const obj = {
+ model: 'id',
+ type: 'hidden',
+ options: {
+ defaultValue: '',
+ remote: false,
+ },
+ rules: [],
+ }
+
+ genList.push({ ...obj })
+ console.log(genList)
for (let i = 0; i < genList.length; i++) {
if (genList[i].type === 'grid') {
genList[i].columns.forEach((item) => {
@@ -102,16 +101,11 @@ export default {
} else {
if (Object.keys(this.value).indexOf(genList[i].model) >= 0) {
this.models[genList[i].model] = this.value[genList[i].model];
- } else if (genList[i].type === 'blank') {
- this.models[genList[i].model] = genList[i].options.defaultType === 'String'
- ? ''
- : genList[i].options.defaultType === 'Object'
- ? {}
- : [];
} else {
this.models[genList[i].model] = genList[i].options.defaultValue;
}
+
if (this.rules[genList[i].model]) {
this.rules[genList[i].model] = [
...this.rules[genList[i].model],
diff --git a/src/components/FormDesigner/GenerateFormItem.vue b/src/components/FormDesigner/GenerateFormItem.vue
index a80ff2a..c31ad97 100644
--- a/src/components/FormDesigner/GenerateFormItem.vue
+++ b/src/components/FormDesigner/GenerateFormItem.vue
@@ -166,6 +166,10 @@
+
+
+
@@ -173,12 +177,14 @@