shaogen1995 il y a 3 ans
Parent
commit
96e211ef2c

+ 2 - 2
src/main.js

@@ -11,7 +11,7 @@ import './assets/base.css'
 const MixIUser = {
   data() {
     return {
-      MixIsAdmin: null
+      MixId: null
     };
   },
   created() {
@@ -19,7 +19,7 @@ const MixIUser = {
     let userInfo = localStorage.getItem("Yun_User")
     if (userInfo) {
       userInfo = JSON.parse(userInfo)
-      this.MixIsAdmin = userInfo.isAdmin
+      this.MixId = userInfo.id
     }
   },
 }

+ 3 - 1
src/views/Tab1/index.vue

@@ -34,6 +34,8 @@
         </el-table-column>
         <el-table-column prop="name" label="项目名"> </el-table-column>
         <el-table-column prop="remark" label="备注"> </el-table-column>
+        <el-table-column prop="id" label="对象id" width="80"></el-table-column>
+        <el-table-column prop="appId" label="appId" width="400"> </el-table-column>
         <el-table-column label="操作">
           <template #default="{ row }">
             <el-button
@@ -43,7 +45,7 @@
             >
             <el-button type="text" @click="editProject(row.id)">编辑</el-button>
             <el-button
-              v-if="MixIsAdmin==1"
+              v-if="MixId==row.creatorId"
               type="text"
               style="color: #f56c6c"
               @click="delProject(row.id)"

+ 7 - 2
src/views/Tab2/index.vue

@@ -26,7 +26,7 @@
       </div>
       <div class="right">
         <el-button
-          v-if="MixIsAdmin==1"
+          
           type="danger"
           :disabled="selecArr.length === 0"
           @click="delTablet"
@@ -43,7 +43,7 @@
         style="width: 100%"
         @selection-change="selecChange"
       >
-        <el-table-column type="selection" width="55" v-if="MixIsAdmin==1"> </el-table-column>
+        <el-table-column type="selection" width="55" :selectable='selectableSe'> </el-table-column>
         <el-table-column label="序号" width="80">
           <template slot-scope="scope">
             {{ scope.$index + (pageData.pageNum - 1) * pageData.pageSize + 1 }}
@@ -51,6 +51,7 @@
         </el-table-column>
         <el-table-column prop="name" label="表名"> </el-table-column>
         <el-table-column prop="remark" label="备注"> </el-table-column>
+        <el-table-column prop="id" label="对象id" width="80"></el-table-column>
         <el-table-column label="操作">
           <template #default="{ row }">
             <el-button
@@ -109,6 +110,10 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    // 禁用选中
+    selectableSe(row){
+      return row.creatorId==this.MixId
+    },
     // 点击删除项目
     async delTablet() {
       this.$confirm("确定删除吗?", "提示", {

+ 9 - 4
src/views/Tab3/Dialog.vue

@@ -82,8 +82,8 @@ export default {
         name: [
           { required: true, message: "不能为空", trigger: "blur" },
           {
-            pattern: /^\w+$/,
-            message: "只能输入字母,下划线,数字",
+            pattern: /^(?![0-9]+$)(?![a-zA-Z]$)[A-Za-z_][A-Za-z_0-9]{0,}$/,
+            message: "只能输入字母,下划线或数字,数字不能在首位",
             trigger: "blur",
           },
         ],
@@ -111,11 +111,11 @@ export default {
         : "";
       if (this.ruleForm.type === "int") {
         if (Number(value) > 8) this.ruleForm.length = 8;
-        if(Number(value) <= 0) this.ruleForm.length = 1;
+        if (Number(value) <= 0) this.ruleForm.length = 0;
       }
       if (this.ruleForm.type === "varchar") {
         if (Number(value) > 512) this.ruleForm.length = 512;
-        if(Number(value) <= 0) this.ruleForm.length = 1;
+        if (Number(value) <= 0) this.ruleForm.length = 0;
       }
     },
     // 点击取消
@@ -124,6 +124,11 @@ export default {
       this.$emit("update:dialogVisible", false);
     },
     async btnOk() {
+      if (
+        Number(this.ruleForm.length) <= 0 &&
+        this.ruleForm.type !== "datetime"
+      )
+        return this.$message.warning("字段长度不能为0");
       try {
         await this.$refs.ruleForm.validate();
         let obj = { ...this.ruleForm, length: Number(this.ruleForm.length) };

+ 7 - 2
src/views/Tab3/index.vue

@@ -25,7 +25,6 @@
       </div>
       <div class="right">
         <el-button
-          v-if="MixIsAdmin==1"
           type="danger"
           :disabled="selecArr.length === 0"
           @click="delField"
@@ -42,7 +41,8 @@
         style="width: 100%"
         @selection-change="selecChange"
       >
-        <el-table-column type="selection" width="55" v-if="MixIsAdmin==1"> </el-table-column>
+        <el-table-column type="selection" width="55" :selectable="selectableSe">
+        </el-table-column>
         <el-table-column label="序号" width="80">
           <template slot-scope="scope">
             {{ scope.$index + (pageData.pageNum - 1) * pageData.pageSize + 1 }}
@@ -50,6 +50,7 @@
         </el-table-column>
         <el-table-column prop="name" label="字段名"> </el-table-column>
         <el-table-column prop="remark" label="备注"> </el-table-column>
+        <el-table-column prop="id" label="对象id" width="80"></el-table-column>
         <el-table-column prop="type" label="字段类型"> </el-table-column>
         <el-table-column prop="length" label="字段长度"> </el-table-column>
         <el-table-column prop="isQuery" label="搜索字段"> </el-table-column>
@@ -102,6 +103,10 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    // 禁用选中
+    selectableSe(row) {
+      return row.creatorId == this.MixId;
+    },
     // 点击删除项目
     async delField() {
       this.$confirm("确定删除吗?", "提示", {

+ 1 - 0
src/views/Tab4/index.vue

@@ -23,6 +23,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="name" label="项目名"> </el-table-column>
+        <el-table-column prop="id" label="对象id" width="80"></el-table-column>
         <el-table-column prop="appId" label="appId"> </el-table-column>
         <el-table-column prop="remark" label="备注"> </el-table-column>
         <el-table-column label="操作">

+ 1 - 1
src/views/Tab5/index.vue

@@ -36,7 +36,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="name" label="表名"> </el-table-column>
-        <el-table-column prop="id" label="业务id"> </el-table-column>
+        <el-table-column prop="id" label="对象id" width="80"></el-table-column>
         <el-table-column prop="remark" label="备注"> </el-table-column>
         <el-table-column label="操作">
           <template #default="{ row }">

+ 13 - 2
src/views/Tab6/index.vue

@@ -25,7 +25,6 @@
       </div>
       <div class="right">
         <el-button
-          v-if="MixIsAdmin==1"
           type="danger"
           :disabled="selecArr.length === 0"
           @click="recordDel"
@@ -40,7 +39,13 @@
         style="width: 100%"
         @selection-change="selecChange"
       >
-        <el-table-column type="selection" width="55" fixed v-if="MixIsAdmin==1"> </el-table-column>
+        <el-table-column
+          type="selection"
+          width="55"
+          fixed
+          :selectable="selectableSe"
+        >
+        </el-table-column>
         <el-table-column label="序号" width="80" fixed>
           <template slot-scope="scope">
             {{ scope.$index + (pageData.pageNum - 1) * pageData.pageSize + 1 }}
@@ -106,6 +111,12 @@ export default {
   watch: {},
   //方法集合
   methods: {
+    // 禁用选中
+    selectableSe(row) {
+      console.log(row);
+      return row.creator_id == this.MixId;
+    },
+
     // 点击新增数据
     addData() {
       this.$router.push(`/Layout/tab6Add/${this.tableId}`);

+ 1 - 0
src/views/Tab7/List.vue

@@ -50,6 +50,7 @@
         </el-table-column>
         <el-table-column prop="ip" label="ip"> </el-table-column>
         <el-table-column prop="remark" label="备注"> </el-table-column>
+        <el-table-column prop="id" label="对象id" width="80"></el-table-column>
         <el-table-column label="操作">
           <template #default="{ row }">
             <el-button

+ 2 - 0
src/views/Tab7/index.vue

@@ -24,6 +24,8 @@
         </el-table-column>
         <el-table-column prop="name" label="项目名"> </el-table-column>
         <el-table-column prop="remark" label="备注"> </el-table-column>
+        <el-table-column prop="id" label="对象id" width="80"></el-table-column>
+        <el-table-column prop="appId" label="appId" width="400"> </el-table-column>
         <el-table-column label="操作">
           <template #default="{ row }">
             <el-button

+ 1 - 0
src/views/Tab8/index.vue

@@ -41,6 +41,7 @@
             {{ row.isEnabled ? "启用" : "禁用" }}
           </template>
         </el-table-column>
+        <el-table-column prop="id" label="对象id" width="80"></el-table-column>
         <el-table-column label="操作">
           <template #default="{ row }">
             <el-button