vue2-client 1.9.40 → 1.9.42

package/package.json

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

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

@@ -5,8 +5,8 @@ import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 export default {
   name: 'Demo',
   components: { XAddNativeForm },
-  created () {
-    getConfigByNameAsync('orderRepairHandlerForm', 'af-revenue').then(res => {
+  mounted () {
+    getConfigByNameAsync('outpatientfeesForm', 'af-his').then(res => {
       this.$refs.xAddFrom.init(res)
     })
   },

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

@@ -464,14 +464,6 @@
       ></address-search-combobox>
     </a-form-model-item>
   </x-form-col>
-  <!-- 富文本 -->
-  <x-form-col
-    v-else-if="attr.type === 'richText' && show"
-    :flex="attr.flex">
-    <a-form-model-item :ref="attr.model" :prop="attr.prop ? attr.prop : attr.model">
-      <RichTextModal ref="richTextModal" style="height: 500px"></RichTextModal>
-    </a-form-model-item>
-  </x-form-col>
   <!-- 人员选择框 -->
   <x-form-col
     v-else-if="attr.type === 'personSetting' && show"
@@ -582,13 +574,12 @@ import PersonSetting from '@vue2-client/base-client/components/common/PersonSett
 import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
 import Upload from '@vue2-client/base-client/components/common/Upload'
 import moment from 'moment'
-import { upload, getConfigByName, runLogic, getConfigByNameAsync } from '@vue2-client/services/api/common'
-import util, { uuid } from '.././../../../utils/util'
+import { getConfigByName, runLogic, getConfigByNameAsync } from '@vue2-client/services/api/common'
+import util from '@vue2-client/utils/util'
 import XTreeSelect from '@vue2-client/base-client/components/common/XForm/XTreeSelect'
 import { searchToListOption, searchToOption } from '@vue2-client/services/v3Api'
 import { mapState } from 'vuex'
 import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'
-import RichTextModal from '../richTextModal/index.vue'
 import XLicensePlate from '@vue2-client/base-client/components/common/XLicensePlate/XLicensePlate.vue'
 
 export default {
@@ -601,8 +592,7 @@ export default {
     CitySelect,
     PersonSetting,
     AddressSearchCombobox,
-    Upload,
-    RichTextModal
+    Upload
   },
   data () {
     // 检索去抖
@@ -726,7 +716,7 @@ export default {
         }
     }
   },
-  async created () {
+  created () {
     this.init()
     if (this.attr.keyName && (this.attr?.keyName?.toString().indexOf('async ') !== -1 || this.attr?.keyName?.toString()?.indexOf('function') !== -1)) {
       this.debouncedUpdateOptions = debounce(this.updateOptions, 200)
@@ -930,11 +920,7 @@ export default {
           xxl: 6
         }
       }
-      if (this.attr.type === 'radio') {
-        this.initRadioValue()
-      } else if (this.attr.type === 'richText') {
-        this.initRichText()
-      } else if (this.attr.keyName && typeof this.attr.keyName === 'string') {
+      if (this.attr.keyName && typeof this.attr.keyName === 'string') {
         if (this.attr.keyName.indexOf('logic@') !== -1) {
           this.getData({}, res => this.getDataCallback(res))
         } else if (this.attr.keyName.indexOf('search@') !== -1) {
@@ -1000,74 +986,14 @@ export default {
     },
     initRadioValue () {
       const model = this.attr.model
-      if (this.mode === '新增/修改' && this.attr.type === 'radio' && !this.form[model] && !this.attr.prop) {
-        if (this.attr.keys && this.attr.keys.length > 0) {
+      if (this.mode === '新增/修改' && this.attr.type === 'radio' && (this.form[model] === undefined || this.form[model] === null) && !this.attr.prop) {
+        if (this.attr.keys && this.attr.keys.length > 1) {
           this.form[model] = this.attr.keys[0].value
-        } else if (this.option && this.option.length > 0) {
+        } else if (this.option.length > 1) {
           this.form[model] = this.option[0].value
-        } else if (this.attr.keyName) {
-          const list = this.$appdata.getDictionaryList(this.attr.keyName)
-          if (list.length > 0) {
-            this.form[model] = list[0].value
-          }
         }
       }
     },
-    async initRichText () {
-      const logicName = this.attr.keyName
-      if (logicName) {
-        this.getData({}, async res => {
-          try {
-            const response = await fetch(res.url) // 等待 fetch 完成
-            if (response.ok) {
-              const data = await response.text() // 等待解析为文本内容
-              const richText = JSON.parse(data)
-              this.$refs.richTextModal.init({
-                richText: richText
-              })
-            } else {
-              this.$message.error('富文本读取失败，请求结果：' + response.statusText)
-            }
-          } catch (error) {
-            this.$message.error('富文本读取失败，请求结果：' + error)
-          }
-        })
-      }
-    },
-    async getRichValue () {
-      if (this.$refs.richTextModal) {
-        const richText = this.$refs.richTextModal.getValue()
-        console.log('>>>> richText: ', richText)
-        const fileContent = JSON.stringify(richText)
-        const fileName = uuid() + '.txt'
-        // 创建一个 Blob 对象，类型为 text/plain
-        const blob = new Blob([fileContent], { type: 'text/plain' })
-        // 创建一个 File 对象（可选，但有助于保持一致性，因为 File 继承自 Blob）
-        const file = new File([blob], fileName, { type: blob.type })
-        // 组装上传数据
-        const headers = {
-          'Content-Type': 'multipart/form-data',
-        }
-        const formData = new FormData()
-        formData.append('avatar', file)
-        formData.append('resUploadMode', 'server')
-        formData.append('pathKey', 'Default')
-        formData.append('formType', 'file')
-        formData.append('useType', 'Default')
-        formData.append('filename', fileName)
-        formData.append('filesize', (blob.size / 1024 / 1024).toFixed(4))
-        formData.append('f_operator', this.currUser ? this.currUser.username : '')
-
-        // 上传文件
-        await upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }, this.env === 'dev').then(res => {
-          this.form[this.attr.model] = res.data.id
-          this.form.t_f_path = res.data.f_downloadpath
-        }).catch(error => {
-          // 处理上传错误
-          console.error(error)
-        })
-      }
-    },
     openChangeOne (status) {
       if (status) {
         this.yearShowOne = true

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

@@ -2,9 +2,10 @@
   <div>
     <!-- 树形选择框 -->
     <a-form-model-item :ref="model" :label="attr.name" :prop="model">
-      <a-spin v-if="!loaded" size="small"/>
+      <a-spin v-show="!loaded" size="small"/>
       <a-tree-select
-        v-else
+        v-show="loaded"
+        ref="tree-select"
         v-model="localValue"
         :disabled="disabled"
         :tree-data="getTreeData()"

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

@@ -298,9 +298,6 @@ export default {
       }
     },
   },
-  created () {
-    this.initConfig()
-  },
   methods: {
     runLogic,
     getConfigByNameAsync,
@@ -356,7 +353,6 @@ export default {
           getDataParams: this.getDataParams,
           env: this.env
         })
-        console.log('res', res)
         // 设置添加按钮对应的配置名
         this.moveconfig = res.moveconfig
         // 初始化 xTable 子组件
@@ -616,6 +612,7 @@ export default {
     }
   },
   mounted () {
+    this.initConfig()
     if (this.getSelectedData && typeof this.getSelectedData === 'function') {
       const selectedId = this.getSelectedData()
       if (typeof selectedId === 'object') {

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

@@ -222,26 +222,25 @@
       @close="onClose"
     >
       <template>
-        <div>
-          <a-statistic
-            v-for="(f,index) in summaryData"
-            :key="index"
-            :title="f.title + '：'"
-            :value="f.value"
-            :precision="2"
-            style="margin-right: 50px">
-            <template #prefix>
-              <a-spin :spinning="f.loading">
-              </a-spin>
-            </template>
-            <template #suffix>
-              <a-icon
-                v-show="!f.loading"
-                :type="f.success !== false ? 'check-circle' : 'close-circle'"
-                :style="{color: f.success !== false ? 'green' : 'red'}"/>
-            </template>
-          </a-statistic>
-        </div>
+        <a-row>
+          <a-col :span="8" v-for="(f,index) in summaryData" :key="index">
+            <a-statistic
+              :title="f.title + '：'"
+              :value="f.value"
+              :precision="2">
+              <template #prefix>
+                <a-spin :spinning="f.loading">
+                </a-spin>
+              </template>
+              <template #suffix>
+                <a-icon
+                  v-show="!f.loading"
+                  :type="f.success !== false ? 'check-circle' : 'close-circle'"
+                  :style="{color: f.success !== false ? 'green' : 'red'}"/>
+              </template>
+            </a-statistic>
+          </a-col>
+        </a-row>
       </template>
     </a-drawer>
     <x-import-excel

package/src/base-client/plugins/AppData.js

@@ -86,10 +86,10 @@ const GetAppDataService = {
     }
   },
   // 新版获取配置中心字典推荐使用 服务名默认为当前服务
-  getDictByKey (dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
+  getDictByKey (dictKey, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
     getConfigByName(dictKey, undefined, result => {
       callback(result.value)
-    })
+    }, isDev)
   },
   getParam (key, value, callback) {
     const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)

package/src/main.js

@@ -3,12 +3,12 @@ import App from './App.vue'
 import Router from 'vue-router'
 import Vuex from 'vuex'
 import { routerOptions, modules, i18n, message, bootstrap } from '../index'
-import eventLogPlugin from '@/plugins/EventLogPlugin'
+// import eventLogPlugin from '@/plugins/EventLogPlugin'
 import findParentData from '@/plugins/FindParentsData'
 
 Vue.use(Router)
 Vue.use(Vuex)
-Vue.use(eventLogPlugin)
+// Vue.use(eventLogPlugin)
 Vue.use(findParentData)
 
 // 创建router store

package/src/plugins/EventLogPlugin.js

@@ -6,7 +6,7 @@ const EventLogger = {
     // 排除 一些 vue 框架 / 前端脚手架 底层的一些事件日志
     const exclude = ['menuSelect', 'menuDeselect', 'popupScroll', 'popupFocus', 'mouseenter',
       'mouseleave', 'popupVisibleChange', 'popupScroll', 'click', 'keypress', 'keydown ', 'input ',
-      'change', 'popupVisibleChange', 'beforeCreate', 'created', 'beforeMount', 'mounted', 'componentDidMounted',
+      'change', 'popupVisibleChange', 'beforeCreate', 'created', 'beforeMount', 'mounted', 'componentDidMounted', 'update:visible',
     ]
     // 劫持 $emit
     Vue.prototype.$emit = function (eventName, ...args) {

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

@@ -83,9 +83,9 @@ 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/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/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
@@ -140,9 +140,6 @@ routerResource.XReportGrid = () =>
 routerResource.XTab = () =>
   import('@vue2-client/base-client/components/common/XTab/XTabDemo')
 
-routerResource.RichText = () =>
-  import('@vue2-client/base-client/components/common/richTextModal/richDemo.vue')
-
 console.log(process.env)
     // 基础路由组件注册
 const routerMap = {