From 12bcd9b76241f6e432589caa5de0dc7ba224ab82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 2 Aug 2023 16:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8Bjson=E7=9A=84detail=E5=8F=AA?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=90=8C=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?bug=E5=A4=84=E7=90=86+api=E5=88=A0=E9=99=A4=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/api/wms-api.js                    |  35 ++++--
 .../components/addEditFromApiPop/index.vue    |  28 ++---
 Code/Fe/src/components/umyTable/index.vue     |  56 ++++-----
 Code/Fe/src/mixins/TableMixins.js             |  34 +++++-
 Code/Fe/src/store/getters.js                  |   1 +
 Code/Fe/src/store/modules/definition.js       |  18 ++-
 Code/Fe/src/views/demo/demo_api_handle.vue    | 112 ++++++++++++++++++
 Code/Fe/src/views/demo/demo_read.vue          |  26 +++-
 8 files changed, 253 insertions(+), 57 deletions(-)
 create mode 100644 Code/Fe/src/views/demo/demo_api_handle.vue

diff --git a/Code/Fe/src/api/wms-api.js b/Code/Fe/src/api/wms-api.js
index ea63a8b..4afbfa1 100644
--- a/Code/Fe/src/api/wms-api.js
+++ b/Code/Fe/src/api/wms-api.js
@@ -1,6 +1,7 @@
 import request from '@/utils/request'
 import store  from '@/store'
 // let baseURL = process.env.VUE_APP_BASE_API + '/'
+let baseAPI = localStorage.getItem('baseApi') + '/'
 let baseURL = localStorage.getItem('baseApi') + '/api/'
 
 //新建
@@ -148,11 +149,29 @@ export function getVsersion() {
   })
 }
 
-// // 测试数据-明细-删除
-// export function TestSchoolDetailList_delete(id) {
-//     return request({
-//         method:'DELETE',
-//         url: base_api + '/api/TestStudentDetail/base/delete-by-id',
-//         params:{id:id}
-//     })
-// }
\ No newline at end of file
+// fast-new
+//API-POST
+export function ApiTypePost(data, url) {
+  return request({
+    url: baseAPI + url,
+    method: 'post',
+    data
+  })
+}
+//API-PUT
+export function ApiTypePut(data, id, url) {
+  return request({
+    url: baseAPI + url,
+    method: 'put',
+    data,
+    params:{id:id}
+  })
+}
+//API-DELETE
+export function ApiTypeDelete(id, url) {
+  return request({
+    url: baseAPI + url,
+    method: 'delete',
+    params:{id:id}
+  })
+}
\ No newline at end of file
diff --git a/Code/Fe/src/components/addEditFromApiPop/index.vue b/Code/Fe/src/components/addEditFromApiPop/index.vue
index c276e69..ec8858d 100644
--- a/Code/Fe/src/components/addEditFromApiPop/index.vue
+++ b/Code/Fe/src/components/addEditFromApiPop/index.vue
@@ -125,10 +125,9 @@
   </el-dialog>
 </template>
 <script>
-import { postCreate, postUpdate } from "@/api/wms-api"
+import { ApiTypePost, ApiTypePut } from "@/api/wms-api"
 import { LoadingMixins } from "@/mixins/LoadingMixins";
 import { tableMixins } from "@/mixins/TableMixins"
-import * as allUrlOption from '@/utils/baseData/urlOption'
 export default {
   name:"addEditFromApiPop",
   mixins:[ LoadingMixins,tableMixins ],
@@ -161,12 +160,7 @@ export default {
   },
   data () {
     return {
-      // 新增
-      URLOption_base:allUrlOption[this.$route.name].baseURL,
-      // 新增
-      URLOption_add:allUrlOption[this.$route.name].addURL,
-      // 编辑
-      URLOption_edit:allUrlOption[this.$route.name].editURL,
+      currentDtos:this.$store.getters.dtoColumnTypes[this.$route.name],
       active:0,//显示内容：0表单 1成功 2失败
       show:true,
       formTitle:null,//form名称
@@ -188,9 +182,8 @@ export default {
     },
     // 初始化表单配置、rules
     initFormItems(){
-      let data = this.$store.getters.dtoColumnTypes
       let _dtoList_type = this.handleType == 'add' ? 'C' : 'U'
-      let _dtoList = data[this.$route.name][_dtoList_type].dtoList
+      let _dtoList = this.currentDtos[_dtoList_type].dtoList
       this.formItemData = JSON.parse(JSON.stringify(_dtoList))
       // 编辑格式：特殊处理默认值
       if(this.handleType == 'edit' && this.editRowData){
@@ -236,14 +229,14 @@ export default {
           this.submitForm(valid,this.formData,this.handleType,this.formItemData,this.formRules)
           return
         }
-        let _updata = this.handleType == 'add' ? this.URLOption_add : this.URLOption_edit
-        let _url = _updata ? _updata : this.URLOption_base
         this.Loading.addEditApiLoading = true
         if (valid) {
           // 新增
           if(this.handleType == 'add'){
-            if(!_updata){_url = _url + '/create'}
-            postCreate(this.formData, _url).then(res => {
+            ApiTypePost(
+              this.formData, 
+              this.currentDtos.C.actionsUrl
+            ).then(res => {
               this.changeActive(1)
             }).catch(err => {
               this.changeActive(2)
@@ -251,8 +244,11 @@ export default {
           }
           // 编辑
           else{
-            if(!_updata){_url = _url + '/update-by-id'}
-            postUpdate(this.formData, this.formData.id, _url).then(res => {
+            ApiTypePut(
+              this.formData, 
+              this.formData.id, 
+              this.currentDtos.U.actionsUrl
+            ).then(res => {
               this.changeActive(1)
             }).catch(err => {
               this.changeActive(2)
diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue
index 2e7b74d..9a6aed1 100644
--- a/Code/Fe/src/components/umyTable/index.vue
+++ b/Code/Fe/src/components/umyTable/index.vue
@@ -214,24 +214,24 @@
               stripe
               :border="true"
               style="width: 100%"
-              height="500"
+              height="300"
             >
               <el-table-column
-                v-for="(head) in showJsonHeader"
+                v-for="(head,h_key) in showJsonHeader"
                 :key="h_key"
                 min-width="120"
               >
                 <template #header>
                   <span :title="head">{{ head }}</span>
                 </template>
-                <template slot-scope="scope" v-for="item in scope.row.value">
-                  <div v-if="typeof item[head] == 'object'">
-                    <div v-for="(o,o_key) in item[head]">
+                <template slot-scope="scope2">
+                  <div v-if="typeof scope2.row[head] == 'object'">
+                    <div v-for="(o,o_key) in scope2.row[head]">
                       {{ o_key }}：{{ o }}
                       <div style="border-bottom: dashed 1px #ddd;"></div>
                     </div>
                   </div>
-                  <div v-else>{{ item[head] }}</div>
+                  <div v-else>{{ scope2.row[head] }}</div>
                 </template>
               </el-table-column>
             </el-table>
@@ -672,29 +672,31 @@ export default {
         // 直接输出
         if(!_json[item]){
           _arr.push({name:item,value:_json[item]})
-        }else if(_json[item] && typeof _json[item] != 'object'){
-          _arr.push({name:item,value:_json[item] + ""})
         }else{
-          // 如果是数组
-          if(Array.isArray(_json[item])){
-            //  如果是 DETAILS todo:DETAILS判断条件需要优化，使用传参的方式
-            // let _value = (item).toUpperCase() == 'DETAILS' ? __initJson(_json[item][0]) : (_json[item]).join(",")
-            this.showJsonHeader = []
-            for(let h in _json[item][0]){
-              this.showJsonHeader.push(h)
+          if(typeof _json[item] != 'object'){
+            _arr.push({name:item,value:_json[item] + ""})
+          }else{
+              // 如果是数组
+            if(Array.isArray(_json[item])){
+              //  如果是 DETAILS todo:DETAILS判断条件需要优化，使用传参的方式
+              // let _value = (item).toUpperCase() == 'DETAILS' ? __initJson(_json[item][0]) : (_json[item]).join(",")
+              this.showJsonHeader = []
+              for(let h in _json[item][0]){
+                this.showJsonHeader.push(h)
+              }
+              let _value = (item).toUpperCase() == 'DETAILS' ? _json[item] : (_json[item]).join(",")
+              _arr.push({name:item,value:_value})
             }
-            let _value = (item).toUpperCase() == 'DETAILS' ? _json[item] : (_json[item]).join(",")
-            _arr.push({name:item,value:_value})
-          }
-          // 如果是对象
-          else{           
-            let _obj_arr = __initJson(_json[item]) 
-            // 对象有数据
-            if(_obj_arr.length > 0){
-              _arr = [..._obj_arr]
-            }else{
-              // 空对象
-              _arr.push({name:item,value:""})
+            // 如果是对象
+            else{    
+              let _obj_arr = __initJson(_json[item]) 
+              // 对象有数据
+              if(_obj_arr.length > 0){
+                _arr = [..._obj_arr]
+              }else{
+                // 空对象
+                _arr.push({name:item,value:""})
+              }
             }
           }
         }
diff --git a/Code/Fe/src/mixins/TableMixins.js b/Code/Fe/src/mixins/TableMixins.js
index 35999f9..2d7ad18 100644
--- a/Code/Fe/src/mixins/TableMixins.js
+++ b/Code/Fe/src/mixins/TableMixins.js
@@ -1,7 +1,8 @@
 import {
   getPageList,
   getDetailed,
-  postDelete
+  postDelete,
+  ApiTypeDelete
 } from '@/api/wms-api'
 import { zhApiColumnsLable,firstWordSizeChange } from '@/utils/index'
 export const tableMixins = {
@@ -71,6 +72,13 @@ export const tableMixins = {
           color:'#ff9000'
         })
       }
+      if(type.indexOf('delete') >= 0){
+        _btns.push({
+          label:'删除',
+          name:'deleteFromApi',
+          color:'red'
+        })
+      }
       return _btns
     },
     // 主表-右侧操作列基础按钮操作
@@ -89,7 +97,7 @@ export const tableMixins = {
         this.displayDialog.editDialog = true
       }
       // 编辑 api
-      if (item.name == "editFromApi") {
+      else if (item.name == "editFromApi") {
         this.addEditApiType = 'edit'
         this.editFromApiRowData = row
         this.displayDialog.addEditApiDialog = true;
@@ -114,6 +122,28 @@ export const tableMixins = {
           this.Loading.tableLoading = false
         });
       }
+      // 删除 api
+      else if (item.name == "deleteFromApi") {
+        this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.Loading.tableLoading = true
+          ApiTypeDelete(
+            row.id, 
+            this.$store.getters.apiActions[this.$route.name].DeleteAsyncById.url
+          ).then(res => {
+            this.$successMsg('删除成功!')
+            this.Loading.tableLoading = false
+            this.paging()
+          }).catch(err => {
+            this.Loading.tableLoading = false
+          })
+        }).catch(() => {
+          this.Loading.tableLoading = false
+        });
+      }
     },
     // 获取通过api的表头数据，不可以在初始化处理，因为接口返回问题
     // initApiColumns(table,des,detailsTable,detailsPage){
diff --git a/Code/Fe/src/store/getters.js b/Code/Fe/src/store/getters.js
index 2d40c61..3205c47 100644
--- a/Code/Fe/src/store/getters.js
+++ b/Code/Fe/src/store/getters.js
@@ -15,5 +15,6 @@ const getters = {
   enumList: state => state.definition.enumList,//接口获取的枚举
   columZHList: state => state.definition.columZHList,//接口转义的表头
   dtoColumnTypes: state => state.definition.dtoColumnTypes,//所有页面的dto类型
+  apiActions: state => state.definition.apiActions,//所有api的动作（增删改查等）
 }
 export default getters
diff --git a/Code/Fe/src/store/modules/definition.js b/Code/Fe/src/store/modules/definition.js
index 8b6c86d..b6b8dc7 100644
--- a/Code/Fe/src/store/modules/definition.js
+++ b/Code/Fe/src/store/modules/definition.js
@@ -5,6 +5,7 @@ const state = {
     enumList: [],//枚举
     columZHList:null,//表头转义
     dtoColumnTypes:[],//所有页面的dto类型
+    apiActions:[],//所有api的动作（增删改查等）
 }
   
 const mutations = {
@@ -20,6 +21,10 @@ const mutations = {
     SET_DTOCOLUMN_TYPES: (state, data) => {
         state.dtoColumnTypes=data
     },
+    // 所有api的动作（增删改查等）
+    SET_API_ACTIONS: (state, data) => {
+        state.apiActions=data
+    }
 }
 
 // 通过url做方法处理转换（S/C/U/G等）目前做了S查询/C新增/U编辑。如果有需要在丰富
@@ -76,7 +81,8 @@ export function initDtoTypesAndEnums(res,typeName,apiName) {
 }
 
 // DTO列类型转义
-export function initDtoColumnTypes(res) {
+export function initDtoColumnTypes(res,commit) {
+    let _actionsObj = {}// 所有actions处理暂存数据
     // modules>app>controller>这里是所有的接口
     let _controller = res.modules.app.controllers
     let _allData = {}
@@ -84,6 +90,9 @@ export function initDtoColumnTypes(res) {
         let _com = 'AppService'
         // 获取简单的api（路由，如：IncomingData）
         let _api = item.substring(item.lastIndexOf('.') + 1,item.length - _com.length)
+        // 所有actions处理
+        _actionsObj[_api] = _controller[item].actions;
+        // dto处理
         let inner_item = {
             baseApi:_api,
             dtoList:[],
@@ -101,23 +110,28 @@ export function initDtoColumnTypes(res) {
             // 查询处理
             let _type = _actions.returnValue.type
             if(initDtoTypeByUrl(_actions.url) == 'S'){
+                _item.S.actionsUrl = _actions.url
                 let _type_value = _type.substring(_type.indexOf('<') + 1,_type.indexOf('>'))
                 _item.S.columnsType=_type_value
                 _item.S.dtoList = initDtoTypesAndEnums(res,_type_value,_api)
             }
             // 新增处理
             if( initDtoTypeByUrl(_actions.url) == 'C' ){
+                _item.C.actionsUrl = _actions.url
                 _item.C.columnsType = _type
                 _item.C.dtoList = initDtoTypesAndEnums(res,_type,_api)
             }
             // 编辑处理
             if( initDtoTypeByUrl(_actions.url) == 'U' ){
+                _item.U.actionsUrl = _actions.url
                 _item.U.columnsType = _type
                 _item.U.dtoList = initDtoTypesAndEnums(res,_type,_api)
             }
         }
         _allData[_api] = _item
     }
+    // 设置所有actions
+    commit('SET_API_ACTIONS', _actionsObj)
     return _allData
 }
   
@@ -127,7 +141,7 @@ const actions = {
         return new Promise(resolve => {
             getApiDefinition().then(res=>{
                 commit('SET_ENUM_LIST', res.types)
-                commit('SET_DTOCOLUMN_TYPES', initDtoColumnTypes(res))
+                commit('SET_DTOCOLUMN_TYPES', initDtoColumnTypes(res,commit))
                 resolve(res)
             })
         })
diff --git a/Code/Fe/src/views/demo/demo_api_handle.vue b/Code/Fe/src/views/demo/demo_api_handle.vue
new file mode 100644
index 0000000..d4566cb
--- /dev/null
+++ b/Code/Fe/src/views/demo/demo_api_handle.vue
@@ -0,0 +1,112 @@
+<template>
+    <div class="page-box" v-loading="Loading.tableLoading">
+      <!-- DEMO:只有主表查询 API新增编辑删除 -->
+      <tablePagination
+        v-if="apiColumns_Table"
+        :currenButtonData="currenButtonData"
+        :tableData="tableData"
+        :tableLoading="Loading.tableLoading"
+        :tableColumns="apiColumns_Table"
+        @rowDrop="rowDrop"
+        :totalCount="totalCount"
+        :multipleSelection="multipleSelection"
+        :MaxResultCount="PageListParams.MaxResultCount"
+        @topbutton="topbutton"
+        @inlineDialog="inlineDialog"
+        @sortChange="sortChange"
+        @alertoldSkipCount="alertoldSkipCount"
+        @alterResultCount="alterResultCount"
+        @handleSelectionChange="handleSelectionChange"
+        :currentPageProps="oldSkipCount"
+        :quicklySearchOption="quicklySearchOption"
+        @quicklySearchClick="quicklySearchClick"
+        @quicklySearchClear="quicklySearchClear"
+        :primarySearchOption="primarySearchOption"
+        @overallSearchFormClick="overallSearchFormClick"
+        :httpOverallSearchData="httpOverallSearchData"
+        :buttonOperationList_left="buttonOperationClick_leftBase"
+        @buttonOperationClick_left="buttonOperationClick_left"
+        :buttonOperationList_right="(data)=>{return buttonOperationList_rightApi(data,'edit|delete')}"
+        @buttonOperationClick_right="buttonOperationClick_right"
+      ></tablePagination>
+      <curren-Drawer
+        ref="currenDrawer_Ref"
+        :title="apiColumns_DesTions"
+        @rowDrop="rowDrop"
+        :tableColumns="apiColumns_DetailsTable"
+        :tabsDesTions="apiColumns_DesTions"
+        :DrawerLoading="Loading.DrawerLoading"
+        :drawer="displayDialog.detailsDialog"
+        :propsData="propsData"
+        :Butttondata="[]"
+        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+        @drawerbutton="drawerbutton"
+        @handleCommand="drawerHandle"
+        @close-value="closeValue"
+        :totalCount="totalCountDetails"
+        :currentPage="oldSkipCountDetails"
+        :MaxResultCount="MaxResultCountDetails"
+        @alterResultCountDetails="alterResultCountDetails"
+        @alertoldSkipCountDetails="alertoldSkipCountDetails"
+        :buttonOperationList_left="operationButtonsDetail"
+      ></curren-Drawer>
+      <!-- 导出弹窗 -->
+      <exportDrop 
+        v-if="displayDialog.exportDialog"
+        @closeDialog="closeExportDrop"
+        @exportDropSubmit="exportDropSubmit"
+      ></exportDrop>
+      <!-- Api新增 -->
+      <addEditFromApiPop
+        v-if="displayDialog.addEditApiDialog"
+        :handleType="addEditApiType"
+        :editRowData="editFromApiRowData"
+        @closePop="closeAddEditApiPop"
+      ></addEditFromApiPop>
+    </div>
+  </template>
+  <script>
+  import { tableMixins } from "@/mixins/TableMixins";
+  import { LoadingMixins } from "@/mixins/LoadingMixins";
+  import { drawerMixins } from "@/mixins/drawerMixins"
+  import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+  import { mixins } from "@/mixins/mixins";
+  import { filterSelectMixins } from '@/mixins/filter-Select'
+  import { getToken } from '@/utils/auth'
+  
+  
+  export default {
+    name: "IncomingData",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      drawerMixins,
+      TableHeaderMixins,
+      mixins,
+      filterSelectMixins,
+    ],
+    data() {
+      return {
+        //常用按钮数据
+        currenButtonData: [
+          this.defaultAddBtn({
+            name:'addFromApi'
+          }),//新增
+          this.defaultExportBtn({
+            isRedundance:true,
+            isDetailExport:true
+          }),//导出
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+          this.defaultFilterBtn(),//筛选
+        ],
+      };
+    },
+    mounted() {
+      this.paging();
+    },
+  }
+  </script>
+  <style lang="scss" scoped>
+  @import "@/styles/basicData.scss";
+  </style>
\ No newline at end of file
diff --git a/Code/Fe/src/views/demo/demo_read.vue b/Code/Fe/src/views/demo/demo_read.vue
index a2a71f9..442a486 100644
--- a/Code/Fe/src/views/demo/demo_read.vue
+++ b/Code/Fe/src/views/demo/demo_read.vue
@@ -25,6 +25,29 @@
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
     ></tablePagination>
+    <!-- :buttonOperationList_left="buttonOperationClick_leftBase"
+      @buttonOperationClick_left="buttonOperationClick_left" -->
+    <!-- <curren-Drawer
+      ref="currenDrawer_Ref"
+      :title="apiColumns_DesTions"
+      @rowDrop="rowDrop"
+      :tableColumns="apiColumns_DetailsTable"
+      :tabsDesTions="apiColumns_DesTions"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :Butttondata="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :totalCount="totalCountDetails"
+      :currentPage="oldSkipCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :buttonOperationList_left="operationButtonsDetail"
+    ></curren-Drawer> -->
     <!-- 导出弹窗 -->
     <exportDrop 
       v-if="displayDialog.exportDialog"
@@ -41,11 +64,10 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins";
 import { filterSelectMixins } from '@/mixins/filter-Select'
-import { getToken } from '@/utils/auth'
 
 
 export default {
-  name: "IncomingData",
+  name: "demo_read",
   mixins: [
     tableMixins,
     LoadingMixins,