vue2-client 1.9.39 → 1.9.41

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

@@ -1,70 +1,70 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="示例表单查询"
-      :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      service-name="af-revenue"
-      @action="action"
-      @columnClick="columnClick"
-      ref="xFormTable">
-    </x-form-table>
-    <a-drawer
-      title="详情信息"
-      placement="right"
-      :destroy-on-close="true"
-      width="85vw"
-      :closable="false"
-      :visible="detailVisible"
-      @close="onClose">
-      <span>
-        详情表单内容
-      </span>
-    </a-drawer>
-  </a-card>
-</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: 'ChargeQueryCRUD',
-      // 查询配置左侧tree
-      // xTreeConfigName: 'addressType',
-      // 新增表单固定值
-      fixedAddForm: {},
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  },
-  methods: {
-    columnClick (key, value, record) {
-      microDispatch({ type: 'v3route', path: '/bingliguanli/dianzibingliluru', props: { selected: arguments[0].his_f_admission_id } })
-    },
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    }
-  },
-  computed: {
-  },
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例表单查询"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      service-name="af-revenue"
+      @action="action"
+      @columnClick="columnClick"
+      ref="xFormTable">
+    </x-form-table>
+    <a-drawer
+      title="详情信息"
+      placement="right"
+      :destroy-on-close="true"
+      width="85vw"
+      :closable="false"
+      :visible="detailVisible"
+      @close="onClose">
+      <span>
+        详情表单内容
+      </span>
+    </a-drawer>
+  </a-card>
+</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: 'ChargeQueryCRUD',
+      // 查询配置左侧tree
+      // xTreeConfigName: 'addressType',
+      // 新增表单固定值
+      fixedAddForm: {},
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  methods: {
+    columnClick (key, value, record) {
+      microDispatch({ type: 'v3route', path: '/bingliguanli/dianzibingliluru', props: { selected: arguments[0].his_f_admission_id } })
+    },
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+  computed: {
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/base-client/components/common/XFormTable/index.md

@@ -1,98 +1,98 @@
-# XFormTable
-
-动态查询控件，进一步整合了XTable和XForm
-
-
-## 何时使用
-
-当需要一个通用的表单，表格一体化控件时
-
-
-引用方式：
-
-```javascript
-import XFormTable from '@vue2-client/base-client/components/XFormTable/XFormTable'
-
-export default {
-  components: {
-    XFormTable
-  }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<x-form-table
-  title="业务名称"
-  :queryParamsName="queryParamsName">
-</x-form-table>
-```
-
-## API
-
-| 参数                 | 说明                      | 类型      | 默认值   |
-|--------------------|-------------------------|---------|-------|
-| title              | 业务名称                    | String  | ''    |
-| queryParamsName    | 查询配置JSON文件名             | String  | null  |
-| queryParamsJson    | 查询配置文件Json，用于查询配置生成器的预览 | Object  | null  |
-| serviceName        | 配置所属命名空间                | String  | null  |
-| logicName          | 通过logic获取表单表格配置         | String  | null  |
-| logicParam         | 执行logic传递的参数            | Object  | null  |
-| fixedQueryForm     | 固定查询表单,会和查询表单合并查询       | Object  | {}    |
-| fixedAddForm       | 固定新增表单，会和新增表单合并         | Object  | {}    |
-| isExports          | 是否显示导出按钮                | Boolean | true  |
-| viewMode           | 是否为预览模式                 | Boolean | false |
-| getDataParams      | 调用logic获取数据源的追加参数       | Object  | -     |
-| @action            | 表格详情列的单击事件              | event   | -     |
-| @afterSubmit       | 增改提交后的回调方法              | event   | -     |
-| @afterDelete       | 删除提交后的回调方法              | event   | -     |
-| @afterSearchSubmit | 查询提交后的回调方法              | event   | -     |
- | @afterQuery        | 表格查询后的回调方法              | event   | -     |
- | @selectRow         | 选择表格列后的回调方法             | event   | -     |
-## 例子1
-----
-（基础使用）
-
-```vue
-<template>
-  <x-form-table
-    :queryParamsName="queryParamsName"
-    @action="toDetail">
-  </x-form-table>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/XFormTable/XFormTable'
-
-export default {
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 查询配置文件名
-      queryParamsName: 'logQueryParams'
-    }
-  },
-  methods: {
-    toDetail (record, id) {
-      console.debug("您选择了项："+ id)
-    }
-  }
-}
-</script>
-```
-
-注意事项
-----
-
-> 本组件已经实现了自适应布局，在不同分辨率下的设备均可得到基本理想的展示效果
->
-> 本组件已支持临时表的创建，当表名以##（两个井号）开头，则认为在创建临时表。
->
-> 临时表会在连接断开时自动销毁
->
-> 临时表仅做展示数据用，增，改，删，需要传入对应的自定义事件。自定义处理方式
+# XFormTable
+
+动态查询控件，进一步整合了XTable和XForm
+
+
+## 何时使用
+
+当需要一个通用的表单，表格一体化控件时
+
+
+引用方式：
+
+```javascript
+import XFormTable from '@vue2-client/base-client/components/XFormTable/XFormTable'
+
+export default {
+  components: {
+    XFormTable
+  }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<x-form-table
+  title="业务名称"
+  :queryParamsName="queryParamsName">
+</x-form-table>
+```
+
+## API
+
+| 参数                 | 说明                      | 类型      | 默认值   |
+|--------------------|-------------------------|---------|-------|
+| title              | 业务名称                    | String  | ''    |
+| queryParamsName    | 查询配置JSON文件名             | String  | null  |
+| queryParamsJson    | 查询配置文件Json，用于查询配置生成器的预览 | Object  | null  |
+| serviceName        | 配置所属命名空间                | String  | null  |
+| logicName          | 通过logic获取表单表格配置         | String  | null  |
+| logicParam         | 执行logic传递的参数            | Object  | null  |
+| fixedQueryForm     | 固定查询表单,会和查询表单合并查询       | Object  | {}    |
+| fixedAddForm       | 固定新增表单，会和新增表单合并         | Object  | {}    |
+| isExports          | 是否显示导出按钮                | Boolean | true  |
+| viewMode           | 是否为预览模式                 | Boolean | false |
+| getDataParams      | 调用logic获取数据源的追加参数       | Object  | -     |
+| @action            | 表格详情列的单击事件              | event   | -     |
+| @afterSubmit       | 增改提交后的回调方法              | event   | -     |
+| @afterDelete       | 删除提交后的回调方法              | event   | -     |
+| @afterSearchSubmit | 查询提交后的回调方法              | event   | -     |
+ | @afterQuery        | 表格查询后的回调方法              | event   | -     |
+ | @selectRow         | 选择表格列后的回调方法             | event   | -     |
+## 例子1
+----
+（基础使用）
+
+```vue
+<template>
+  <x-form-table
+    :queryParamsName="queryParamsName"
+    @action="toDetail">
+  </x-form-table>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/XFormTable/XFormTable'
+
+export default {
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'logQueryParams'
+    }
+  },
+  methods: {
+    toDetail (record, id) {
+      console.debug("您选择了项："+ id)
+    }
+  }
+}
+</script>
+```
+
+注意事项
+----
+
+> 本组件已经实现了自适应布局，在不同分辨率下的设备均可得到基本理想的展示效果
+>
+> 本组件已支持临时表的创建，当表名以##（两个井号）开头，则认为在创建临时表。
+>
+> 临时表会在连接断开时自动销毁
+>
+> 临时表仅做展示数据用，增，改，删，需要传入对应的自定义事件。自定义处理方式

package/src/base-client/components/common/XImportExcel/XImportExcel.vue

@@ -1,162 +1,162 @@
-<template>
-  <a-modal
-    title="数据导入"
-    :visible="open"
-    :zIndex="1001"
-    :confirm-loading="uploading"
-    @cancel="importExcelHandleCancel"
-  >
-    <a-spin tip="上传中..." :spinning="uploading">
-      <a-upload-dragger
-        name="file"
-        accept=".xlsx, .xls"
-        :file-list="fileList"
-        :multiple="false"
-        :remove="handleRemove"
-        :before-upload="beforeUpload"
-      >
-        <p class="ant-upload-drag-icon">
-          <a-icon type="inbox" />
-        </p>
-        <p class="ant-upload-text">
-          请将文件拖拽到此处上传
-        </p>
-        <p class="ant-upload-hint">
-          支持单个上传，也可以点击后选择文件上传
-        </p>
-      </a-upload-dragger>
-      <a-divider v-if="$slots.importExcelSlot"/>
-      <a-collapse :bordered="false" v-if="$slots.importExcelSlot">
-        <a-collapse-panel key="0" header="查看导入说明">
-          <slot name="importExcelSlot"></slot>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-spin>
-    <template slot="footer">
-      <a-row>
-        <a-button type="link" icon="download" v-if="queryParamsName !== 'none'" @click="importTemplate">
-          下载导入模板
-        </a-button>
-        <a-button key="back" @click="importExcelHandleCancel">
-          取消
-        </a-button>
-        <a-button key="submit" type="primary" :loading="uploading" @click="importExcelHandleChange">
-          导入
-        </a-button>
-      </a-row>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-
-import { importData, downloadImportExcel } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'XImportExcel',
-  props: {
-    serviceName: {
-      type: String,
-      default: undefined
-    },
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    queryParamsName: {
-      type: String,
-      default: 'none'
-    },
-    // 业务名称
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  components: {
-  },
-  data () {
-    return {
-      open: false,
-      uploadStatus: '',
-      fileList: [],
-      // 是否禁用上传
-      uploading: false
-    }
-  },
-  filters: {
-  },
-  created () {
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  watch: {
-  },
-  methods: {
-    /** 导入excel窗体关闭 */
-    importExcelHandleCancel (e) {
-      this.open = false
-      this.fileList = []
-      // 关闭后刷新列表
-      this.$emit('ok')
-    },
-    /** 下载模板操作 */
-    importTemplate () {
-      downloadImportExcel({
-        queryParamsName: this.queryParamsName
-      }, this.serviceName, this.env === 'dev').then(res => {
-        if (!res || !res.value) {
-          this.$message.warn('导入模板不存在，请检查配置')
-           return
-        }
-        window.open(res.value)
-      })
-    },
-    /** 导入excel窗体开启 */
-    importExcelHandleOpen (e) {
-      this.open = true
-    },
-    beforeUpload (file) {
-      this.fileList = [file]
-      return false
-    },
-    /** 导入excel */
-    importExcelHandleChange () {
-      const { fileList } = this
-      const formData = new FormData()
-      if (!fileList[0]) {
-        this.$message.warn('请选择需要上传的文件')
-        return
-      }
-      this.uploading = true
-      const userData = {
-        currUserName: this.currUser.name,
-        currUserId: this.currUser.id,
-        orgId: this.currUser.orgid,
-        orgName: this.currUser.orgs,
-        depId: this.currUser.depids,
-        depName: this.currUser.deps
-      }
-      formData.append('file', fileList[0])
-      formData.append('queryParamsName', this.queryParamsName)
-      formData.append('userData', JSON.stringify(userData))
-      importData(formData, this.serviceName, this.env === 'dev').then(res => {
-        this.fileList = []
-        this.$message.success(res.msg || res)
-        this.open = false
-        this.$emit('ok')
-      }).catch(e => {
-        this.$message.error(e)
-      }).finally(() => {
-        this.uploading = false
-      })
-    },
-    handleRemove () {
-      this.fileList = []
-      this.uploading = false
-    }
-  }
-}
-</script>
+<template>
+  <a-modal
+    title="数据导入"
+    :visible="open"
+    :zIndex="1001"
+    :confirm-loading="uploading"
+    @cancel="importExcelHandleCancel"
+  >
+    <a-spin tip="上传中..." :spinning="uploading">
+      <a-upload-dragger
+        name="file"
+        accept=".xlsx, .xls"
+        :file-list="fileList"
+        :multiple="false"
+        :remove="handleRemove"
+        :before-upload="beforeUpload"
+      >
+        <p class="ant-upload-drag-icon">
+          <a-icon type="inbox" />
+        </p>
+        <p class="ant-upload-text">
+          请将文件拖拽到此处上传
+        </p>
+        <p class="ant-upload-hint">
+          支持单个上传，也可以点击后选择文件上传
+        </p>
+      </a-upload-dragger>
+      <a-divider v-if="$slots.importExcelSlot"/>
+      <a-collapse :bordered="false" v-if="$slots.importExcelSlot">
+        <a-collapse-panel key="0" header="查看导入说明">
+          <slot name="importExcelSlot"></slot>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-spin>
+    <template slot="footer">
+      <a-row>
+        <a-button type="link" icon="download" v-if="queryParamsName !== 'none'" @click="importTemplate">
+          下载导入模板
+        </a-button>
+        <a-button key="back" @click="importExcelHandleCancel">
+          取消
+        </a-button>
+        <a-button key="submit" type="primary" :loading="uploading" @click="importExcelHandleChange">
+          导入
+        </a-button>
+      </a-row>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+
+import { importData, downloadImportExcel } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'XImportExcel',
+  props: {
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    queryParamsName: {
+      type: String,
+      default: 'none'
+    },
+    // 业务名称
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      uploadStatus: '',
+      fileList: [],
+      // 是否禁用上传
+      uploading: false
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  watch: {
+  },
+  methods: {
+    /** 导入excel窗体关闭 */
+    importExcelHandleCancel (e) {
+      this.open = false
+      this.fileList = []
+      // 关闭后刷新列表
+      this.$emit('ok')
+    },
+    /** 下载模板操作 */
+    importTemplate () {
+      downloadImportExcel({
+        queryParamsName: this.queryParamsName
+      }, this.serviceName, this.env === 'dev').then(res => {
+        if (!res || !res.value) {
+          this.$message.warn('导入模板不存在，请检查配置')
+           return
+        }
+        window.open(res.value)
+      })
+    },
+    /** 导入excel窗体开启 */
+    importExcelHandleOpen (e) {
+      this.open = true
+    },
+    beforeUpload (file) {
+      this.fileList = [file]
+      return false
+    },
+    /** 导入excel */
+    importExcelHandleChange () {
+      const { fileList } = this
+      const formData = new FormData()
+      if (!fileList[0]) {
+        this.$message.warn('请选择需要上传的文件')
+        return
+      }
+      this.uploading = true
+      const userData = {
+        currUserName: this.currUser.name,
+        currUserId: this.currUser.id,
+        orgId: this.currUser.orgid,
+        orgName: this.currUser.orgs,
+        depId: this.currUser.depids,
+        depName: this.currUser.deps
+      }
+      formData.append('file', fileList[0])
+      formData.append('queryParamsName', this.queryParamsName)
+      formData.append('userData', JSON.stringify(userData))
+      importData(formData, this.serviceName, this.env === 'dev').then(res => {
+        this.fileList = []
+        this.$message.success(res.msg || res)
+        this.open = false
+        this.$emit('ok')
+      }).catch(e => {
+        this.$message.error(e)
+      }).finally(() => {
+        this.uploading = false
+      })
+    },
+    handleRemove () {
+      this.fileList = []
+      this.uploading = false
+    }
+  }
+}
+</script>