1211xx版本管理

src/views/dataAdmin/dataAdmin/sysDic.ts

@@ -110,16 +110,13 @@ export const ApplProcesses = [
 
 function getVersionData() {
   return new Promise((resolve, reject) => {
-    getVersionList({
-      1: session.getItem('tokenV2'),
-      2: JSON.stringify({}),
-      3: 1,
-      4: 10000000
-    }).then(res => {
-      let resData = JSON.parse(res.result)
-      resData.items.map(i => { i.label = i.name, i.value = i.vid });
-      console.log("版本管理列表:", resData.items)
-      resolve(resData.items)
+    getVersionList().then(res => {
+      // let resData = JSON.parse(res.result)
+      // resData.items.map(i => { i.label = i.name, i.value = i.vid });
+      // console.log("版本管理列表:", resData.items)
+      // resolve(resData.items)
+      let resData = res.datas.pageData
+      resolve(resData)
     })
   })
 }

src/views/dataAdmin/dataAdmin/version/VersionManageModal.vue

@@ -1,11 +1,11 @@
 <template>
-    <BasicModal :maskClosable="false" :width="440" @register="registerModal" v-bind="$attrs" :title="getTitle"
+    <BasicModal :maskClosable="false" :width="440" @register="registerModal" v-bind="$attrs" :title="getTitle" centered
         @ok="handleSubmit">
         <BasicForm @register="registerForm" />
     </BasicModal>
 </template>
 <script>
-import { defineComponent, reactive, ref, onMounted, watch } from 'vue';
+import { defineComponent, reactive, ref, onMounted, watch, computed } from 'vue';
 import { BasicModal, useModalInner } from '/@/components/Modal';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { message } from 'ant-design-vue';
@@ -20,78 +20,87 @@ export default defineComponent({
     setup(_, { emit }) {
         const modalStatus = ref('add');
         const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-            console.log('data', data);
+            console.log(data)
+            resetForm();
+            if (data.status === 'add') {
+                updateSchema({ field: 'addType', show: true })
+            } else if (data.status === 'edit') {
+                updateSchema([
+                    { field: 'addType', show: false }
+                ])
+                setFieldsValue({ ...data.form })
+            } else {
+                updateSchema([
+                    { field: 'addType', show: false },
+                    { field: 'version_NAME', componentProps: { disabled: true } },
+                    { field: 'version_DISP', componentProps: { disabled: true } }
+                ])
+                setFieldsValue({ ...data.form })
+            }
+            modalStatus.value = data.status;
         });
         const [registerForm, { setFieldsValue, updateSchema, resetFields, validate, getFieldsValue }] = useForm({
-            labelWidth: 100,
+            // labelWidth: 100,
             schemas: formSchema,
-            showActionButtonGroup: false,
-            actionColOptions: {
-                span: 18,
-            }
+            labelCol: { span: 6 },
+            wrapperCol: { span: 16 },
+            showActionButtonGroup: false
         });
         const getTitle = computed(() => {
-            if (modalStatus.value==='add') {
+            if (modalStatus.value === 'add') {
                 return '新增版本';
             }
-            if (modalStatus.value==='edit') {
+            if (modalStatus.value === 'edit') {
                 return '编辑版本';
             }
-            else{
+            else {
                 return '查看版本';
             }
         });
-
-        onMounted(() => {
-        })
+        const resetForm = () => {
+            resetFields();
+            updateSchema([
+                { field: 'addType', show: true },
+                { field: 'version_NAME', show: true, componentProps: { disabled: false } },
+                { field: 'version_NAME_1', show: false, componentProps: { disabled: false } },
+                { field: 'version_DISP', componentProps: { disabled: false } }
+            ])
+        }
         // 提交信息
         const handleSubmit = () => {
-            validate().then(async (res) => {
-                if (res) {
-                    console.log('res', res);
-                    // 关闭弹窗
-                    closeModal();
-                    // 触发父组件事件
-                    emit('success', res);
-                }
-            });
-            // formRef.value.validate().then(() => {
-            //     //此处调用新增
-            //     if (title.value === '新增版本') {
-            //         let { name, description } = form
-            //         //新增版本
-            //         let param = {
-            //             1: session.getItem('tokenV2'),
-            //             2: JSON.stringify({ name: name, description: description })
-            //         }
-            //         saveVersion(param).then(res => {
-            //             if (res.status === "0") {
-            //                 message.success('操作成功')
-            //                 resetForm()
-            //                 emit('onSubmit', true)
-            //             } else {
-            //                 message.error('操作失败')
-            //             }
-            //         })
-            //     } else {
-            //         form.updateTime = moment().format('YYYY-MM-DD HH:mm:ss')
-            //         let param = {
-            //             1: session.getItem('tokenV2'),
-            //             2: JSON.stringify(form)
-            //         }
-            //         saveVersion(param).then(res => {
-            //             if (res.status === "0") {
-            //                 message.success('操作成功')
-            //                 resetForm()
-            //                 emit('onSubmit', true)
-            //             } else {
-            //                 message.error('操作失败')
-            //             }
-            //         })
-            //     }
-            // }).catch((error) => {
-            //     console.log('error', error);
-            // });
+            if (modalStatus.value === 'add') {
+                validate().then(async (res) => {
+                    if (res) {
+                        const { version_NAME, version_DISP } = JSON.parse(JSON.stringify(res));
+                        await saveVersion({ version: { version_NAME, version_DISP } }).then((saveRes) => {
+                            console.log(saveRes)
+                        })
+                        console.log('res', res);
+                        // 关闭弹窗
+                        closeModal();
+                        // 触发父组件事件
+                        emit('success', res);
+                    }
+                });
+            } else if (modalStatus.value === 'edit') {
+                validate().then(async (res) => {
+                    if (res) {
+                        const { fid, version_NAME, version_DISP } = JSON.parse(JSON.stringify(res));
+                        await saveVersion({ version: { fid, version_NAME, version_DISP } }).then((saveRes) => {
+                            console.log(saveRes)
+                        })
+                        console.log('res', res);
+                        // 关闭弹窗
+                        closeModal();
+                        // 触发父组件事件
+                        emit('success', res);
+                    }
+                })
+            } else {
+                closeModal();
+                // 触发父组件事件
+                emit('success', res);
+            }
         };
         return {
             registerModal,

src/views/dataAdmin/dataAdmin/version/index.vue

@@ -70,55 +70,9 @@ export default defineComponent({
         const [registerModal, { openModal }] = useModal();
         const data = reactive({
             searchValue: "",//查询值
-            formData: {
-                dataVersionConfs: [],
-                description: "",
-                insertTime: "",
-                name: "",
-                type: "",
-                updateTime: "",
-                vid: "",
-            },
             ifShowModal: false,
             versionId: ''
         });
-        //资源列表数据
-        const sourcesData = reactive({
-            sourcesTableData: [],//资源表格数据
-            sourcesColumns: [
-                {
-                    title: '资源ID',
-                    align: 'center',
-                    dataIndex: 'rid',
-                    key: 'rid'
-                },
-                {
-                    title: '版本号',
-                    align: 'center',
-                    dataIndex: 'versionNum',
-                    key: 'versionNum'
-                },
-                {
-                    title: '最新版本',
-                    align: 'center',
-                    dataIndex: 'isNew',
-                    key: 'isNew'
-                },
-                {
-                    title: '发布时间',
-                    align: 'center',
-                    dataIndex: 'insertTime',
-                    key: 'insertTime'
-                },
-                {
-                    title: '修改时间',
-                    align: 'center',
-                    dataIndex: 'updateTime',
-                    key: 'updateTime'
-                },
-            ],
-            sourcesTableTitle: "",
-        })
         //获取所有标签
         const getVersionData = () => {
             return new Promise((resolve, reject) => {
@@ -127,11 +81,17 @@ export default defineComponent({
                 }
                 getVersionList(params).then(res => {
                     if (res.resp_code === 0 && res.datas) {
-                        let resData = []
-                        for (let key in res.datas) {
-                            resData.concat(res.datas[key])
-                        }
-                        resolve(resData)
+                        // resolve(res.datas.pageData)
+                        resolve([
+                            {
+                                fid: "12312",
+                                version_NAME: '版本1',
+                                version_NO: 'V1.0',
+                                version_DISP: '说明',
+                                updateTime: '2023-12-11 00:00:00',
+                                insertTime: '2023-12-11 00:00:00'
+                            }
+                        ])
                     }
                     else {
                         resolve([])
@@ -145,14 +105,20 @@ export default defineComponent({
             {
                 title: '版本名称',
                 align: 'center',
-                dataIndex: 'name',
-                key: 'name'
+                dataIndex: 'version_NAME',
+                key: 'version_NAME'
+            },
+            {
+                title: '版本号',
+                align: 'center',
+                dataIndex: 'version_NO',
+                key: 'version_NO'
             },
             {
-                title: '版本说明',
+                title: '版本号',
                 align: 'center',
-                dataIndex: 'description',
-                key: 'description'
+                dataIndex: 'version_DISP',
+                key: 'version_DISP'
             },
             {
                 title: '发布时间',
@@ -184,25 +150,24 @@ export default defineComponent({
         //新增
         const handleAdd = () => {
             openModal(true, {
-                status: 'add'
+                status: 'add',
+                form: {}
             });
         }
         //查看
-        const handleLook = (id) => {
+        const handleLook = (record) => {
+            const { fid, version_NAME, version_NO, version_DISP } = record;
             openModal(true, {
                 status: 'look',
-                form: {
-
-                }
+                form: { fid, version_NAME, version_NO, version_DISP }
             });
         }
         //修改
-        const handleEdit = () => {
+        const handleEdit = (record) => {
+            const { fid, version_NAME, version_NO, version_DISP } = record;
             openModal(true, {
                 status: 'edit',
-                form: {
-
-                }
+                form: { fid, version_NAME, version_NO, version_DISP }
             });
         }
         //删除单个数据
@@ -265,7 +230,7 @@ export default defineComponent({
             pagination: {
                 hideOnSinglePage: false
             },
-            rowKey: (record) => record.vid,
+            rowKey: (record) => record.fid,
             actionColumn: {
                 width: 200,
                 title: '操作',
@@ -280,7 +245,6 @@ export default defineComponent({
             columns,
             hasSelected,
             ...toRefs(data),
-            ...toRefs(sourcesData),
             // func
             registerTable,
             registerModal,

src/views/dataAdmin/dataAdmin/version/version.data.ts

@@ -19,10 +19,7 @@ export const formSchema: FormSchema[] = [
         field: 'fid',
         label: '版本id',
         component: 'Input',
-        show: false,
-        componentProps: {
-            disabled: true
-        },
+        show: false
     },
     {
         field: 'addType',
@@ -30,17 +27,31 @@ export const formSchema: FormSchema[] = [
         component: 'RadioGroup',
         show: true,
         required: true,
-        componentProps: {
-            option: [
-                {
-                    label: '新增版本',
-                    value: '0'
+        defaultValue: '0',
+        componentProps({ formActionType }) {
+            const { updateSchema } = formActionType;
+            return {
+                options: [
+                    {
+                        label: '新增版本',
+                        value: '0'
+                    },
+                    {
+                        label: '已有版本',
+                        value: '1'
+                    }
+                ],
+                onChange(event: ChangeEvent) {
+                    if ((event.target as HTMLInputElement).value === "0") {
+                        updateSchema({ field: 'version_NAME', show: true })
+                        updateSchema({ field: 'version_NAME_1', show: false })
+                    } else {
+                        updateSchema({ field: 'version_NAME', show: false })
+                        updateSchema({ field: 'version_NAME_1', show: true })
+                    }
                 },
-                {
-                    label: '已有版本',
-                    value: '1'
-                }
-            ]
+                disabled: false
+            };
         },
     },
     {
@@ -56,7 +67,7 @@ export const formSchema: FormSchema[] = [
         },
     },
     {
-        field: 'version_NAME',
+        field: 'version_NAME_1',
         label: '版本名称',
         component: 'ApiSelect',
         show: false,
@@ -72,7 +83,7 @@ export const formSchema: FormSchema[] = [
         label: '版本号',
         component: 'Input',
         show: true,
-        required: true,
+        required: false,
         componentProps: {
             maxLength: 36,
             placeholder: '自动生成版本号',
@@ -83,6 +94,7 @@ export const formSchema: FormSchema[] = [
         field: 'version_DISP',
         label: '备注',
         component: 'Input',
+        show: true,
         componentProps: {
             maxLength: 255,
             disabled: false