diff --git a/src/api/demo/formScheme.ts b/src/api/demo/formScheme.ts
index 47324c86..aeb8dea0 100644
--- a/src/api/demo/formScheme.ts
+++ b/src/api/demo/formScheme.ts
@@ -88,7 +88,7 @@ export function functionLoadFormSort(params: AccountParams) {
export function functionAddFormSort(params: FromSortModel) {
return defHttp.post({
- url: Api.AddFormSort,
+ url: Api.AddFormSort + '?code=FormSort',
params,
});
}
diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue
index efe0218a..0d7ebb69 100644
--- a/src/components/FormViewer/index.vue
+++ b/src/components/FormViewer/index.vue
@@ -15,6 +15,7 @@
processId: String,
formVerison: String,
formRelationId: String,
+ flowFormData: Object,
});
props.formConfig.forEach((element) => {
element.componentProps.disabled = !element.disabled;
@@ -49,9 +50,9 @@
keyValue: props.processId,
};
const data = await functionGetFormDataFormScheme(querys);
- let obj =new Object()
- data.forEach(element => {
- obj[element.columnName] = element.value
+ let obj = new Object();
+ data.forEach((element) => {
+ obj[element.columnName] = element.value;
});
console.log(obj);
setFieldsValue({
@@ -72,7 +73,14 @@
getForm,
});
onMounted(() => {
- getFormHistory();
+ if (props.formVerison) {
+ getFormHistory();
+ } else {
+ console.log(props.flowFormData);
+ setFieldsValue({
+ ...props.flowFormData,
+ });
+ }
});
diff --git a/src/components/MapboxMaps/InsertShp/index.vue b/src/components/MapboxMaps/InsertShp/index.vue
index f9aa4246..459ae03c 100644
--- a/src/components/MapboxMaps/InsertShp/index.vue
+++ b/src/components/MapboxMaps/InsertShp/index.vue
@@ -69,8 +69,18 @@
-
+
+
+
+ geometry
+ varchar
+ text
+
+
+
+
+
@@ -84,9 +94,10 @@
+ 新增一条
@@ -110,6 +121,7 @@ import type { UploadChangeParam } from 'ant-design-vue';
import type { UploadProps } from 'ant-design-vue';
// import { uploadShp } from '@/api/sys/analysis.ts'
import axios from 'axios'
+import { v4 as uuidv4 } from 'uuid';
const current = ref(0)
const fileList = ref([]);
@@ -122,6 +134,7 @@ const uploadFrom = reactive({
})
const formRef = ref()
const dataList = ref([])
+const isShp = ref(false)
// todo
const columns = [
{title: 'Shp原始字段',dataIndex: 'name',key: 'name'},
@@ -180,7 +193,7 @@ const submitShp = () => {
"tableName": "aa"
}
let showData = data.heads.map(item => {
- return {...item,refName:item.name.toLowerCase(),initName:item.name}
+ return {...item,refName:item.name.toLowerCase(),initName:item.name,key:uuidv4()}
})
dataList.value = showData
current.value++
@@ -195,9 +208,24 @@ const closeModal = () => {
emits('update:openModal', false)
formRef.value.resetFields()
fileList.value = []
+ current.value = 0
}
const deleteListItem = (record) => {
- dataList.value = dataList.value.filter(item => item.name !== record.name)
+ dataList.value = dataList.value.filter(item => item.key !== record.key)
+}
+const insertListItem = () => {
+ dataList.value.push({
+ key:uuidv4(),
+ name:'',
+ type:'',
+ length:'',
+ refName:'',
+ initName:'',
+ })
+}
+const submitDataList = () => {
+ console.log(dataList.value)
+ current.value++
}
@@ -260,6 +288,24 @@ const deleteListItem = (record) => {
display: flex;
justify-content: flex-end;
}
+ .insert-list-button{
+ background-color: #91b0ff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: #fff;
+ user-select: none;
+ cursor: pointer;
+ height: 30px;
+ border-bottom-left-radius: 10px;
+ border-bottom-right-radius: 10px;
+ font-weight: 400;
+ transition: 1s;
+ }
+ .insert-list-button:hover{
+ font-weight: 900;
+ color:#000;
+ }
}
.submit-success{
.success-content{
diff --git a/src/components/MapboxMaps/LayerComponent/index.vue b/src/components/MapboxMaps/LayerComponent/index.vue
index 861016bc..b05a6c77 100644
--- a/src/components/MapboxMaps/LayerComponent/index.vue
+++ b/src/components/MapboxMaps/LayerComponent/index.vue
@@ -12,8 +12,9 @@
-
-
+
+
-
名称: {{ 111 }}
+
名称: {{ item.name }}
查看数据
操作
@@ -35,16 +36,61 @@
diff --git a/src/components/MapboxMaps/MapboxMap.vue b/src/components/MapboxMaps/MapboxMap.vue
index 5e7346a3..bb6f41ff 100644
--- a/src/components/MapboxMaps/MapboxMap.vue
+++ b/src/components/MapboxMaps/MapboxMap.vue
@@ -1,24 +1,24 @@
-
-
+
+
diff --git a/src/views/demo/form-design/components/VFormItem/index.vue b/src/views/demo/form-design/components/VFormItem/index.vue
index 70290d97..e8844fec 100644
--- a/src/views/demo/form-design/components/VFormItem/index.vue
+++ b/src/views/demo/form-design/components/VFormItem/index.vue
@@ -23,7 +23,6 @@
v-else-if="schema.component == 'Divider' && schema.label && !formItemProps.hiddenLabel"
>{{ schema.label }}
-
123
diff --git a/src/views/demo/form-design/core/formItemConfig.ts b/src/views/demo/form-design/core/formItemConfig.ts
index 305d086a..d3d23f6c 100644
--- a/src/views/demo/form-design/core/formItemConfig.ts
+++ b/src/views/demo/form-design/core/formItemConfig.ts
@@ -8,43 +8,42 @@ import { ComponentType } from '@/components/Form/src/types';
import { componentMap as Cmp } from '../components';
import { Component } from 'vue';
-import { getDeptList,getAccountList,getPosGroupList } from '@/api/demo/system';
+import { getDeptList, getAccountList, getPosGroupList } from '@/api/demo/system';
//获取部门列表数据
-const deptTreeData = await Promise.all([getDeptListData()])
-function getDeptListData(){
+const deptTreeData = await Promise.all([getDeptListData()]);
+function getDeptListData() {
let param = {
page: 1,
- limit: 9999
+ limit: 9999,
};
- return getDeptList( param ).then( data => {
- return data
- })
+ return getDeptList(param).then((data) => {
+ return data;
+ });
}
-
//获取职级列表数据
-const positionTreeData = await Promise.all([getPositionListData()])
-function getPositionListData(){
+const positionTreeData = await Promise.all([getPositionListData()]);
+function getPositionListData() {
let param = {
page: 1,
- limit: 9999
+ limit: 9999,
};
- return getPosGroupList( param ).then( data => {
- return data
- })
+ return getPosGroupList(param).then((data) => {
+ return data;
+ });
}
//获取人员选择列表数据
-const userTreeData = await Promise.all([getUserListData()])
-function getUserListData(){
+const userTreeData = await Promise.all([getUserListData()]);
+function getUserListData() {
let param = {
page: 1,
- limit: 9999
+ limit: 9999,
};
- return getAccountList( param ).then( data => {
- return data.items
- })
+ return getAccountList(param).then((data) => {
+ return data.items;
+ });
}
-
+
const componentMap = new Map
();
//如果有其它控件,可以在这里初始化
@@ -98,7 +97,7 @@ export const customComponents: IVFormComponent[] = [
field: '',
colProps: { span: 24 },
componentProps: {
- fieldNames:{
+ fieldNames: {
children: 'children',
label: 'name',
value: 'id',
@@ -113,7 +112,7 @@ export const customComponents: IVFormComponent[] = [
field: '',
colProps: { span: 24 },
componentProps: {
- fieldNames:{
+ fieldNames: {
children: 'children',
label: 'name',
value: 'id',
diff --git a/src/views/demo/onlineform/formCall/CreateFlow.vue b/src/views/demo/onlineform/formCall/CreateFlow.vue
new file mode 100644
index 00000000..a75fdb38
--- /dev/null
+++ b/src/views/demo/onlineform/formCall/CreateFlow.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/demo/onlineform/formCall/index.vue b/src/views/demo/onlineform/formCall/index.vue
index 2772f826..9b34ccb8 100644
--- a/src/views/demo/onlineform/formCall/index.vue
+++ b/src/views/demo/onlineform/formCall/index.vue
@@ -25,6 +25,16 @@
+
+
+
+
+
diff --git a/src/views/demo/onlineform/formModule/FormModal.vue b/src/views/demo/onlineform/formModule/FormModal.vue
index cc207e56..f369b62c 100644
--- a/src/views/demo/onlineform/formModule/FormModal.vue
+++ b/src/views/demo/onlineform/formModule/FormModal.vue
@@ -181,7 +181,6 @@
let sysModuleElement: any = [];
if (config.table.btns) {
config.table.btns.forEach((t) => {
- console.log(t);
let temp: any = {};
temp.id = '';
temp.domId = t.prop;
diff --git a/src/views/demo/onlineform/formModule/config/columns.vue b/src/views/demo/onlineform/formModule/config/columns.vue
index f4628528..750f72de 100644
--- a/src/views/demo/onlineform/formModule/config/columns.vue
+++ b/src/views/demo/onlineform/formModule/config/columns.vue
@@ -73,7 +73,7 @@
});
// config
- const config = inject('formConfig');
+ const config: any = inject('formConfig');
const columnsData = ref(config.table.columns);
// 展开全部
const columnsTreeRef = ref>(null);
diff --git a/src/views/demo/onlineform/formModule/index.vue b/src/views/demo/onlineform/formModule/index.vue
index 1cb1958c..e8ca4d76 100644
--- a/src/views/demo/onlineform/formModule/index.vue
+++ b/src/views/demo/onlineform/formModule/index.vue
@@ -8,7 +8,8 @@
:searchInfo="searchInfo"
>
- 新增
+
+
@@ -45,7 +46,7 @@