vue2-client 1.9.41 → 1.9.43

package/package.json

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

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

@@ -783,7 +783,11 @@ export default {
       this.form = Object.assign(this.form, obj)
     },
     emitFunc (func, data) {
-      this.$emit(func, data, this.form[data.model])
+      if (data.model) {
+        this.$emit(func, data, this.form[data.model])
+      } else {
+        this.$emit(func, data)
+      }
       this.$emit('x-form-item-emit-func', func, data)
     },
     close () {

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

@@ -31,7 +31,7 @@
           v-if="attr.inputOnAfterName && attr.inputOnAfterFunc"
           style="flex: 1; width: auto; min-width: 4rem;max-width: 6rem"
           type="primary"
-          @click="emitFunc(attr.inputOnAfterFunc,form[attr.model])">
+          @click="emitFunc(attr.inputOnAfterFunc,attr)">
           {{ attr.inputOnAfterName }}
         </a-button>
         <!--    仅可以配置 一个按钮 以及 一个图标插槽    -->
@@ -40,7 +40,7 @@
           v-if="attr.inputOnAfterIcon"
           :type="attr.inputOnAfterIcon && attr.inputOnAfterName ? 'primary' :''"
           :icon="attr.inputOnAfterIcon || 'question'"
-          @click="emitFunc(attr.inputOnAfterIconFunc,form[attr.model])">
+          @click="emitFunc(attr.inputOnAfterIconFunc,attr)">
         </a-button>
       </a-input-group>
       <a-input-number
@@ -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,9 +920,7 @@ export default {
           xxl: 6
         }
       }
-      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) {
@@ -1006,61 +994,6 @@ export default {
         }
       }
     },
-    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/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/router/async/router.map.js

@@ -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 = {