vue2-client 1.16.20 → 1.16.22

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

@@ -1,3 +1,3 @@
-import CreateSimpleFormQuery from './CreateSimpleFormQuery'
-
-export default CreateSimpleFormQuery
+import CreateSimpleFormQuery from './CreateSimpleFormQuery'
+
+export default CreateSimpleFormQuery

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

@@ -1,42 +1,42 @@
-# CreateSimpleFormQuery 基础表单配置生成（仅新增场景）
-
-提供基础表单配置生成（仅新增场景）的快捷组件
-
-
-
-## 何时使用
-
-允许生成基础表单的配置
-
-
-
-引用方式：
-
-```javascript
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/CreateSimpleFormQuery'
-
-export default {
-    components: {
-      CreateSimpleFormQuery
-    }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<create-simple-form-query
-  :toEditJson="toEditJson"
-  :visible.sync="createSimpleFormVisible"
-/>
-```
-
-## API
-
-| 参数                         | 说明                                       | 类型      | 默认值       |
-|----------------------------|------------------------------------------|---------|-----------|
-| visible                    | 是否显示                                     | Boolean | false     |
-| toEditJson                 | 要编辑的json 当 visible 从false变成true时解析加载到页面上 | Object  | undefined |
-| @saveSimpleFormQueryParams | 基础表单配置点击保存后事件                            | event   | -         |
+# CreateSimpleFormQuery 基础表单配置生成（仅新增场景）
+
+提供基础表单配置生成（仅新增场景）的快捷组件
+
+
+
+## 何时使用
+
+允许生成基础表单的配置
+
+
+
+引用方式：
+
+```javascript
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/CreateSimpleFormQuery'
+
+export default {
+    components: {
+      CreateSimpleFormQuery
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<create-simple-form-query
+  :toEditJson="toEditJson"
+  :visible.sync="createSimpleFormVisible"
+/>
+```
+
+## API
+
+| 参数                         | 说明                                       | 类型      | 默认值       |
+|----------------------------|------------------------------------------|---------|-----------|
+| visible                    | 是否显示                                     | Boolean | false     |
+| toEditJson                 | 要编辑的json 当 visible 从false变成true时解析加载到页面上 | Object  | undefined |
+| @saveSimpleFormQueryParams | 基础表单配置点击保存后事件                            | event   | -         |

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

@@ -1,3 +1,3 @@
-import FormGroupEdit from './FormGroupEdit'
-
-export default FormGroupEdit
+import FormGroupEdit from './FormGroupEdit'
+
+export default FormGroupEdit

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

@@ -1,43 +1,43 @@
-# FormGroupEdit 表单参数组配置编辑
-
-提供表单参数组配置编辑的快捷组件
-
-
-
-## 何时使用
-
-允许通过表单参数组编辑参数
-
-
-
-引用方式：
-
-```javascript
-import FormGroupEdit from '@vue2-client/base-client/components/FormGroupEdit'
-
-export default {
-    components: {
-      FormGroupEdit
-    }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<form-group-edit
-  @getColumnJson="getColumnJson"
-  :visible.sync="createQueryVisible"
-  @saveQueryParams="saveQueryParams"
-/>
-```
-
-## API
-
-| 参数               | 说明         | 类型      | 默认值   |
-|------------------|------------|---------|-------|
-| visible          | 是否显示       | Boolean | false |
-| @getColumnJson   | 获取表单配置方法   | event   | -     |
-| @saveQueryParams | 存储查询配置信息事件 | event   | -     |
+# FormGroupEdit 表单参数组配置编辑
+
+提供表单参数组配置编辑的快捷组件
+
+
+
+## 何时使用
+
+允许通过表单参数组编辑参数
+
+
+
+引用方式：
+
+```javascript
+import FormGroupEdit from '@vue2-client/base-client/components/FormGroupEdit'
+
+export default {
+    components: {
+      FormGroupEdit
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<form-group-edit
+  @getColumnJson="getColumnJson"
+  :visible.sync="createQueryVisible"
+  @saveQueryParams="saveQueryParams"
+/>
+```
+
+## API
+
+| 参数               | 说明         | 类型      | 默认值   |
+|------------------|------------|---------|-------|
+| visible          | 是否显示       | Boolean | false |
+| @getColumnJson   | 获取表单配置方法   | event   | -     |
+| @saveQueryParams | 存储查询配置信息事件 | event   | -     |

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

@@ -1,166 +1,166 @@
-<template>
-  <a-drawer
-    :visible="visible"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    placement="right"
-    title="表单参数组配置"
-    @close="onClose"
-  >
-    <create-simple-form-query
-      :to-edit-json="editItem()"
-      :as-a-params-group="true"
-      :visible.sync="createQueryVisible"
-      @saveQueryParams="saveQueryParams"
-    />
-    <a-list
-      :dataSource="contentCopy()"
-      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
-    >
-      <a-list-item slot="renderItem" slot-scope="item, index">
-        <template v-if="item.type">
-          <a-button class="new-btn" type="dashed" @click="toCreateQuery">
-            <a-icon type="plus" />新增参数组
-          </a-button>
-        </template>
-        <template v-else>
-          <a-card :hoverable="true">
-            <a-card-meta >
-              <div slot="title" style="margin-bottom: 3px">{{ item.group }}</div>
-              <a-icon slot="avatar" :style="{ fontSize:'2em' }" type="tags"/>
-              <div slot="description" class="meta-content">{{ item.describe }}</div>
-            </a-card-meta>
-            <a slot="actions" @click="toEditQuery(index)">编辑</a>
-            <a slot="actions" @click="toDelete(index)">删除</a>
-          </a-card>
-        </template>
-      </a-list-item>
-    </a-list>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import CreateSimpleFormQuery from '../CreateSimpleFormQuery'
-
-export default {
-  name: 'FormGroupQuery',
-  components: {
-    CreateSimpleFormQuery
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // 是否显示生成查询配置抽屉
-      createQueryVisible: false,
-      targetIndex: 0,
-      editIndex: -1
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    content: {
-      type: Object,
-      required: true
-    }
-  },
-  watch: {
-    visible (rel) {
-      if (rel) {
-        this.initView()
-      }
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.editIndex = -1
-    },
-    toCreateQuery () {
-      this.editIndex = -1
-      this.createQueryVisible = true
-    },
-    toEditQuery (index) {
-      this.editIndex = index
-      this.createQueryVisible = true
-    },
-    toDelete (index) {
-      const _this = this
-      this.$confirm({
-        title: '您确定要删除该参数组？',
-        content: '删除的参数组无法恢复',
-        okText: '确定',
-        okType: 'danger',
-        cancelText: '取消',
-        onOk () {
-          _this.content.groups.splice(index, 1)
-          _this.$emit('saveQueryParams', _this.content)
-        }
-      })
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    // 存储查询配置信息
-    saveQueryParams (source) {
-      if (!this.content.groups) {
-        this.content.groups = []
-      }
-      if (this.editIndex !== -1) {
-        this.content.groups[this.editIndex] = source
-      } else {
-        this.content.groups.push(source)
-      }
-      this.$emit('saveQueryParams', this.content)
-      this.createQueryVisible = false
-    },
-    contentCopy () {
-      let groups
-      if (this.content.groups) {
-        groups = JSON.parse(JSON.stringify(this.content.groups))
-      } else {
-        groups = []
-      }
-      groups.push({ type: 'add' })
-      return groups
-    },
-    editItem () {
-      if (this.editIndex !== -1) {
-        return JSON.parse(JSON.stringify(this.content.groups[this.editIndex]))
-      } else {
-        return {}
-      }
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-  .card-avatar {
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-  }
-  .new-btn{
-    border-radius: 2px;
-    width: 100%;
-    height: 187px;
-  }
-  .meta-content{
-    position: relative;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    height: 64px;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
-  }
-</style>
+<template>
+  <a-drawer
+    :visible="visible"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    placement="right"
+    title="表单参数组配置"
+    @close="onClose"
+  >
+    <create-simple-form-query
+      :to-edit-json="editItem()"
+      :as-a-params-group="true"
+      :visible.sync="createQueryVisible"
+      @saveQueryParams="saveQueryParams"
+    />
+    <a-list
+      :dataSource="contentCopy()"
+      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
+    >
+      <a-list-item slot="renderItem" slot-scope="item, index">
+        <template v-if="item.type">
+          <a-button class="new-btn" type="dashed" @click="toCreateQuery">
+            <a-icon type="plus" />新增参数组
+          </a-button>
+        </template>
+        <template v-else>
+          <a-card :hoverable="true">
+            <a-card-meta >
+              <div slot="title" style="margin-bottom: 3px">{{ item.group }}</div>
+              <a-icon slot="avatar" :style="{ fontSize:'2em' }" type="tags"/>
+              <div slot="description" class="meta-content">{{ item.describe }}</div>
+            </a-card-meta>
+            <a slot="actions" @click="toEditQuery(index)">编辑</a>
+            <a slot="actions" @click="toDelete(index)">删除</a>
+          </a-card>
+        </template>
+      </a-list-item>
+    </a-list>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import CreateSimpleFormQuery from '../CreateSimpleFormQuery'
+
+export default {
+  name: 'FormGroupQuery',
+  components: {
+    CreateSimpleFormQuery
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // 是否显示生成查询配置抽屉
+      createQueryVisible: false,
+      targetIndex: 0,
+      editIndex: -1
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    content: {
+      type: Object,
+      required: true
+    }
+  },
+  watch: {
+    visible (rel) {
+      if (rel) {
+        this.initView()
+      }
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.editIndex = -1
+    },
+    toCreateQuery () {
+      this.editIndex = -1
+      this.createQueryVisible = true
+    },
+    toEditQuery (index) {
+      this.editIndex = index
+      this.createQueryVisible = true
+    },
+    toDelete (index) {
+      const _this = this
+      this.$confirm({
+        title: '您确定要删除该参数组？',
+        content: '删除的参数组无法恢复',
+        okText: '确定',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk () {
+          _this.content.groups.splice(index, 1)
+          _this.$emit('saveQueryParams', _this.content)
+        }
+      })
+    },
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    // 存储查询配置信息
+    saveQueryParams (source) {
+      if (!this.content.groups) {
+        this.content.groups = []
+      }
+      if (this.editIndex !== -1) {
+        this.content.groups[this.editIndex] = source
+      } else {
+        this.content.groups.push(source)
+      }
+      this.$emit('saveQueryParams', this.content)
+      this.createQueryVisible = false
+    },
+    contentCopy () {
+      let groups
+      if (this.content.groups) {
+        groups = JSON.parse(JSON.stringify(this.content.groups))
+      } else {
+        groups = []
+      }
+      groups.push({ type: 'add' })
+      return groups
+    },
+    editItem () {
+      if (this.editIndex !== -1) {
+        return JSON.parse(JSON.stringify(this.content.groups[this.editIndex]))
+      } else {
+        return {}
+      }
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .card-avatar {
+    width: 48px;
+    height: 48px;
+    border-radius: 48px;
+  }
+  .new-btn{
+    border-radius: 2px;
+    width: 100%;
+    height: 187px;
+  }
+  .meta-content{
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    height: 64px;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+</style>

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

@@ -1,3 +1,3 @@
-import FormGroupQuery from './FormGroupQuery'
-
-export default FormGroupQuery
+import FormGroupQuery from './FormGroupQuery'
+
+export default FormGroupQuery

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

@@ -1,43 +1,43 @@
-# FormGroupQuery 表单参数组配置生成
-
-提供表单参数组配置生成的快捷组件
-
-
-
-## 何时使用
-
-允许生成表单参数组
-
-
-
-引用方式：
-
-```javascript
-import FormGroupQuery from '@vue2-client/base-client/components/FormGroupQuery'
-
-export default {
-    components: {
-      FormGroupQuery
-    }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<form-group-query
-  @getColumnJson="getColumnJson"
-  :visible.sync="createQueryVisible"
-  @saveQueryParams="saveQueryParams"
-/>
-```
-
-## API
-
-| 参数               | 说明         | 类型      | 默认值   |
-|------------------|------------|---------|-------|
-| visible          | 是否显示       | Boolean | false |
-| @getColumnJson   | 获取表单配置方法   | event   | -     |
-| @saveQueryParams | 存储查询配置信息事件 | event   | -     |
+# FormGroupQuery 表单参数组配置生成
+
+提供表单参数组配置生成的快捷组件
+
+
+
+## 何时使用
+
+允许生成表单参数组
+
+
+
+引用方式：
+
+```javascript
+import FormGroupQuery from '@vue2-client/base-client/components/FormGroupQuery'
+
+export default {
+    components: {
+      FormGroupQuery
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<form-group-query
+  @getColumnJson="getColumnJson"
+  :visible.sync="createQueryVisible"
+  @saveQueryParams="saveQueryParams"
+/>
+```
+
+## API
+
+| 参数               | 说明         | 类型      | 默认值   |
+|------------------|------------|---------|-------|
+| visible          | 是否显示       | Boolean | false |
+| @getColumnJson   | 获取表单配置方法   | event   | -     |
+| @saveQueryParams | 存储查询配置信息事件 | event   | -     |

package/src/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.vue

@@ -39,17 +39,15 @@ export default {
     serviceName: {
       type: String,
       default: process.env.VUE_APP_SYSTEM_NAME
-    },
-    formStyle: {
-      type: String,
-      default: 'defaultForm'
     }
   },
   data () {
     return {
       loading: true,
       config: {},
-      formInstances: []
+      formInstances: [],
+      // 从配置读取的样式标识（默认值）
+      formStyle: 'defaultForm'
     }
   },
   computed: {
@@ -83,6 +81,10 @@ export default {
         const res = await getConfigByNameAsync(this.queryParamsName, this.serviceName)
         if (res) {
           this.config = res
+          // 从接口配置设置样式标识
+          if (this.config.formStyle) {
+            this.formStyle = this.config.formStyle
+          }
           if (this.config.manyForm) {
             this.addFormInstance()
           } else {
@@ -358,6 +360,16 @@ export default {
     // background-color: #fff;
     border-radius: 8px;
   }
+  &.h-add-native-form-medicalForm {
+    @media (min-width: 1200px) {
+      :deep(.ant-col-xl-6) {
+        display: block;
+        flex: 0 0 42%;
+        max-width: 42%;
+        width: 42%;
+      }
+    }
+  }
 }
 
 .form-instance-wrapper {