加密规则模块上传

src/api/ruleConfig/encryption.js

+import request from '@/utils/request'
+
+/**
+ * 加密规则 - 查询加密规则列表
+ * @param {*} query 
+ * @returns 
+ */
+export function query(query) {
+  return request({
+    url: '/core/encryption/query',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ * 加密规则 - 查询加密方式列表
+ * @param {*} query 
+ * @returns 
+ */
+export function initEncryptionTypeList(query) {
+  return request({
+    url: '/core/encryption/initEncryptionTypeList',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ * 加密规则 - 获取字典分类
+ * @param {*} query 
+ * @returns 
+ */
+export function getDictinaryTypes(query) {
+  return request({
+    url: '/core/dictionary/getDictinaryTypes',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ * 加密规则 - 新增加密分类
+ * @param {*} data 
+ * @returns 
+ */
+export function save(data) {
+  return request({
+    url: '/core/encryption/save',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 加密规则 - 删除加密分类
+ * @param {*} data 
+ * @returns 
+ */
+export function deleteType(data) {
+  return request({
+    url: '/core/encryption/delete',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 加密规则 - 密钥生成
+ * @param {*} query 
+ * @returns 
+ */
+export function getRandomValue(query) {
+  return request({
+    url: '/core/encryption/getRandomValue',
+    method: 'get',
+    params: query
+  })
+}
+
+/**
+ * 加密规则 - 测试
+ * @param {*} data 
+ * @returns 
+ */
+export function testEncryption(data) {
+  return request({
+    url: '/core/encryption/testEncryption',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 加密规则 - 新增密钥
+ * @param {*} data 
+ * @returns 
+ */
+export function saveSecretKey(data) {
+  return request({
+    url: '/core/encryption/saveSecretKey',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 加密规则 - 删除密钥
+ * @param {*} data 
+ * @returns 
+ */
+export function delSecretKey(data) {
+  return request({
+    url: '/core/encryption/delSecretKey',
+    method: 'post',
+    data: data
+  })
+}

src/views/ruleConfig/Algorithm/index.vue

@@ -36,6 +36,7 @@ const modalPopShow = ref(false)
 // 获取数据
 const getCollapse = (type) => {
   query({ dataarea: searchValue.value }).then(res => {
+    rulenameList.value = []
     const { data } = res
     collapseList.value = data.map(item => {
       const list = item.ruleList.map(itemTwo => {

src/views/ruleConfig/Algorithm/modules/formModule.vue

@@ -101,7 +101,7 @@ const saveFunc = () => {
 
 // 算法名称验证
 const validateRulename = (rule, value, callback) => {
-  if (form.value.id) {
+  if (form.value.id && form.value.rulename === value) {
     callback();
     return false;
   }

src/views/ruleConfig/Discover/modules/AddDomain.vue

@@ -42,7 +42,8 @@ watch(
   () => props.itemData,
   (newVal) => {
     if (props.type === 'edit' && props.itemData) {
-      form.value = JSON.parse(JSON.stringify(props.itemData))
+      const data = JSON.parse(JSON.stringify(props.itemData));
+      form.value = { ...form.value, ...data };
     }
   },
   { deep: true, immediate: true }
@@ -51,8 +52,9 @@ watch(
 // 取消
 const cancel = () => { 
   if (props.type === 'edit') { 
-    form.value = props.itemData
     readOnly.value = true
+    const data = JSON.parse(JSON.stringify(props.itemData));
+    form.value = { ...form.value, ...data };
   } else if (props.type === 'add') { 
     emit('cancel')
     form.value = {}

src/views/ruleConfig/Encryption/modules/AddEncryption.vue

 <script setup lang="ts" name="AddDomain">
-import { onMounted, reactive, ref, toRefs, watch } from "vue";
+import { onMounted, reactive, ref, toRefs, watch, computed } from "vue";
+import type { FormInstance } from "element-plus";
+import { ElMessage } from 'element-plus'
+import { save } from '@/api/ruleConfig/encryption'
 
 const props = defineProps<{
-  modelValue: boolean;
+  itemData: Object;
   type: string;
+  encryptionTypeDict: Array<any>;
+  typeNameDict: any;
 }>();
 
-const emit = defineEmits(["update:modelValue", 'cancel','confirm']);
+const emit = defineEmits(['cancel','confirm']);
 
 const data = reactive({
-  rules: {},
+  form: <any>{
+    
+  },
+  rules: {
+    encryption_type: [
+      {
+        required: true,
+        message: "请选择加密方式",
+        trigger: ["change"],
+      },
+    ],
+  },
 });
 
-const { rules } = toRefs(data);
+const { form, rules } = toRefs(data);
 
 const readOnly = ref(true);
-
-watch(
-  () => props.type,
-  (newVal) => {
-    readOnly.value = props.type  === 'edit' ? true : false;
-  },
-  { deep: true, immediate: true }
-);
+const typeNameList = ref([])
+const encryptionTypeOptions = computed(() => props.encryptionTypeDict)
+const formRef = ref<FormInstance>();
 
 // 取消
 const cancel = () => { 
   if (props.type === 'edit') { 
     readOnly.value = true
-  }else if (props.type === 'add') { 
+     const data = JSON.parse(JSON.stringify(props.itemData));
+    form.value = { ...form.value, ...data };
+  } else if (props.type === 'add') { 
     emit('cancel')
+    form.value = {}
   }
 }
 
 const confirm = () => {
+  formRef.value?.validate((valid) => {
+    if (valid) {
+      addDataFun()
+    } else {
+    }
+  });
+}
+
+// 添加加密分类
+const addDataFun = () => {
+  if (props.type === 'edit') { 
+    form.value = {...form.value,...{id: form.value.id}}
+  }
+  save(form.value).then(res => {
+    const { flag } = res
+    if (flag) {
+      ElMessage.success((props.type === "add" || !form.value.id) ? "新增成功" : "修改成功");
       if (props.type === 'edit') {
         readOnly.value = true
+      } else if (props.type === 'add') { 
+        form.value = {}
+      }
+      emit('confirm', props.type)
     }
-  emit('confirm')
+  })
 }
 
+// 分类称验证
+const validateRulename = (rule, value, callback) => {
+  const state = typeNameList.value.includes(value);
+  if (state) {
+    callback(new Error('加密名称已存在'));
+  } else {
+    callback();
+  }
+};
 
+watch(
+  () => props.type,
+  (newVal) => {
+    readOnly.value = props.type  === 'edit' ? true : false;
+  },
+  { deep: true, immediate: true }
+);
+
+watch(
+  () => props.itemData,
+  (newVal) => {
+    if (props.type === 'edit' && props.itemData) {
+      const data = JSON.parse(JSON.stringify(props.itemData));
+      form.value = { ...form.value, ...data };
+    }
+  },
+  { deep: true, immediate: true }
+);
+
+watch(
+  () => props.typeNameDict,
+  (newVal) => {
+    typeNameList.value = props.typeNameDict
+    if (props.type === 'edit' && props.itemData) {
+      typeNameList.value = typeNameList.value.filter(item => item !== props.itemData.encryption_name)
+    }
+  },
+  { deep: true, immediate: true }
+);
 </script>
 
 <template>
   <div>
-    <el-form ref="formRef" :model="modelValue" label-width="100px" :disabled="readOnly">
-      <el-form-item label="加密名称" required>
-        <el-input v-model="modelValue.name"></el-input>
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="100px" :disabled="readOnly">
+      <el-form-item label="加密名称" prop="encryption_name" required :rules="[{ required: true, message: '请输入加密名称', trigger:'blur' },{ required: true, validator: validateRulename, trigger:'blur' }]">
+        <el-input v-model="form.encryption_name"></el-input>
       </el-form-item>
-      <el-form-item label="加密方式" required>
+      <el-form-item label="加密方式" prop="encryption_type" required>
         <div style="width: 100%;background: #F3F5FA;">
-          <el-input v-model="modelValue.name" v-if="readOnly"></el-input>
-          <el-select v-model="modelValue.name" v-if="!readOnly">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          <el-select v-model="form.encryption_type">
+            <el-option v-for="item in encryptionTypeOptions" :key="item.value" :label="item.text" :value="item.value">
             </el-option>
           </el-select>
         </div>
       </el-form-item>
       <el-form-item label="备注">
-        <el-input type="textarea" rows="4" v-model="modelValue.name"></el-input>
+        <el-input type="textarea" rows="4" v-model="form.note"></el-input>
       </el-form-item>
     </el-form>
     <div class="btn">
@@ -76,4 +148,9 @@ const confirm = () => {
   display: flex;
   justify-content: center;
 }
+:deep(.el-form-item__error) {
+  left: auto;
+  right: 30px;
+  top: 24%;
+}
 </style>
\ No newline at end of file

src/views/ruleConfig/Encryption/modules/AddKey.vue

 <script setup lang="ts" name="AddRules">
-import { onMounted, reactive, ref, toRefs, watch } from "vue";
-import { Switch } from "view-ui-plus";
+import { onMounted, reactive, ref, toRefs, watch, computed } from "vue";
+import type { FormInstance } from "element-plus";
+import { ElMessage } from "element-plus";
+import { getRandomValue, testEncryption, saveSecretKey } from '@/api/ruleConfig/encryption'
 
 const props = defineProps<{
-  modelValue: boolean;
+  itemData: Object;
   type: string;
+  encryptionTypeDict: Array<any>;
+  keyNameDict: any;
 }>();
 
-const emit = defineEmits(["update:modelValue", "cancel", "confirm"]);
+const emit = defineEmits(['cancel','confirm']);
 
 const data = reactive({
-  rules: {},
-});
-
-const { rules } = toRefs(data);
+  form: <any>{
     
-const readOnly = ref(true);
-const radio = ref(1);
-const radioOptions = ref([
-  {
-    label: "正则表达式",
-    value: 1,
   },
+  rules: {
+    sectet_key_value: [
       {
-    label: "自定义方法",
-    value: 2,
+        required: true,
+        message: "密钥值不能为空",
+        trigger: ["change"],
       },
-  {
-    label: "字典发现",
-    value: 3,
+    ],
   },
-]);
+});
+
+const { form, rules } = toRefs(data);
+
+const readOnly = ref(true);
+const testParam = ref(""); // 测试参数
+const encryptedValue = ref(""); // 加密后的值
+const formRef = ref<FormInstance>();
+const keyNameList = ref([])
 
-watch(
-  () => props.type,
-  (newVal) => {
-    readOnly.value = props.type === "edit" ? true : false;
-  },
-  { deep: true, immediate: true }
-);
 // 取消
 const cancel = () => {
   if (props.type === "edit") {
     readOnly.value = true;
+    const data = JSON.parse(JSON.stringify(props.itemData));
+    form.value = { ...form.value, ...data };
   } else if (props.type === "add") {
     emit("cancel");
   }
 };
 
 const confirm = () => {
-  if (props.type === "edit") {
-    readOnly.value = true;
+  formRef.value?.validate((valid) => {
+    if (valid) {
+      saveSecretKeyFun()
+    } else {
+    }
+  });
+};
+
+// 添加密钥
+const saveSecretKeyFun = () => {
+  const { encryption_id, secret_key_name, sectet_key_value, id } = form.value;
+  let data = {
+    encryption_id: encryption_id,
+    secret_key_name: secret_key_name,
+    sectet_key_value: sectet_key_value,
+  }
+  if (props.type === 'edit') { 
+    data = {...data,...{id: id}}
   }
-  emit("confirm");
+  saveSecretKey(data).then(res => {
+    const { flag } = res
+    if (flag) {
+      ElMessage.success((props.type === "add" || !form.value.id) ? "新增成功" : "修改成功");
+      if (props.type === 'edit') {
+        readOnly.value = true
+      } else if (props.type === 'add') { 
+        form.value = {}
+      }
+      testParam.value = ""
+      encryptedValue.value = ""
+      emit('confirm', props.type)
+    }
+  })
+}
+
+// 密钥生成
+const getKeyGeneration = () => {
+  const { encryption_type } = form.value;
+  getRandomValue({ type: encryption_type}).then((res) => {
+    const { flag, data } = res;
+    if (flag){
+      form.value.sectet_key_value = data;
+    }
+  });
 };
+
+// 测试
+const getKeyText = () => {
+  const { encryption_type } = form.value;
+  if (!encryption_type) {
+    return ElMessage.error("密钥值不能为空！");
+  }
+  const data = {
+    param: testParam.value,
+    type: encryption_type,
+    secret_key: form.value.sectet_key_value,
+  }
+  testEncryption(data).then((res) => {
+    const { flag, data } = res;
+    if (flag){
+      encryptedValue.value = data;
+    }
+  });
+}
+
+// 分类称验证
+const validateRulename = (rule, value, callback) => {
+  const state = keyNameList.value.includes(value);
+  if (state) {
+    callback(new Error('加密名称已存在'));
+  } else {
+    callback();
+  }
+};
+
+watch(
+  () => props.type,
+  (newVal) => {
+    readOnly.value = props.type === "edit" ? true : false;
+  },
+  { deep: true, immediate: true }
+);
+
+watch(
+  () => props.itemData,
+  (newVal) => {
+    if (props.itemData) {
+      const data = JSON.parse(JSON.stringify(props.itemData));
+      form.value = { ...form.value, ...data };
+    }
+  },
+  { deep: true, immediate: true }
+);
+
+watch(
+  () => props.keyNameDict,
+  (newVal) => {
+    keyNameList.value = props.keyNameDict
+    if (props.type === 'edit' && props.itemData) {
+      keyNameList.value = keyNameList.value.filter(item => item !== props.itemData.secret_key_name)
+    }
+  },
+  { deep: true, immediate: true }
+);
 </script>
 
 <template>
   <div>
-    <el-form ref="formRef" :model="modelValue" label-width="100px" :disabled="readOnly">
-      <el-form-item label="密钥名称" required>
-        <el-input v-model="modelValue.name"></el-input>
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="100px" :disabled="readOnly">
+      <el-form-item label="密钥名称" prop="secret_key_name" required :rules="[{ required: true, message: '请输入加密名称', trigger:'blur' },{ required: true, validator: validateRulename, trigger:'blur' }]">
+        <el-input v-model="form.secret_key_name"></el-input>
       </el-form-item>
       <el-form-item label="加密算法">
-        <el-input v-model="modelValue.name" disabled></el-input>
+        <el-input v-model="form.encryption_name" disabled></el-input>
       </el-form-item>
-      <el-form-item label="密钥值" required>
+      <el-form-item label="密钥值" prop="sectet_key_value" required>
         <div style="width: 100%;display: flex;align-items: center;">
-          <el-input v-model="modelValue.name" style="flex: 1;"></el-input>
-          <el-button type="primary" style="margin-left: 8px;" v-if="!readOnly">密钥生成</el-button>
+          <el-input v-model="form.sectet_key_value" disabled style="flex: 1;"></el-input>
+          <el-button type="primary" style="margin-left: 8px;" @click="getKeyGeneration" v-if="!readOnly">密钥生成</el-button>
         </div>
       </el-form-item>
       <el-form-item label="测试">
         <div style="width: 100%;display: flex;align-items: center;">
-          <el-input v-model="modelValue.name" style="flex: 1;"></el-input>
-          <el-button type="primary" style="margin-left: 8px;" v-if="!readOnly">测试</el-button>
+          <el-input v-model="testParam" style="flex: 1;"></el-input>
+          <el-button type="primary" style="margin-left: 8px;" @click="getKeyText" v-if="!readOnly">测试</el-button>
         </div>
       </el-form-item>
       <el-form-item label="加密后的值">
-        <el-input v-model="modelValue.name" disabled></el-input>
+        <el-input v-model="encryptedValue" disabled></el-input>
       </el-form-item>
     </el-form>
     <div class="btn">
@@ -91,7 +189,7 @@ const confirm = () => {
 
 <style lang="scss" scoped>
 .el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 15px;
 }
 .btn {
   padding: 20px;