From 459743836ceb0e560c46487ed6b8747ea0c01ba5 Mon Sep 17 00:00:00 2001
From: Dftre <3066417822@qq.com>
Date: Fri, 28 Jun 2024 01:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/uniapp/list.vue.vm  | 146 +++++++++---------
 .../src/main/resources/vm/vue/v3/readme.txt   |   1 -
 2 files changed, 77 insertions(+), 70 deletions(-)
 delete mode 100644 ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt

diff --git a/ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/list.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/list.vue.vm
index 71b995f..98acb4e 100644
--- a/ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/list.vue.vm
+++ b/ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/list.vue.vm
@@ -1,6 +1,18 @@
 <template>
   <view>
-    <uni-card :is-shadow="false" is-full v-for="(item,index) in ${businessName}List" :key="index">
+    <uni-table border stripe type="selection" emptyText="暂无更多数据" :loading="loading">
+      <uni-tr>
+#foreach($column in $columns)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+        <uni-th>${comment}</uni-th>
+#end
+      </uni-tr>
+      <uni-tr  v-for="(item,index) in ${businessName}List" :key="index">
 #foreach($column in $columns)
 #set($javaField=$column.javaField)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -10,58 +22,59 @@
 #set($comment=$column.columnComment)
 #end
 #if($column.pk)
-      <uni-section title="${comment}" :sub-title="item.${javaField}" type="line"></uni-section>
+        <uni-td>{{ item.${javaField} }}</uni-td>
 #elseif($column.list && $column.htmlType == "time")
-      <uni-section title="${comment}" :sub-title="item.${javaField}" type="line"></uni-section>
+        <uni-td>{{ item.${javaField} }}</uni-td>
 #elseif($column.list && $column.htmlType == "date")
-      <uni-section title="${comment}" :sub-title="item.${javaField}" type="line"></uni-section>
+        <uni-td>{{ item.${javaField} }}</uni-td>
 #elseif($column.list && $column.htmlType == "datetime")
-      <uni-section title="${comment}" :sub-title="item.${javaField}" type="line"></uni-section>
+        <uni-td>{{ item.${javaField} }}</uni-td>
 #elseif($column.list && $column.htmlType == "imageUpload")
-      <uni-section title="${comment}" type="line">
-        <u-album :urls="addBaseUrl(item.${javaField}.split(','))"></u-album>
-      </uni-section>
+        <uni-td>
+          <u-album :urls="addBaseUrl(item.${javaField}.split(','))"></u-album>
+        </uni-td>
 #elseif($column.list && "" != $column.dictType)
 #if($column.htmlType == "checkbox")
-      <dict-tag :options="${javaField}Options" :value="item.${javaField} ? item.${javaField}.split(',') : []"/>
+        <uni-td>
+          <dict-tag :options="${javaField}Options" :value="item.${javaField} ? item.${javaField}.split(',') : []"/>
+        </uni-td>
 #else
-      <dict-tag :options="${javaField}Options" :value="item.${javaField}"/>
+        <uni-td>
+          <dict-tag :options="${javaField}Options" :value="item.${javaField}"/>
+        </uni-td>
 #end
 #elseif($column.list && "" != $javaField)
-      <uni-section title="${comment}" :sub-title="item.${javaField}" type="line"></uni-section>
+        <uni-td>{{ item.${javaField} }}</uni-td>
 #end
 #end
-    </uni-card>
+      </uni-tr>
+    </uni-table>
   </view>
 </template>
 
-<script>
+<script setup>
 import  config  from "@/config"
 import { list${BusinessName}} from "@/api/${moduleName}/${businessName}";
+import {onLoad,onShow} from "@dcloudio/uni-app";
+import { ref } from "vue";
 #if(${dicts} != '')
 import DictTag from "@/components/dict-tag/dict-tag; 
 import { getDicts } from "@/api/system/dict/data";
 #end
 
-export default {
-#if(${dicts} != '')
-  components:{ DictTag },
-#end
-  name: "${BusinessName}List",
-  data() {
-    return {
 #foreach($column in $columns)    
 #set($javaField=$column.javaField)
 #if($column.list && "" != $column.dictType)
-      ${javaField}Options:[],
+const ${javaField}Options = ref([])
 #end
 #end      
-      // 总条数
-      total: 0,
-      // ${functionName}表格数据
-      ${businessName}List: [],
-      // 查询参数
-      queryParams: {
+// 总条数
+const total = ref(0);
+const loading = ref(true)
+// ${functionName}表格数据
+const ${businessName}List = ref([])
+// 查询参数
+const queryParams = ref({
         pageNum: 1,
         pageSize: 10,
 #foreach ($column in $columns)
@@ -69,64 +82,59 @@ export default {
         $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-      },
-
-    };
-  },
-  created() {
+      })
+onLoad(()=>{
 #foreach($column in $columns)   
 #set($javaField=$column.javaField) 
 #if($column.list && "" != $column.dictType)  
     getDicts(${column.dictType}).then(response => {
-      this.${javaField}Options = response.data;
+      ${javaField}Options.value = response.data;
     });
 #end
-#end  
-  },
-  onShow() {
-    this.getList();
-  },
-  methods: {
-    addBaseUrl(arr){
-		  return arr.map(item => config.baseUrl+item)
-	  },
-    /** 查询${functionName}列表 */
-    getList() {
+#end
+})
+onShow(()=>{
+  getList();
+})
+
+function addBaseUrl(arr){
+	return arr.map(item => config.baseUrl+item)
+}
+/** 查询${functionName}列表 */
+function  getList() {
 #foreach ($column in $columns)
 #if(($column.htmlType == "datetime" || $column.htmlType == "date" || $column.htmlType == "time") && $column.queryType == "BETWEEN")
-      this.queryParams.params = {};
+  queryParams.value.params = {};
 #break
 #end
 #end
 #foreach ($column in $columns)
 #if(($column.htmlType == "datetime" || $column.htmlType == "date" || $column.htmlType == "time") && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+      if (null != daterange${AttrName}.value && '' != daterange${AttrName}.value) {
+        queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+        queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
       }
 #end
 #end
-      list${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = response.rows;
-        this.total = response.total;
-        this.loading = false;
+      list${BusinessName}(queryParams.value).then(response => {
+        ${businessName}List.value = response.rows;
+        total.value = response.total;
+        loading.value = false;
       });
-    },
-    /** 查看详情按钮操作 */
-    handleShow(${pkColumn.javaField}) {
-      this.navigateTo("/pages/${moduleName}/${businessName}/show?${pkColumn.javaField}=" + ${pkColumn.javaField})
-    },
-  /** 查看详情按钮操作 */
-    handleEdit(${pkColumn.javaField}) {
-        this.navigateTo("/pages/${moduleName}/${businessName}/edit?${pkColumn.javaField}=" + ${pkColumn.javaField})
-    },
-    handleAdd(${pkColumn.javaField}) {
-        this.navigateTo("/pages/${moduleName}/${businessName}/edit")
-    },
-    navigateTo(url){
-       this.$tab.navigateTo(url)
-    }
-  }
-};
+}
+/** 查看详情按钮操作 */
+function handleShow(${pkColumn.javaField}) {
+  tab.navigateTo("/pages/${moduleName}/${businessName}/show?${pkColumn.javaField}=" + ${pkColumn.javaField})
+}
+/** 查看详情按钮操作 */
+function handleEdit(${pkColumn.javaField}) {
+  tab.navigateTo("/pages/${moduleName}/${businessName}/edit?${pkColumn.javaField}=" + ${pkColumn.javaField})
+}
+function handleAdd(${pkColumn.javaField}) {
+  tab.navigateTo("/pages/${moduleName}/${businessName}/edit")
+}
+function navigateTo(url){
+  tab.navigateTo(url)
+}
 </script>
diff --git a/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt b/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt
deleted file mode 100644
index 99239bb..0000000
--- a/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-���ʹ�õ���RuoYi-Vue3ǰ�ˣ���ô��Ҫ����һ�´�Ŀ¼��ģ��index.vue.vm��index-tree.vue.vm�ļ����ϼ�vueĿ¼��
\ No newline at end of file