Browse Source

自定义表格样式渲染

lph 1 year ago
parent
commit
4d0dac04b6

+ 3 - 3
ruoyi-ui/.env.development

@@ -11,10 +11,10 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #数据引擎模块IP
-VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'
+VUE_APP_BASE_API2 = 'http://192.168.110.76:8099/'
 
 #表单引擎模块IP
-VUE_APP_BASE_API3 = 'http://192.168.110.59:8088/'
+VUE_APP_BASE_API3 = 'http://192.168.110.76:8088/'
 
 #流程引擎模块IP
-VUE_APP_BASE_API4 = 'http://192.168.110.59:8055/'
+VUE_APP_BASE_API4 = 'http://192.168.110.76:8055/'

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

@@ -41,7 +41,7 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-          >下载模板
+            >下载模板
           </el-link>
         </div>
       </el-upload>
@@ -65,7 +65,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-        >新增
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5" v-if="false">
@@ -76,7 +76,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-        >修改
+          >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -87,7 +87,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-        >删除
+          >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -96,7 +96,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="upload.open = true"
-        >导入
+          >导入
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -106,7 +106,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-        >导出
+          >导出
         </el-button>
       </el-col>
       <right-toolbar
@@ -224,7 +224,7 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
-                >修改
+                  >修改
                 </el-button>
               </el-dropdown-item>
               <el-dropdown-item>
@@ -233,7 +233,7 @@
                   type="text"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)"
-                >删除
+                  >删除
                 </el-button>
               </el-dropdown-item>
             </el-dropdown-menu>
@@ -400,6 +400,7 @@ export default {
       // 获取当前表单结构信息
       dragTableInfo({ queryMap: { tableKey: this.tableKey } })
         .then((res) => {
+          console.log(res);
           // 得到当前模版信息 --- sql columns queryWhere
           this.templateInfo = res.data.resultMap;
           this.styleList = res.data.resultMap.style?.map((item) => {
@@ -756,7 +757,7 @@ export default {
             updateData.conditionMap[this.templateInfo.template?.primaryKey] =
               this.defaultValue[
                 camelCase(this.templateInfo.template?.primaryKey)
-                ];
+              ];
             Object.keys(values).map((k) => {
               updateData.commMap[k] = values[k];
             });
@@ -782,7 +783,6 @@ export default {
         .catch((res) => {
           this.$modal.msgError("表单校验失败,请规范填写数据");
         });
-
     },
     // 使用提交数据类型的按钮获取数据
     tempSubBtn(getData) {

+ 2 - 5
ruoyi-ui/vue.config.js

@@ -8,7 +8,8 @@ const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '后台管理系统' // 网页标题
+// const name = process.env.VUE_APP_TITLE || '后台管理系统' // 网页标题
+const name = 'wu' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 const isDev = process.env.NODE_ENV !== "production";
@@ -38,11 +39,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-<<<<<<< HEAD
-        target: `http://192.168.110.83:8080`,
-=======
         target: `http://192.168.110.76:8080`,
->>>>>>> 61c3b2a1bbef89cc20056ddf30d1203ffe17e3f1
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''