Browse Source

自定义表格 排序字段

lph 1 year ago
parent
commit
a89571c5a9

+ 4 - 1
ruoyi-ui/src/views/tableMange/index.vue

@@ -257,7 +257,7 @@
                   v-for="val in orderByFieldList"
                   :key="val.fieldName"
                   :label="val.fieldDescription"
-                  :value="val.fieldName"
+                  :value="val.tableName + '.' + val.fieldName"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -1065,6 +1065,7 @@ export default {
             tableFieldData: this.tableFieldList,
             formData: this.formData,
           };
+          let isAsc = this.formData.isAsc == "ASC" ? 1 : 0;
           let data = {
             tId: this.tId,
             dtName: this.formData.menuName,
@@ -1072,6 +1073,8 @@ export default {
             // tableKey: this.formData.routePath, //  暂定
             dtTableName: this.tableName,
             primaryKey: this.formData.primaryKey,
+            orderByColumn: this.formData.orderByColumn,
+            isAsc,
             sqlKey: uuid,
             dtColumnName: columns, //列字段标题名称(存储显示字段信息
             timeFormat: this.formData.timeFormate,

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

@@ -385,8 +385,8 @@ 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);
+        // const htmlCode = data.dfHtmlTemplate;
+        // this.iframeUrl = "data:text/html;charset=utf-8," + encodeURI(htmlCode);
         this.jsonData = JSON.parse(data.dfVueTemplate);
         this.open = true;
         this.title = "添加信息";
@@ -399,8 +399,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       getInfoBySqlKey(this.sqlkey).then(({ data }) => {
-        const htmlCode = data.dfHtmlTemplate;
-        this.iframeUrl = "data:text/html;charset=utf-8," + encodeURI(htmlCode);
+        // const htmlCode = data.dfHtmlTemplate;
+        // this.iframeUrl = "data:text/html;charset=utf-8," + encodeURI(htmlCode);
         Object.assign(this.defaultValue, row);
         this.jsonData = JSON.parse(data.dfVueTemplate);
         this.open = true;