vue2-client 1.8.11 → 1.8.13

package/src/pages/AMisDemo/AMisDemo.vue

@@ -1,223 +1,67 @@
-<template>
-  <amis-renderer :schema="schema" :locals="locals" />
-</template>
-<script>
-import AMISRenderer from '@vue2-client/base-client/components/common/AMisRender'
-// import Vue from 'vue'
-// import Index from '@vue2-client/base-client/components/index.js'
-//
-// const vms = {}
-// const store = Vue.$store
-// const router = Vue.$router
-// const i18n = Vue.$i18n
-
-const schema = {
-  // 原生与自定义组件混用
-  type: 'page',
-  css: {
-  },
-  body: [
-    {
-      type: 'grid',
-      columns: [
-        {
-          mode: 'horizontal',
-          body: {
-            name: 'queryParams',
-            type: 'input-text',
-            label: '查询值'
-          },
-          md: 4
-        }
-      ]
-    },
-    {
-      type: 'grid',
-      columns: [
-        {
-          body: [
-            {
-              type: 'input-tree',
-              name: 'test',
-              label: '树选择框',
-              source: {
-                method: 'post',
-                url: '/api/af-system/logic/get_root_nodes'
-              },
-              // api: {
-              //   method: 'post',
-              //   url: '/api/af-system/logic/get_root_nodes'
-              // }
-            }
-          ],
-          id: 'u:b1d2075dc231',
-          md: 1.5
-        },
-        {
-          body: [
-                {
-                  type: 'table-view',
-                  name: 'table-view1',
-                  api: '',
-                  trs: [
-                    {
-                      background: '#F7F7F7',
-                      tds: [
-                        {
-                          align: 'center',
-                          body: {
-                            type: 'tpl',
-                            tpl: '地区'
-                          }
-                        },
-                        {
-                          align: 'center',
-                          body: {
-                            type: 'tpl',
-                            tpl: '城市'
-                          }
-                        },
-                        {
-                          align: 'center',
-                          body: {
-                            type: 'tpl',
-                            tpl: '销量'
-                          }
-                        }
-                      ]
-                    },
-                    {
-                      tds: [
-                        {
-                          align: 'center',
-                          colspan: 2,
-                          rowspan: 2,
-                          body: {
-                            type: 'tpl',
-                            tpl: '${queryParams}'
-                          }
-                        },
-                        {
-                          body: {
-                            type: 'tpl',
-                            tpl: '北京'
-                          },
-                        }
-                      ]
-                    },
-                    {
-                      tds: [
-                        {
-                          body: {
-                            type: 'tpl',
-                            tpl: '上京'
-                          },
-                        }
-                      ]
-                    }
-                  ]
-                },
-            {
-
-            },
-            {
-              type: 'table-view',
-              trs: [
-                {
-                  background: '#F7F7F7',
-                  tds: [
-                    {
-                      align: 'center',
-                      body: {
-                        type: 'tpl',
-                        tpl: '地区'
-                      }
-                    },
-                    {
-                      align: 'center',
-                      body: {
-                        type: 'tpl',
-                        tpl: '城市'
-                      }
-                    },
-                    {
-                      align: 'center',
-                      body: {
-                        type: 'tpl',
-                        tpl: '销量'
-                      }
-                    }
-                  ]
-                },
-                {
-                  tds: [
-                    {
-                      align: 'center',
-                      colspan: 3,
-                      body: {
-                        type: 'tpl',
-                        tpl: '北京'
-                      }
-                    },
-
-                  ]
-                }
-              ]
-            },
-          // {
-          //   name: 'username', // 如果要放在 form 中，需要设置 name，onChange 将会设置这个值
-          //   type: 'custom',
-          //   // onMount 将会在组件创建时执行，默认会创建一个空 div 标签，也可以设置 inline: true 来创建 span 标签
-          //   // dom 是 dom 节点，value 是初始数据，比如表单 name 初始拿到的数据，onChange 只有在表单下才会有
-          //   onMount: (dom, value, onChange) => {
-          //     const vm = new Vue({
-          //       router,
-          //       store,
-          //       i18n,
-          //       render: h => h(Index.XFormTable, {
-          //         props: {
-          //           queryParamsName: `crud_dictionary_manage`
-          //         }
-          //       })
-          //     })
-          //     vms.XFormTable = vm
-          //     dom.appendChild(vm.$mount().$el)
-          //   },
-          //   // onUpdate 将会在数据更新时被调用
-          //   // dom 是 dom 节点、data 将包含表单所有数据，prevData 是之前表单的所有数据
-          //   onUpdate: (dom, data, prevData) => {
-          //     console.log('数据有变化', data)
-          //     const vm = vms.XFormTable
-          //     vm.$children[0].active(data)
-          //   },
-          //   // onUnmount 将会在组件被销毁的时候调用，用于清理资源
-          //   onUnmount: () => {
-          //     console.log('组件被销毁')
-          //   },
-          // }
-          ],
-          id: 'u:e4e49c147c06'
-        }
-      ],
-    }
-  ]
-}
-
-export default {
-  name: 'AMisDemo',
-  components: {
-    'amis-renderer': AMISRenderer,
-  },
-  computed: {
-  },
-  mounted () {
-
-  },
-  data: () => ({
-    schema: schema,
-    locals: { fixedQueryForm: {} },
-    vms: {},
-    queryParamsName: 'crud_dictionary_manage'
-  }),
-}
-</script>
+<template>
+  <amis-renderer :schema="schema" :locals="locals" />
+</template>
+<script>
+import AMISRenderer from '@vue2-client/base-client/components/common/AMisRender'
+
+const schema = {
+  // 原生与自定义组件混用
+  type: 'page',
+  title: '页面主题',
+  body: [
+    {
+      // 自定义组件
+      type: 'XFormTable',
+      queryParamsName: 'crud_dictionary_manage'
+    }
+  ],
+  // 原生边栏组件
+  aside: [
+    {
+      type: 'panel',
+      title: '边栏',
+      body: [
+        {
+          type: 'input-tree',
+          label: '树选择框',
+          name: 'tree',
+          options: [
+            {
+              label: '选项A',
+              value: 'A',
+              children: [
+                {
+                  label: '选项C',
+                  value: 'C'
+                },
+                {
+                  label: '选项D',
+                  value: 'D'
+                }
+              ]
+            },
+            {
+              label: '选项B',
+              value: 'B'
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  asideResizor: true,
+  asideSticky: false
+}
+
+export default {
+  name: 'AMisDemo',
+  components: {
+    'amis-renderer': AMISRenderer,
+  },
+  computed: {},
+  data: () => ({
+    schema: schema,
+    locals: {},
+  }),
+}
+</script>

package/src/router.js

@@ -1,15 +1,13 @@
-// 动态导入你的组件
-function loadView (view) {
-  console.log('view', view)
-  return () => import(/* webpackChunkName: "view-[request]" */ `@vue2-client/base-client/components/common/${view}`)
-}
-
-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') },
-  // ... 其他路由
-]
-export default routes
+// 动态导入你的组件
+function loadView (view) {
+  console.log('view', view)
+  return () => import(/* webpackChunkName: "view-[request]" */ `@vue2-client/base-client/components/common/${view}`)
+}
+
+const routes = [
+  // 对于每个路由，你都可以使用 'loadView' 方法动态加载对应的组件
+  { path: '/Tree', component: loadView('Tree') },
+  { path: '/Amis', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo') },
+  // ... 其他路由
+]
+export default routes

package/src/services/api/common.js

@@ -22,9 +22,11 @@ const commonApi = {
   // 通用删除
   delete: 'logic/commonDelete',
   // 导入数据
-  importData: 'logic/importData',
+  importData: 'crud/importDataByExcel',
   // 导出数据
   exportData: 'logic/commonExport',
+  // 导入模板下载
+  downloadImportTemplate: 'logic/commonDownloadImportTemplate',
   // 下载数据
   download: 'resource/download',
   // 通用上传
@@ -158,6 +160,13 @@ export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME
   return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
 }
 
+/**
+ * 通用导入模板下载
+ */
+export function downloadImportExcel (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
+  return post('/api/' + serviceName + '/' + commonApi.downloadImportTemplate, parameter, null)
+}
+
 // 通用下载
 export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   const notificationKey = 'download'

package/src/services/api/restTools.js

@@ -1,24 +1,24 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-export { get, post }
+import { METHOD, request } from '@vue2-client/utils/request'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+export { get, post }

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

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

package/src/pages/AMisDemo/AMisDemo2.vue

@@ -1,70 +0,0 @@
-<template>
-  <amis-renderer :schema="schema" :locals="locals" />
-</template>
-<script>
-import AMISRenderer from '@vue2-client/base-client/components/common/AMisRender'
-
-const schema = {
-    // 原生与自定义组件混用
-    type: 'page',
-    data: {
-      queryParamsName: 'crud_dictionary_manage',
-      fixedQueryForm: '{}'
-    },
-    body: [
-      {
-        type: 'tabs',
-        tabsMode: 'chrome',
-        name: 'fixedQueryForm',
-        id: 'username',
-        tabs: [
-          {
-            title: '测试1',
-            value: '{"d_f_name":"设备异常处理方式"}',
-            body: {
-              name: 'username',
-              id: 'XFormTable1',
-              type: 'XFormTable',
-            }
-          },
-          {
-            title: '选项卡3',
-            value: '{"d_f_name":"二级用气性质"}',
-            body: {
-                name: 'username2',
-                id: 'XFormTable2',
-                type: 'XFormTable',
-              }
-          },
-        ],
-      },
-    ]
-  }
-
-export default {
-  name: 'AMisDemo',
-  components: {
-    'amis-renderer': AMISRenderer,
-  },
-  computed: {
-  },
-  props: {
-    queryParamsName: {
-      type: String,
-      default: () => {
-        return 'crud_dictionary_manage'
-      }
-    }
-  },
-  mounted () {
-
-  },
-  data: () => ({
-    schema: schema,
-    locals: {},
-    vms: {}
-  }),
-  methods: {
-  }
-}
-</script>