样式修改

ruoyi-ui/src/components/updateModule/k-form-design/packages/components/KFormDesign/module/formItemProperties.vue

@@ -580,6 +580,7 @@ const ASwitch = pluginManager.getComponent("switch").component;
 
 export default {
   name: "formItemProperties",
+  dicts: ["base_table"],
   components: {
     KChangeOption,
     kCheckbox,
@@ -703,10 +704,15 @@ export default {
     },
     getFormList() {
       let par = {
-        ... this.$store.state.user.dataSource
-      }
-      getFormName(par).then(res=>{
-        this.formList.formName = res.data
+        ...this.$store.state.user.dataSource,
+      };
+      getFormName(par).then((res) => {
+        console.log(this.dict.type.base_table);
+        this.formList.formName = res.data.filter(item => {
+          return !this.dict.type.base_table.some(val => {
+            return val.value==item.tableName
+          })
+        });
       });
     },
     getListName(item) {

ruoyi-ui/src/views/tableMange/index.vue

@@ -370,7 +370,7 @@
           class-name="small-padding fixed-width"
         >
           <!-- <template slot-scope="scope"> -->
-          <template slot-scope="scope">
+          <template>
             <!-- <el-button
               size="mini"
               type="text"

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -403,7 +403,6 @@ export default {
     },
     // 分页查询
     pageList(row) {
-      console.log(row);
       // 调用子组件-》携带子组件参数请求后台
       this.$refs.mychild.pageList(
         row == undefined
@@ -441,8 +440,6 @@ export default {
       // this.reset();
       this.defaultValue = {};
       getInfoBySqlKey(this.sqlkey).then(({ data }) => {
-        // const htmlCode = data.dfHtmlTemplate;
-        // this.iframeUrl = "data:text/html;charset=utf-8," + encodeURI(htmlCode);
         if (!data || !data.dfVueTemplate) {
           this.$message.error("当前表格未绑定表单!");
           return;
@@ -459,8 +456,6 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       getInfoBySqlKey(this.sqlkey).then(({ data }) => {
-        // const htmlCode = data.dfHtmlTemplate;
-        // this.iframeUrl = "data:text/html;charset=utf-8," + encodeURI(htmlCode);
         if (!data || !data.dfVueTemplate) {
           this.$message.error("当前表格未绑定表单!");
           return;
@@ -514,7 +509,6 @@ export default {
      * 删除提示信息语句（标识）
      * */
     handleDelete(row) {
-      console.log(this.ids);
       let delIds = this.ids;
       let primary = camelCase(this.templateInfo.template?.primaryKey);
       if (row[primary] != undefined && row[primary] != null) {
@@ -544,18 +538,18 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      let primary = camelCase(this.templateInfo.template?.primaryKey);
       if (this.ids.length > 0) {
         this.queryParams["execlMap"] = [];
         this.ids.forEach((item) => {
           this.queryParams.execlMap.push(
             this.tableList.find((ttem) => {
-              return ttem.id === item;
+              return ttem[primary] === item;
             })
           );
         });
       }
       this.queryParams.execlMap = JSON.stringify(this.queryParams.execlMap);
-      console.log(this.queryParams);
       this.download(
         process.env.VUE_APP_BASE_API3 + "dragform/common/export",
         {
@@ -656,7 +650,6 @@ export default {
           this.open = false;
         })
         .catch((res) => {
-          console.log(res);
           console.log("验证未通过，获取失败");
         });
     },