From d61a805aadaaf9a576bb2150e025c7390a27a3d2 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 21 Apr 2025 17:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=81=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=8E=B7=E5=8F=96=E7=9B=B8=E5=85=B3=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitor/datasource/DataSourceDrawer.vue   | 216 +++++++++---------
 .../monitor/datasource/DataSourceModal.vue    | 175 +++++++-------
 .../monitor/datasource/datasource.api.ts      |   6 +
 .../monitor/datasource/datasource.data.ts     |  48 ++--
 src/views/synchronization/directive/index.vue |   2 +-
 .../depart/components/DepartFormModal.vue     |   4 +
 src/views/system/depart/depart.data.ts        |   4 +-
 7 files changed, 238 insertions(+), 217 deletions(-)

diff --git a/src/views/monitor/datasource/DataSourceDrawer.vue b/src/views/monitor/datasource/DataSourceDrawer.vue
index f0dcc5e..6500633 100644
--- a/src/views/monitor/datasource/DataSourceDrawer.vue
+++ b/src/views/monitor/datasource/DataSourceDrawer.vue
@@ -1,13 +1,6 @@
 <template>
-  <BasicDrawer
-    v-bind="$attrs"
-    @register="registerDrawer"
-    :title="getTitle"
-    :width="adaptiveWidth"
-    @ok="handleSubmit"
-    :showFooter="showFooter"
-    destroyOnClose
-  >
+  <BasicDrawer v-bind="$attrs" @register="registerDrawer" :title="getTitle" :width="adaptiveWidth" @ok="handleSubmit"
+    :showFooter="showFooter" destroyOnClose>
     <BasicForm @register="registerForm">
       <template #pwd="{ model, field }">
         <a-row :gutter="8">
@@ -19,11 +12,12 @@
           </a-col>
         </a-row>
       </template>
-      <template #departSelect ="{model,field}">
-        <a-select v-model:value="model[field]" :disabled="model['id']!=null" @change="(value,option) => handleChange(value,model)">
+      <template #departSelect="{ model, field }">
+        <a-select v-model:value="model[field]" :disabled="model['id'] != null"
+          @change="(value, option) => handleChange(value, model)" :allowClear="true">
           <template v-for="item in departOptions" :key="`${item.code}`">
             <a-select-option :value="item.code" :label="item.departName">
-              {{item.departName}}
+              {{ item.departName }}
             </a-select-option>
           </template>
         </a-select>
@@ -33,112 +27,110 @@
 </template>
 
 <script lang="ts" setup>
-  import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
-  import { formSchema } from './datasource.data';
-  import { saveOrUpdateDataSource, getDataSourceById, testConnection, queryDeparts } from './datasource.api';
-  import {useMessage} from "@/hooks/web/useMessage";
-  const { createMessage } = useMessage();
-  // 声明Emits
-  const emit = defineEmits(['success', 'register']);
-  const attrs = useAttrs();
-  const isUpdate = ref(true);
-  const rowId = ref('');
-  let isFormDepartUser = false;
-  //表单配置
-  const [registerForm, { setProps, resetFields, validateFields, getFieldsValue, setFieldsValue, validate, updateSchema }] = useForm({
-    labelWidth: 90,
-    schemas: formSchema,
-    showActionButtonGroup: false,
-  });
-  const showFooter = ref(true);
-  const departOptions = ref<any[]>([]);
-  //表单赋值
-  const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
-    await resetFields();
-    showFooter.value = data?.showFooter ?? true;
-    setDrawerProps({ confirmLoading: false, showFooter: showFooter.value });
-    isUpdate.value = !!data?.isUpdate;
-    if (unref(isUpdate)){
-      await getDepartOptions('');
-    }else{
-      await getDepartOptions('1');
-    }
-
-    if (unref(isUpdate)) {
-
-      //获取详情
-      data.record = await getDataSourceById({ id: data.record.id });
-      //表单赋值
-      await setFieldsValue({
-        ...data.record,
-      });
-    }
-    // 隐藏底部时禁用整个表单
-    setProps({ disabled: !showFooter.value });
-  });
-  //获取标题
-  const getTitle = computed(() => {
-    if (!unref(isUpdate)) {
-      return '新增数据源';
-    } else {
-      return unref(showFooter) ? '编辑数据源' : '数据源详情';
-    }
-  });
-  const { adaptiveWidth } = useDrawerAdaptiveWidth();
-
-  async function getDepartOptions(addFLag){
-    departOptions.value = [];
-    const data = await queryDeparts({ addFLag : addFLag });
-    Object.assign(departOptions.value, data);
+import { defineComponent, ref, computed, unref, useAttrs } from 'vue';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+import { useDrawerAdaptiveWidth } from '/@/hooks/jeecg/useAdaptiveWidth';
+import { formSchema } from './datasource.data';
+import { saveOrUpdateDataSource, getDataSourceById, testConnection, queryDeparts } from './datasource.api';
+import { useMessage } from "@/hooks/web/useMessage";
+const { createMessage } = useMessage();
+// 声明Emits
+const emit = defineEmits(['success', 'register']);
+const attrs = useAttrs();
+const isUpdate = ref(true);
+const rowId = ref('');
+let isFormDepartUser = false;
+//表单配置
+const [registerForm, { setProps, resetFields, validateFields, getFieldsValue, setFieldsValue, validate, updateSchema }] = useForm({
+  labelWidth: 90,
+  schemas: formSchema,
+  showActionButtonGroup: false,
+});
+const showFooter = ref(true);
+const departOptions = ref<any[]>([]);
+//表单赋值
+const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+  await resetFields();
+  showFooter.value = data?.showFooter ?? true;
+  setDrawerProps({ confirmLoading: false, showFooter: showFooter.value });
+  isUpdate.value = !!data?.isUpdate;
+  if (unref(isUpdate)) {
+    await getDepartOptions('');
+  } else {
+    await getDepartOptions('1');
   }
 
-  async function handleChange(value,formData){
-    if(value == null){
-      formData["code"] = "";
-    }else{
-      formData["code"] = value;
-    }
-  }
+  if (unref(isUpdate)) {
 
-  async function handleTest() {
-    let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword'];
-    // 获取以上字段的值，并清除校验状态
-    let fieldsValues = getFieldsValue(keys);
-    let setFields = {};
-    keys.forEach((key) => (setFields[key] = { value: fieldsValues[key], errors: null }));
-    await validateFields(keys).then((values) => {
-      let loading = createMessage.loading('连接中....', 0);
-      testConnection(values)
-        .then((data) => {
-          if (data.success) {
-            createMessage.success('连接成功');
-          }
-        })
-        .catch((error) => {})
-        .finally(() => loading());
+    //获取详情
+    data.record = await getDataSourceById({ id: data.record.id });
+    //表单赋值
+    await setFieldsValue({
+      ...data.record,
     });
   }
-
-  //提交事件
-  async function handleSubmit() {
-    try {
-      let values = await validate();
-      setDrawerProps({ confirmLoading: true });
-      await saveOrUpdateDataSource(values, isUpdate.value);
-      //关闭弹窗
-      closeDrawer();
-      //刷新列表
-      emit('success');
-    } finally {
-      setDrawerProps({ confirmLoading: false });
-    }
+  // 隐藏底部时禁用整个表单
+  setProps({ disabled: !showFooter.value });
+});
+//获取标题
+const getTitle = computed(() => {
+  if (!unref(isUpdate)) {
+    return '新增数据源';
+  } else {
+    return unref(showFooter) ? '编辑数据源' : '数据源详情';
   }
+});
+const { adaptiveWidth } = useDrawerAdaptiveWidth();
+
+async function getDepartOptions(addFLag) {
+  departOptions.value = [];
+  const data = await queryDeparts({ addFLag: addFLag });
+  Object.assign(departOptions.value, data);
+}
+
+async function handleChange(value, formData) {
+  if (value == null) {
+    formData["code"] = "";
+  } else {
+    formData["code"] = value;
+  }
+}
+
+async function handleTest() {
+  let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword'];
+  // 获取以上字段的值，并清除校验状态
+  let fieldsValues = getFieldsValue(keys);
+  let setFields = {};
+  keys.forEach((key) => (setFields[key] = { value: fieldsValues[key], errors: null }));
+  await validateFields(keys).then((values) => {
+    let loading = createMessage.loading('连接中....', 0);
+    testConnection(values)
+      .then((data) => {
+        if (data.success) {
+          createMessage.success('连接成功');
+        }
+      })
+      .catch((error) => { })
+      .finally(() => loading());
+  });
+}
+
+//提交事件
+async function handleSubmit() {
+  try {
+    let values = await validate();
+    setDrawerProps({ confirmLoading: true });
+    await saveOrUpdateDataSource(values, isUpdate.value);
+    //关闭弹窗
+    closeDrawer();
+    //刷新列表
+    emit('success');
+  } finally {
+    setDrawerProps({ confirmLoading: false });
+  }
+}
 
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/monitor/datasource/DataSourceModal.vue b/src/views/monitor/datasource/DataSourceModal.vue
index 523ec0f..7bbc6fc 100644
--- a/src/views/monitor/datasource/DataSourceModal.vue
+++ b/src/views/monitor/datasource/DataSourceModal.vue
@@ -11,11 +11,12 @@
           </a-col>
         </a-row>
       </template>
-      <template #departSelect ="{model,field}">
-        <a-select v-model:value="model[field]" :disabled="model['id']!=null" @change="(value,option) => handleChange(value,model)">
+      <template #departSelect="{ model, field }">
+        <a-select v-model:value="model[field]" :disabled="model['id'] != null"
+          @change="(value, option) => handleChange(value, model)" :allowClear="true">
           <template v-for="item in departOptions" :key="`${item.code}`">
             <a-select-option :value="item.code" :label="item.departName">
-              {{item.departName}}
+              {{ item.departName }}
             </a-select-option>
           </template>
         </a-select>
@@ -24,95 +25,95 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, useForm } from '/@/components/Form/index';
-  import { formSchema } from './datasource.data';
-  import { saveOrUpdateDataSource, getDataSourceById, testConnection, queryDeparts } from './datasource.api';
-  import { useMessage } from '/@/hooks/web/useMessage';
+import { ref, computed, unref } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicForm, useForm } from '/@/components/Form/index';
+import { formSchema } from './datasource.data';
+import { saveOrUpdateDataSource, getDataSourceById, testConnection, queryDeparts } from './datasource.api';
+import { useMessage } from '/@/hooks/web/useMessage';
 
-  const { createMessage } = useMessage();
-  // Emits声明
-  const emit = defineEmits(['register', 'success']);
-  const isUpdate = ref(true);
-  const departOptions = ref<any[]>([]);
-  //表单配置
-  const [registerForm, { getFieldsValue, resetFields, validateFields, setFieldsValue, validate }] = useForm({
-    // labelWidth: 150,
-    schemas: formSchema,
-    showActionButtonGroup: false,
-  });
-  //表单赋值
-  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    //重置表单
-    await resetFields();
+const { createMessage } = useMessage();
+// Emits声明
+const emit = defineEmits(['register', 'success']);
+const isUpdate = ref(true);
+const departOptions = ref<any[]>([]);
+//表单配置
+const [registerForm, { getFieldsValue, resetFields, validateFields, setFieldsValue, validate }] = useForm({
+  // labelWidth: 150,
+  schemas: formSchema,
+  showActionButtonGroup: false,
+});
+//表单赋值
+const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+  //重置表单
+  await resetFields();
 
-    setModalProps({ confirmLoading: false });
-    isUpdate.value = !!data?.isUpdate;
-    if (unref(isUpdate)){
-      await getDepartOptions('');
-    }else{
-      await getDepartOptions('1');
-    }
-    if (unref(isUpdate)) {
-      //获取详情
-      data.record = await getDataSourceById({ id: data.record.id });
-      //表单赋值
-      await setFieldsValue({
-        ...data.record,
-      });
-    }
-  });
-  //设置标题
-  const title = computed(() => (!unref(isUpdate) ? '新增数据源' : '编辑数据源'));
-
-  async function getDepartOptions(addFLag){
-    departOptions.value = [];
-    const data = await queryDeparts({ addFLag : addFLag });
-    console.log(data);
-    Object.assign(departOptions.value, data);
+  setModalProps({ confirmLoading: false });
+  isUpdate.value = !!data?.isUpdate;
+  if (unref(isUpdate)) {
+    await getDepartOptions('');
+  } else {
+    await getDepartOptions('1');
   }
-
-  async function handleChange(value,formData){
-    if(value == null){
-      formData["code"] = "";
-    }else{
-      formData["code"] = value;
-    }
-  }
-
-  async function handleTest() {
-    let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword'];
-    // 获取以上字段的值，并清除校验状态
-    let fieldsValues = getFieldsValue(keys);
-    let setFields = {};
-    keys.forEach((key) => (setFields[key] = { value: fieldsValues[key], errors: null }));
-    await validateFields(keys).then((values) => {
-      let loading = createMessage.loading('连接中....', 0);
-      testConnection(values)
-        .then((data) => {
-          if (data.success) {
-            createMessage.success('连接成功');
-          }
-        })
-        .catch((error) => {})
-        .finally(() => loading());
+  if (unref(isUpdate)) {
+    //获取详情
+    data.record = await getDataSourceById({ id: data.record.id });
+    //表单赋值
+    await setFieldsValue({
+      ...data.record,
     });
   }
+});
+//设置标题
+const title = computed(() => (!unref(isUpdate) ? '新增数据源' : '编辑数据源'));
 
-  //表单提交事件
-  async function handleSubmit(v) {
-    try {
-      let values = await validate();
-      setModalProps({ confirmLoading: true });
-      //提交表单
-      await saveOrUpdateDataSource(values, isUpdate.value);
-      //关闭弹窗
-      closeModal();
-      //刷新列表
-      emit('success');
-    } finally {
-      setModalProps({ confirmLoading: false });
-    }
+async function getDepartOptions(addFLag) {
+  departOptions.value = [];
+  const data = await queryDeparts({ addFLag: addFLag });
+  console.log(data);
+  Object.assign(departOptions.value, data);
+}
+
+async function handleChange(value, formData) {
+  if (value == null) {
+    formData["code"] = "";
+  } else {
+    formData["code"] = value;
   }
+}
+
+async function handleTest() {
+  let keys = ['dbType', 'dbDriver', 'dbUrl', 'dbName', 'dbUsername', 'dbPassword'];
+  // 获取以上字段的值，并清除校验状态
+  let fieldsValues = getFieldsValue(keys);
+  let setFields = {};
+  keys.forEach((key) => (setFields[key] = { value: fieldsValues[key], errors: null }));
+  await validateFields(keys).then((values) => {
+    let loading = createMessage.loading('连接中....', 0);
+    testConnection(values)
+      .then((data) => {
+        if (data.success) {
+          createMessage.success('连接成功');
+        }
+      })
+      .catch((error) => { })
+      .finally(() => loading());
+  });
+}
+
+//表单提交事件
+async function handleSubmit(v) {
+  try {
+    let values = await validate();
+    setModalProps({ confirmLoading: true });
+    //提交表单
+    await saveOrUpdateDataSource(values, isUpdate.value);
+    //关闭弹窗
+    closeModal();
+    //刷新列表
+    emit('success');
+  } finally {
+    setModalProps({ confirmLoading: false });
+  }
+}
 </script>
diff --git a/src/views/monitor/datasource/datasource.api.ts b/src/views/monitor/datasource/datasource.api.ts
index 76a5116..c38c925 100644
--- a/src/views/monitor/datasource/datasource.api.ts
+++ b/src/views/monitor/datasource/datasource.api.ts
@@ -13,6 +13,7 @@ enum Api {
   getByCode = '/sys/dataSource/queryBySysOrgCode',
   // exportXlsUrl = 'sys/dataSource/exportXls',
   // importExcelUrl = 'sys/dataSource/importExcel',
+  validCode = '/sys/dataSource/validCode',
 }
 // /**
 //  * 导出api
@@ -99,3 +100,8 @@ export const queryDeparts = (params) => {
 export const getDataSourceByCode = (params) => {
   return defHttp.get({ url: Api.getByCode, params });
 };
+
+
+export const validCode = (params) => {
+  return defHttp.get({ url: Api.validCode, params });
+};
\ No newline at end of file
diff --git a/src/views/monitor/datasource/datasource.data.ts b/src/views/monitor/datasource/datasource.data.ts
index b0624a1..96d1012 100644
--- a/src/views/monitor/datasource/datasource.data.ts
+++ b/src/views/monitor/datasource/datasource.data.ts
@@ -1,4 +1,5 @@
 import { BasicColumn, FormSchema } from '/@/components/Table';
+import { validCode } from './datasource.api'
 
 const dbDriverMap = {
   // MySQL 数据库
@@ -69,6 +70,12 @@ const dbUrlMap = {
 };
 
 export const columns: BasicColumn[] = [
+  {
+    title: '数据源名称',
+    dataIndex: 'name',
+    width: 150,
+    align: 'left',
+  },
   {
     title: '所属机构',
     dataIndex: 'sysOrgCode_dictText',
@@ -81,12 +88,6 @@ export const columns: BasicColumn[] = [
     width: 150,
     align: 'left',
   },
-  {
-    title: '数据源名称',
-    dataIndex: 'name',
-    width: 150,
-    align: 'left',
-  },
   {
     title: '数据库类型',
     dataIndex: 'dbType_dictText',
@@ -143,11 +144,17 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     show: false,
   },
+  {
+    field: 'name',
+    label: '数据源名称',
+    component: 'Input',
+    required: true,
+  },
   {
     field: 'sysOrgCode',
     label: '所属机构',
     component: 'Input',
-    required: true,
+    required: false,
     slot: 'departSelect',
   },
   {
@@ -155,13 +162,24 @@ export const formSchema: FormSchema[] = [
     label: '数据源编码',
     component: 'Input',
     required: true,
-    dynamicDisabled: true
-  },
-  {
-    field: 'name',
-    label: '数据源名称',
-    component: 'Input',
-    required: true,
+    dynamicDisabled: (val) => {
+      return !!val.model.sysOrgCode;
+    },
+    // dynamicDisabled:true,
+    // rules: [
+    //   {
+    //     validator: async (_, value) => {
+    //       if (!value) return Promise.resolve();
+    //       const res = await validCode({code:value}); 
+
+    //       if (res == 'exist') {
+    //         return Promise.reject('编码已存在！');
+    //       }
+    //       return Promise.resolve();
+    //     },
+    //     trigger: 'blur',
+    //   }
+    // ]
   },
   {
     field: 'dbType',
@@ -230,7 +248,7 @@ export function useDataSourceFormSchema() {
       label: '数据源编码',
       component: 'Input',
       // required: true,
-      dynamicDisabled: true
+      dynamicDisabled: true,
     },
     {
       field: 'name',
diff --git a/src/views/synchronization/directive/index.vue b/src/views/synchronization/directive/index.vue
index 7fefbe9..69ae1d0 100644
--- a/src/views/synchronization/directive/index.vue
+++ b/src/views/synchronization/directive/index.vue
@@ -424,7 +424,7 @@ const handleResetOrg = () => {
 }
 
 onMounted(() => {
-    queryDepartTreeSync().then(res => {
+    queryDepartTreeSync({platType:'ywjg'}).then(res => {
         orgTable.value = res;
     });
 });
diff --git a/src/views/system/depart/components/DepartFormModal.vue b/src/views/system/depart/components/DepartFormModal.vue
index 7376154..0888044 100644
--- a/src/views/system/depart/components/DepartFormModal.vue
+++ b/src/views/system/depart/components/DepartFormModal.vue
@@ -48,6 +48,10 @@
           treeData: props.rootTreeData,
         },
       },
+      {
+        field: 'platType',
+        show: !isChild
+      },
       {
         field: 'orgCode',
         show: false,
diff --git a/src/views/system/depart/depart.data.ts b/src/views/system/depart/depart.data.ts
index 974fff1..e2f5a1b 100644
--- a/src/views/system/depart/depart.data.ts
+++ b/src/views/system/depart/depart.data.ts
@@ -37,10 +37,10 @@ export function useBasicFormSchema() {
       componentProps: { options: [] },
     },
     {
-      field: 'platType_dictText',
+      field: 'platType',
       label: '业务平台类型',
+      defaultValue:'ywjg',
       component: 'JDictSelectTag',
-      defaultValue:"ywjg",
       componentProps: {
         dictCode: 'iz_test_site'
       },