vue2-client 1.15.12 → 1.15.14

package/src/pages/XPageViewExample/index.vue

@@ -1,149 +1,149 @@
-<script setup>
-import { onMounted, ref } from 'vue'
-import XPageView from '@vue2-client/base-client/components/layout/XPageView'
-
-const xPageViewRef = ref(null)
-
-onMounted(() => {
-  xPageViewRef.value.init({
-    configValue: {
-      type: 'page',
-      onMounted: function (curr) {
-          console.warn(curr.data)
-          // 设置Tab配置数据
-          curr.data.tabData = {
-            index: 0,
-            items: [
-              // 第一组配置
-              {
-                tabConfigs: [
-                  { title: '表单列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
-                  { title: '新增表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } }
-                ]
-              },
-              // 第二组配置
-              {
-                tabConfigs: [
-                  { title: '数据列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
-                  { title: '编辑表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } },
-                  { title: '查看记录', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } }
-                ]
-              }
-            ]
-          }
-          console.log('页面初始化完成，全局数据上下文已创建')
-      },
-      gutter: [16, 16],
-      children: [
-        {
-          id: 'controlRow',
-          type: 'row',
-          gutter: 16,
-          template: 'card',
-          children: [
-            {
-              id: 'buttonContainer',
-              span: '24',
-              type: 'row',
-              gutter: 8,
-              children: [
-                {
-                  id: 'reloadButton',
-                  span: '6',
-                  type: 'a-button',
-                  props: {
-                    type: 'primary',
-                    value: '切换Tab配置'
-                  },
-                  children: [
-                    {
-                      type: 'text',
-                      text: '切换Tab配置'
-                    }
-                  ],
-                  event: {
-                    click: function (e, context) {
-                      // 切换Tab配置
-                      const tabData = context.data.tabData
-                      tabData.index = tabData.index === 0 ? 1 : 0
-
-                      // 获取当前配置和Tab组件
-                      const currentConfig = tabData.items[tabData.index]
-                      const tabComponent = context.comps.pageTab
-
-                      if (tabComponent) {
-                        // 更新Tab组件配置
-                        tabComponent.$props.data = currentConfig.tabConfigs
-                        console.log('Tab配置已更新，当前配置索引:', tabData.index)
-
-                        // 更新状态文本
-                        const statusText = context.comps.statusText
-                        if (statusText && statusText.$el) {
-                          statusText.message = `点击按钮切换不同的Tab配置，当前是第${tabData.index + 1}组配置`
-                        }
-                      }
-                    }
-                  }
-                },
-                {
-                  id: 'statusText',
-                  span: '18',
-                  type: 'a-alert',
-                  props: {
-                    message: '点击按钮切换不同的Tab配置，当前是第1组配置',
-                    type: 'success'
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          id: 'row2',
-          type: 'row',
-          gutter: 16,
-          template: 'none',
-          children: [
-            {
-              id: 'pageTab',
-              span: '24',
-              type: 'XTab',
-              props: {
-                showTabBar: true,
-                data: [
-                  {
-                    title: '表单列表',
-                    type: 'XFormTable',
-                    props: {
-                      serviceName: 'af-system',
-                      queryParamsName: 'crud_dictionary_manage'
-                    }
-                  },
-                  {
-                    title: '新增表单',
-                    type: 'XAddNativeForm',
-                    props: {
-                      serviceName: 'af-system',
-                      configName: 'crud_dictionary_manage_add_form'
-                    }
-                  }
-                ],
-                onChange: function (oldKey, newKey, oldTab, newTab) {
-                  console.log('Tab changed:', oldKey, newKey)
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    serviceName: 'af-his'
-  })
-})
-</script>
-
-<template>
-  <div>
-    <x-page-view ref="xPageViewRef"></x-page-view>
-  </div>
-</template>
+<script setup>
+import { onMounted, ref } from 'vue'
+import XPageView from '@vue2-client/base-client/components/layout/XPageView'
+
+const xPageViewRef = ref(null)
+
+onMounted(() => {
+  xPageViewRef.value.init({
+    configValue: {
+      type: 'page',
+      onMounted: function (curr) {
+          console.warn(curr.data)
+          // 设置Tab配置数据
+          curr.data.tabData = {
+            index: 0,
+            items: [
+              // 第一组配置
+              {
+                tabConfigs: [
+                  { title: '表单列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
+                  { title: '新增表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } }
+                ]
+              },
+              // 第二组配置
+              {
+                tabConfigs: [
+                  { title: '数据列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
+                  { title: '编辑表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } },
+                  { title: '查看记录', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } }
+                ]
+              }
+            ]
+          }
+          console.log('页面初始化完成，全局数据上下文已创建')
+      },
+      gutter: [16, 16],
+      children: [
+        {
+          id: 'controlRow',
+          type: 'row',
+          gutter: 16,
+          template: 'card',
+          children: [
+            {
+              id: 'buttonContainer',
+              span: '24',
+              type: 'row',
+              gutter: 8,
+              children: [
+                {
+                  id: 'reloadButton',
+                  span: '6',
+                  type: 'a-button',
+                  props: {
+                    type: 'primary',
+                    value: '切换Tab配置'
+                  },
+                  children: [
+                    {
+                      type: 'text',
+                      text: '切换Tab配置'
+                    }
+                  ],
+                  event: {
+                    click: function (e, context) {
+                      // 切换Tab配置
+                      const tabData = context.data.tabData
+                      tabData.index = tabData.index === 0 ? 1 : 0
+
+                      // 获取当前配置和Tab组件
+                      const currentConfig = tabData.items[tabData.index]
+                      const tabComponent = context.comps.pageTab
+
+                      if (tabComponent) {
+                        // 更新Tab组件配置
+                        tabComponent.$props.data = currentConfig.tabConfigs
+                        console.log('Tab配置已更新，当前配置索引:', tabData.index)
+
+                        // 更新状态文本
+                        const statusText = context.comps.statusText
+                        if (statusText && statusText.$el) {
+                          statusText.message = `点击按钮切换不同的Tab配置，当前是第${tabData.index + 1}组配置`
+                        }
+                      }
+                    }
+                  }
+                },
+                {
+                  id: 'statusText',
+                  span: '18',
+                  type: 'a-alert',
+                  props: {
+                    message: '点击按钮切换不同的Tab配置，当前是第1组配置',
+                    type: 'success'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          id: 'row2',
+          type: 'row',
+          gutter: 16,
+          template: 'none',
+          children: [
+            {
+              id: 'pageTab',
+              span: '24',
+              type: 'XTab',
+              props: {
+                showTabBar: true,
+                data: [
+                  {
+                    title: '表单列表',
+                    type: 'XFormTable',
+                    props: {
+                      serviceName: 'af-system',
+                      queryParamsName: 'crud_dictionary_manage'
+                    }
+                  },
+                  {
+                    title: '新增表单',
+                    type: 'XAddNativeForm',
+                    props: {
+                      serviceName: 'af-system',
+                      configName: 'crud_dictionary_manage_add_form'
+                    }
+                  }
+                ],
+                onChange: function (oldKey, newKey, oldTab, newTab) {
+                  console.log('Tab changed:', oldKey, newKey)
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    serviceName: 'af-his'
+  })
+})
+</script>
+
+<template>
+  <div>
+    <x-page-view ref="xPageViewRef"></x-page-view>
+  </div>
+</template>

package/src/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>

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

@@ -43,8 +43,6 @@ routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
 routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
 // 系统设置
 routerResource.settings = () => import('@vue2-client/pages/system/settings')
-// AMIS示例页面
-routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
 // 页面编辑器
 routerResource.editablePage = () => import('@vue2-client/pages/lowCode/lowCodeEditor.vue')
 // 数据检索
@@ -55,14 +53,14 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/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/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),

package/src/router.js

@@ -8,8 +8,6 @@ const routes = [
   // 对于每个路由，你都可以使用 'loadView' 方法动态加载对应的组件
   { path: '/Tree', component: loadView('Tree') },
   { path: '/XStepView', component: loadView('XStepView') },
-  { path: '/Amis', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo') },
-  { path: '/Amis2', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo2') },
   { path: '/DynamicStatistics', component: () => import('@vue2-client/pages/DynamicStatistics/index') },
   { path: '/NewDynamicStatistics', component: () => import('@vue2-client/pages/NewDynamicStatistics/index') },
   { path: '/submitTicket', component: () => import('@vue2-client/pages/system/ticket') },

package/src/utils/indexedDB.js

@@ -246,9 +246,20 @@ export class IndexedDBManager {
         // 再检查IndexedDB缓存
         const data = DB_CONFIG.NAME === LIULI_WEB_DB_NAME ? undefined : await this.getData(key)
 
+        if (data && data.ERROR) {
+          console.error(`获取配置失败：` + data.ERROR)
+        }
+
         if (!data && url) {
           // 缓存未命中，请求网络数据
-          const res = await post(url, params)
+          let res
+          try {
+            res = await post(url, params)
+          } catch (e) {
+            res = {
+              ERROR: e
+            }
+          }
           const processedData = processFun ? processFun(res) : res
 
           // 同时保存到内存缓存
@@ -270,7 +281,7 @@ export class IndexedDBManager {
           callback(data)
         }
       } catch (error) {
-        console.error(`[getByWeb] 获取数据失败: ${error.message}`)
+        console.error(`[getByWeb] 获取数据失败`, error)
 
         // IndexedDB操作失败时切换到备用方案
         if (error.name === 'InvalidStateError' || error.message?.includes('database') || error.message?.includes('transaction')) {

package/vue.config.js

@@ -163,9 +163,6 @@ module.exports = {
     }))
 
     config.plugins.push(
-      // new CopyPlugin({
-      //   patterns: [{ from: 'node_modules/amis/sdk', to: 'amis/sdk' }],
-      // })
     )
 
     // 生产环境下将资源压缩成gzip格式

package/src/base-client/components/common/AMisRender/index.js

@@ -1,3 +0,0 @@
-import AMisRender from './index.vue'
-
-export default AMisRender