vue2-client 1.9.36 → 1.9.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.36",
+  "version": "1.9.38",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XAddNativeForm/demo.vue

@@ -6,7 +6,7 @@ export default {
   name: 'Demo',
   components: { XAddNativeForm },
   created () {
-    getConfigByNameAsync('addDiBaoForm', 'af-revenue').then(res => {
+    getConfigByNameAsync('orderRepairHandlerForm', 'af-revenue').then(res => {
       this.$refs.xAddFrom.init(res)
     })
   },

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -959,6 +959,7 @@ export default {
             // 仅获取最内层数据
             searchToListOption(searchData, res => this.getDataCallback(res))
           } else {
+            // 其他资源通用逻辑
             searchToOption(searchData, res => this.getDataCallback(res))
           }
         } else if (this.attr.keyName.indexOf('config@') !== -1) {

package/src/base-client/components/common/XFormTable/demo.vue

@@ -25,14 +25,17 @@
 </template>
 
 <script>
-
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
 export default {
   name: 'Demo',
+  components: {
+    XFormTable
+  },
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'UserFilesListCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值
@@ -58,8 +61,6 @@ export default {
     }
   },
   computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', { isMobile: 'isMobile' })
   },
 }
 </script>

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -113,9 +113,7 @@
                 </template>
               </template>
             </template>
-            <template v-else v-for="(img,imgIndex) in getDeepObject(configData.images, cell.dataIndex)">
-              <span :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
-            </template>
+            <span v-else v-for="(img,imgIndex) in getDeepObject(configData.images, cell.dataIndex)" :key="imgIndex" style="margin-right: 5%">{{ img.name }}</span>
           </template>
         </a-col>
       </template>

package/src/router/async/router.map.js

@@ -85,8 +85,8 @@ routerResource.example = {
           name: '示例页面',
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {

package/src/services/v3Api.js

@@ -3,6 +3,9 @@ import { runLogic } from '@vue2-client/services/api/common'
 
 function getLeafNodes (nodes) {
   let leaves = []
+  if (!(nodes instanceof Array)) {
+    nodes = [nodes]
+  }
   nodes.forEach(node => {
     if (node.children && node.children.length) {
       leaves = leaves.concat(getLeafNodes(node.children))
@@ -46,19 +49,17 @@ function getResData (params, toCallback) {
 export async function searchToOption (params, callback) {
   function toCallback (res) {
     if (res.length) {
-      if (res[0].children) {
-        if (res[0].children.length) {
-          if (res[0].children[0].children) {
-            callback(transformData(res[0].children[0].children))
-          } else {
-            callback(transformData(res[0].children))
-          }
+      if (res[0].children && res[0].children.length) {
+        if (res[0].children[0].children) {
+          callback(transformData(res[0].children[0].children))
         } else {
-          callback(res[0].children)
+          callback(transformData(res[0].children))
         }
       } else {
-        callback(res)
+        callback(res[0].children)
       }
+    } else {
+      callback(res)
     }
   }
 

package/src/utils/indexedDB.js

@@ -178,41 +178,46 @@ export const indexedDB = {
     // 创建一个新的 Promise
     locks[key] = new Promise((resolve, reject) => {
       const self = this
-      self.openDB((res) => {
-        // 根据存储空间的键找到对应数据
-        const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-        const request = store.get(key)
-        request.onerror = function (e) {
-          reject(e)
-        }
-        request.onsuccess = function (e) {
-          const result = e.target.result
-          if (!result && url) {
-            post(url, params).then((res) => {
-              if (processFun) { res = processFun(res) }
-              if (process.env.NODE_ENV === 'production' || key !== 'webMobileConfig') { self.add(key, res) }
-              try {
-                callback(res)
-              } catch (e) {
-                console.error(e)
-              }
-              // 解锁这个键
-              resolve()
-            }).catch((e) => {
-              if (process.env.NODE_ENV === 'production' && key !== 'webMobileConfig') { self.add(key, null) }
-              callback(null)
-              // 解锁这个键
+
+      const handlePostRequest = () => {
+        post(url, params).then((res) => {
+          if (processFun) { res = processFun(res) }
+          if (process.env.NODE_ENV === 'production' || key !== 'webMobileConfig') { self.add(key, res) }
+          try {
+            callback(res)
+          } catch (e) {
+            console.error(e)
+          }
+          resolve()
+        }).catch((e) => {
+          if (process.env.NODE_ENV === 'production' && key !== 'webMobileConfig') { self.add(key, null) }
+          callback(null)
+          resolve()
+        })
+      }
+
+      try {
+        self.openDB((res) => {
+          const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+          const request = store.get(key)
+          request.onerror = function (e) {
+            reject(e)
+          }
+          request.onsuccess = function (e) {
+            const result = e.target.result
+            if (!result && url) {
+              handlePostRequest()
+            } else {
+              callback(result.data)
               resolve()
-            })
-          } else {
-            callback(result.data)
-            // 解锁这个键
-            resolve()
+            }
           }
-        }
-      })
+        })
+      } catch (e) {
+        console.error('indexDb数据库操作错误', e)
+        handlePostRequest()
+      }
     }).finally(() => {
-      // 移除这个键的锁
       delete locks[key]
     })
   },