vue2-client 1.9.132 → 1.9.134

package/package.json

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

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

@@ -55,7 +55,7 @@
         v-else-if="attr.numberInput && !readOnly"
         v-model="form[attr.model]"
         :whitespace="true"
-        @input="attr.dataChangeFunc && debouncedDataChangeFunc()"
+        @change="attr.dataChangeFunc && debouncedDataChangeFunc()"
         :disabled="disabled && !readOnly"
         style="width:100%"
         @blur="mode !== '查询' && attr.inputOnBlurFunc && emitFunc(attr.inputOnBlurFunc,attr)"

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

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

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

@@ -1,10 +1,10 @@
 <template>
   <div id="test">
-    <div>
+    <a-card :bordered="false">
       <XReport
         ref="main"
         :use-oss-for-img="false"
-        :config-name="configName"
+        config-name="templateManageView2"
         server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"
@@ -12,7 +12,7 @@
         :show-save-button="false"
         :no-padding="true"
         :dont-format="true"/>
-    </div>
+    </a-card>
   </div>
 </template>
 
@@ -20,31 +20,22 @@
 import XReport from './XReport'
 import XAddReport from '../XAddReport/XAddReport.vue'
 // eslint-disable-next-line no-unused-vars
+import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
 
 export default {
   name: 'XReportDemo',
   components: {
     XReport, XAddReport
   },
-  provide () {
-    return {
-      getSelectedId: () => 10,
-    }
-  },
   mounted () {
-    // this.$refs.main.openDialog('surgerySchedCover', -1, {})
-  },
-  beforeCreate () {
-    this.$store.commit('account/setUser', {
-      id: '374870707835895810'
-    })
+    // this.$refs.xAddReport.init({
+    //   configName: 'skinTestExecuActionCover',
+    //   selectedId: '11111',
+    //   mixinData: {}
+    // })
   },
   data () {
     return {
-      configName: 'medicalRecordCover'
-      // configName: 'physicianOrderEntryCover'
-      // configName: 'threeHealthCenterCover'
-      // configName: 'medOrderManaActCover'
     }
   },
   methods: {

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -141,6 +141,11 @@ export default {
       this.editorRef.loadUrl(fileUrl).then(() => {
         if (bindObject) {
           this.editorRef.setBindObject(bindObject)
+          if (bindObject.template) {
+            for (const key of Object.keys(bindObject.template)) {
+              this.editorRef.bindDataList(key, bindObject.template[key])
+            }
+          }
         }
         this.changeMode()
         this.fileUrl = fileUrl

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -1,50 +1,50 @@
-<template>
-  <div>
-    <a-list v-show="!loading" size="small" :data-source="data">
-      <a-list-item slot="renderItem" slot-scope="item">
-        <div>
-          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
-          <p>{{ item.date }}</p>
-        </div>
-        <a class="delete_item">
-          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
-        </a>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'FavoriteList',
-  data () {
-    return {
-      data: [],
-      loading: false
-    }
-  },
-  mounted () {
-    this.loadData()
-  },
-  methods: {
-    loadData () {
-      indexedDB.getAll((data) => {
-        const realData = data.filter(item => item.data && item.data.uuid)
-          .map(item => item.data)
-        this.data = realData
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.delete_item {
-  margin-left: 8px;
-  color: #333;
-}
-p {
-  margin: 0
-}
-</style>
+<template>
+  <div>
+    <a-list v-show="!loading" size="small" :data-source="data">
+      <a-list-item slot="renderItem" slot-scope="item">
+        <div>
+          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
+          <p>{{ item.date }}</p>
+        </div>
+        <a class="delete_item">
+          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
+        </a>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'FavoriteList',
+  data () {
+    return {
+      data: [],
+      loading: false
+    }
+  },
+  mounted () {
+    this.loadData()
+  },
+  methods: {
+    loadData () {
+      indexedDB.getAll((data) => {
+        const realData = data.filter(item => item.data && item.data.uuid)
+          .map(item => item.data)
+        this.data = realData
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.delete_item {
+  margin-left: 8px;
+  color: #333;
+}
+p {
+  margin: 0
+}
+</style>

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

@@ -83,13 +83,13 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/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/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/XTab/XTabDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),

package/src/services/api/entity.js

@@ -1,18 +1,18 @@
-import { post } from '@vue2-client/services/api/restTools'
-
-const entityApi = {
-  // 根据ID查询数据
-  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
-  },
-  // 根据ID集合查询所有数据
-  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
-  },
-  // 查询实体的总数量
-  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
-  }
-}
-
-export { entityApi }
+import { post } from '@vue2-client/services/api/restTools'
+
+const entityApi = {
+  // 根据ID查询数据
+  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
+  },
+  // 根据ID集合查询所有数据
+  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
+  },
+  // 查询实体的总数量
+  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
+  }
+}
+
+export { entityApi }

package/src/utils/waterMark.js

@@ -1,31 +1,31 @@
-/**
- * @description: createWaterMark.js 加水印功能
- */
-let waterMarkDOM
-
-const clearWaterMark = () => {
-  if (waterMarkDOM) waterMarkDOM.remove()
-}
-/**
- * @description: 创建水印
- * @param waterMarkName 水印内容
- */
-export default function createWaterMark (waterMarkName) {
-  clearWaterMark()
-  if (!waterMarkName) {
-    return
-  }
-  const width = window.parseInt(document.body.clientWidth)
-  const canvasWidth = width / window.parseInt(width / 320)
-  const fontFamily = window.getComputedStyle(document.body)['font-family']
-  const fragment = document.createDocumentFragment()
-  waterMarkDOM = document.createElement('div')
-  waterMarkDOM.className = 'water-mark-wrap'
-  let spanStr = ''
-  for (let i = 0; i < 100; i++) {
-    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
-  }
-  waterMarkDOM.innerHTML = spanStr
-  fragment.appendChild(waterMarkDOM)
-  document.body.appendChild(fragment)
-}
+/**
+ * @description: createWaterMark.js 加水印功能
+ */
+let waterMarkDOM
+
+const clearWaterMark = () => {
+  if (waterMarkDOM) waterMarkDOM.remove()
+}
+/**
+ * @description: 创建水印
+ * @param waterMarkName 水印内容
+ */
+export default function createWaterMark (waterMarkName) {
+  clearWaterMark()
+  if (!waterMarkName) {
+    return
+  }
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
+  const fontFamily = window.getComputedStyle(document.body)['font-family']
+  const fragment = document.createDocumentFragment()
+  waterMarkDOM = document.createElement('div')
+  waterMarkDOM.className = 'water-mark-wrap'
+  let spanStr = ''
+  for (let i = 0; i < 100; i++) {
+    spanStr += `<span class="water-word" style=width:${canvasWidth}px;height:200px;font: ${fontFamily}>${waterMarkName}</span>`
+  }
+  waterMarkDOM.innerHTML = spanStr
+  fragment.appendChild(waterMarkDOM)
+  document.body.appendChild(fragment)
+}

package/src/base-client/components/common/InvoiceComponent/index.vue

@@ -1,81 +0,0 @@
-<template>
-  <a-form :model="invoiceData" ref="invoiceForm" label-col="{ span: 4 }" wrapper-col="{ span: 14 }">
-    <!-- 卖方信息 -->
-    <a-form-item label="卖方信息">
-      <a-input v-model="invoiceData.seller" placeholder="请输入卖方信息"></a-input>
-    </a-form-item>
-
-    <!-- 买方信息 -->
-    <a-form-item label="买方信息">
-      <a-input v-model="invoiceData.buyer" placeholder="请输入买方信息"></a-input>
-    </a-form-item>
-
-    <!-- 项目明细 -->
-    <a-form-item label="项目明细">
-      <div v-for="(item, index) in invoiceData.items" :key="index" class="item-row">
-        <a-input v-model="item.name" placeholder="项目名称" style="width: 20%; margin-right: 10px;"></a-input>
-        <a-input v-model="item.quantity" placeholder="数量" style="width: 15%; margin-right: 10px;"></a-input>
-        <a-input v-model="item.price" placeholder="单价" style="width: 20%; margin-right: 10px;"></a-input>
-        <a-input v-model="item.tax" placeholder="税额" style="width: 20%;"></a-input>
-      </div>
-      <a-button type="dashed" @click="addItem" style="margin-top: 10px;">添加项目</a-button>
-    </a-form-item>
-
-    <!-- 合计金额 -->
-    <a-form-item label="合计金额">
-      <a-input v-model="invoiceData.total" placeholder="合计金额"></a-input>
-    </a-form-item>
-
-    <!-- 备注 -->
-    <a-form-item label="备注">
-      <a-input v-model="invoiceData.remarks" placeholder="请输入备注"></a-input>
-    </a-form-item>
-    <!-- 操作按钮 -->
-    <a-form-item wrapper-col="{ span: 14, offset: 4 }">
-      <a-button type="primary" @click="submitInvoice">开票</a-button>
-      <a-button style="margin-left: 8px;" @click="saveDraft">保存草稿</a-button>
-    </a-form-item>
-  </a-form>
-</template>
-
-<script>
-export default {
-  name: 'InvoiceComponent',
-  data () {
-    return {
-      // 发票数据模型
-      invoiceData: {
-        seller: '', // 卖方信息
-        buyer: '', // 买方信息
-        items: [ // 项目明细
-          { name: '', quantity: '', price: '', tax: '' }
-        ],
-        total: '', // 合计金额
-        remarks: '' // 备注
-      }
-    }
-  },
-  methods: {
-    // 添加项目明细
-    addItem () {
-      this.invoiceData.items.push({ name: '', quantity: '', price: '', tax: '' })
-    },
-    // 提交发票
-    submitInvoice () {
-      console.log('开票数据: ', this.invoiceData)
-      // 在此处执行发票提交的逻辑
-    },
-    // 保存草稿
-    saveDraft () {
-      console.log('保存草稿: ', this.invoiceData)
-      // 在此处执行保存草稿的逻辑
-    }
-  }
-}
-</script>
-
-<style scoped>
-.item-row {
-  margin-bottom: 10px;
-}
-</style>