vue2-client 1.10.32 → 1.10.35

package/package.json

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

package/src/App.vue

@@ -1,196 +1,196 @@
-<template>
-  <a-config-provider :locale="locale" :get-popup-container="popContainer">
-    <router-view/>
-  </a-config-provider>
-</template>
-
-<script>
-import { enquireScreen } from '@vue2-client/utils/util'
-import { mapState, mapMutations } from 'vuex'
-import themeUtil from '@vue2-client/utils/themeUtil'
-import { getI18nKey } from '@vue2-client/utils/routerUtil'
-import { setSystemVersion } from '@vue2-client/utils/request'
-import waterMark from '@vue2-client/utils/waterMark'
-
-export default {
-  name: 'App',
-  data () {
-    return {
-      locale: {}
-    }
-  },
-  created () {
-    this.setHtmlTitle()
-    this.setLanguage(this.lang)
-    enquireScreen(isMobile => this.setDevice(isMobile))
-  },
-  mounted () {
-    this.setWeekModeTheme(this.weekMode)
-    const configStr = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
-    if (configStr) {
-      const config = JSON.parse(configStr)
-      if (config?.$globalProp?.environment === 'dev') {
-        // 设置水印
-        waterMark('开发环境')
-      }
-    }
-    // 设置系统版本
-    setSystemVersion(this.compatible)
-    // 获取基座应用的信息进行初始化
-    this.setMicroApp()
-  },
-  watch: {
-    weekMode (val) {
-      this.setWeekModeTheme(val)
-    },
-    lang (val) {
-      this.setLanguage(val)
-      this.setHtmlTitle()
-    },
-    $route () {
-      this.setHtmlTitle()
-    },
-    'theme.mode': {
-      immediate: true,
-      handler: function (val) {
-        this.changeThemeMode(val)
-      }
-    },
-    'theme.color': {
-      immediate: true,
-      handler: function (val) {
-        this.changeThemeColor(val)
-      }
-    },
-    layout: function () {
-      window.dispatchEvent(new Event('resize'))
-    }
-  },
-  computed: {
-    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang', 'compatible'])
-  },
-  methods: {
-    ...mapMutations('setting', ['setDevice']),
-    changeThemeColor (val) {
-      if (process.env.NODE_ENV === 'production') {
-        const closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
-        themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
-      } else {
-        console.info('为保证构建性能，关闭开发环境下的主题色切换')
-      }
-    },
-    changeThemeMode (val) {
-      if (process.env.NODE_ENV === 'production') {
-        const closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
-        themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
-      } else {
-        console.info('为保证构建性能，关闭开发环境下的主题模式切换')
-      }
-    },
-    setWeekModeTheme (weekMode) {
-      if (weekMode) {
-        document.body.classList.add('week-mode')
-      } else {
-        document.body.classList.remove('week-mode')
-      }
-    },
-    setMicroApp () {
-      let baseApp = '/login'
-      let queryData = {}
-      const that = this
-      if (window.__MICRO_APP_ENVIRONMENT__) {
-        const data = window.microApp.getData() // 获取主应用下发的data数据
-        if (data.baseroute) {
-          baseApp = data.baseroute
-        } // 获取主应用下发的data数据
-        if (data.queryData) {
-          queryData = data.queryData
-        }
-        this.setMicroAppTheme(data.themeStore)
-        window.microApp.addDataListener((_data) => {
-          if (_data.baseroute) {
-            baseApp = _data.baseroute
-          }
-          that.setMicroAppTheme(_data.themeStore)
-        })
-        console.log('microApp', window.microApp)
-        this.$router.replace({ path: baseApp, query: queryData })
-      }
-    },
-    setMicroAppTheme (themeStore) {
-      try {
-        let themeScheme = 'dark'
-        if (themeStore && themeStore.themeColor && themeStore.themeScheme) {
-          if (themeStore.themeScheme === 'dark') {
-            themeScheme = 'night'
-          }
-          themeUtil.changeThemeColor(themeStore.themeColor, themeScheme)
-        }
-      } catch (e) {
-      }
-    },
-    setLanguage (lang) {
-      this.$i18n.locale = lang
-      switch (lang) {
-        case 'CN':
-          this.locale = require('ant-design-vue/es/locale-provider/zh_CN').default
-          break
-        case 'HK':
-          this.locale = require('ant-design-vue/es/locale-provider/zh_TW').default
-          break
-        case 'US':
-        default:
-          this.locale = require('ant-design-vue/es/locale-provider/en_US').default
-          break
-      }
-    },
-    setHtmlTitle () {
-      // 微应用下不设置title
-      if (window.__MICRO_APP_ENVIRONMENT__) {
-        return
-      }
-      const route = this.$route
-      const key = route.path === '/' ? 'home.name' : getI18nKey(route.matched[route.matched.length - 1].path)
-      document.title = process.env.VUE_APP_NAME + ' | ' + this.$t(key)
-    },
-    popContainer () {
-      return document.getElementById('popContainer')
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-#id {
-}
-</style>
-<style lang="less">
-@import "./font-style/font.css";
-
-body {
-  font-family: 'PingFangSC-Regular-woff2', 'Microsoft YaHei UI', serif !important;
-}
-
-.water-mark-wrap {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  z-index: 9999;
-  pointer-events: none;
-  top: 0;
-  left: 0;
-  display: flex;
-  overflow: hidden;
-  flex-wrap: wrap;
-}
-
-.water-word {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 18px;
-  color: rgba(8, 8, 8, 0.1);
-  transform: rotate(-45deg);
-  user-select: none;
-}
-</style>
+<template>
+  <a-config-provider :locale="locale" :get-popup-container="popContainer">
+    <router-view/>
+  </a-config-provider>
+</template>
+
+<script>
+import { enquireScreen } from '@vue2-client/utils/util'
+import { mapState, mapMutations } from 'vuex'
+import themeUtil from '@vue2-client/utils/themeUtil'
+import { getI18nKey } from '@vue2-client/utils/routerUtil'
+import { setSystemVersion } from '@vue2-client/utils/request'
+import waterMark from '@vue2-client/utils/waterMark'
+import { isMicroAppEnv } from '@vue2-client/utils/microAppUtils'
+
+export default {
+  name: 'App',
+  data () {
+    return {
+      locale: {}
+    }
+  },
+  created () {
+    this.setHtmlTitle()
+    this.setLanguage(this.lang)
+    enquireScreen(isMobile => this.setDevice(isMobile))
+  },
+  mounted () {
+    this.setWeekModeTheme(this.weekMode)
+    const configStr = localStorage.getItem(process.env.VUE_APP_WEB_CONFIG_KEY)
+    if (configStr) {
+      const config = JSON.parse(configStr)
+      if (config?.$globalProp?.environment === 'dev') {
+        // 设置水印
+        waterMark('开发环境')
+      }
+    }
+    // 设置系统版本
+    setSystemVersion(this.compatible)
+    // 获取基座应用的信息进行初始化
+    this.setMicroApp()
+  },
+  watch: {
+    weekMode (val) {
+      this.setWeekModeTheme(val)
+    },
+    lang (val) {
+      this.setLanguage(val)
+      this.setHtmlTitle()
+    },
+    $route () {
+      this.setHtmlTitle()
+    },
+    'theme.mode': {
+      immediate: true,
+      handler: function (val) {
+        this.changeThemeMode(val)
+      }
+    },
+    'theme.color': {
+      immediate: true,
+      handler: function (val) {
+        this.changeThemeColor(val)
+      }
+    },
+    layout: function () {
+      window.dispatchEvent(new Event('resize'))
+    }
+  },
+  computed: {
+    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang', 'compatible'])
+  },
+  methods: {
+    ...mapMutations('setting', ['setDevice']),
+    changeThemeColor (val) {
+      if (process.env.NODE_ENV === 'production') {
+        const closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
+        themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
+      } else {
+        console.info('为保证构建性能，关闭开发环境下的主题色切换')
+      }
+    },
+    changeThemeMode (val) {
+      if (process.env.NODE_ENV === 'production') {
+        const closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
+        themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
+      } else {
+        console.info('为保证构建性能，关闭开发环境下的主题模式切换')
+      }
+    },
+    setWeekModeTheme (weekMode) {
+      if (weekMode) {
+        document.body.classList.add('week-mode')
+      } else {
+        document.body.classList.remove('week-mode')
+      }
+    },
+    setMicroApp () {
+      let baseApp = '/login'
+      let queryData = {}
+      const that = this
+      if (isMicroAppEnv()) {
+        const data = window.microApp.getData() // 获取主应用下发的data数据
+        if (data.baseroute) {
+          baseApp = data.baseroute
+        } // 获取主应用下发的data数据
+        if (data.queryData) {
+          queryData = data.queryData
+        }
+        this.setMicroAppTheme(data.themeStore)
+        window.microApp.addDataListener((_data) => {
+          if (_data.baseroute) {
+            baseApp = _data.baseroute
+          }
+          that.setMicroAppTheme(_data.themeStore)
+        })
+        this.$router.replace({ path: baseApp, query: queryData })
+      }
+    },
+    setMicroAppTheme (themeStore) {
+      try {
+        let themeScheme = 'dark'
+        if (themeStore && themeStore.themeColor && themeStore.themeScheme) {
+          if (themeStore.themeScheme === 'dark') {
+            themeScheme = 'night'
+          }
+          themeUtil.changeThemeColor(themeStore.themeColor, themeScheme)
+        }
+      } catch (e) {
+      }
+    },
+    setLanguage (lang) {
+      this.$i18n.locale = lang
+      switch (lang) {
+        case 'CN':
+          this.locale = require('ant-design-vue/es/locale-provider/zh_CN').default
+          break
+        case 'HK':
+          this.locale = require('ant-design-vue/es/locale-provider/zh_TW').default
+          break
+        case 'US':
+        default:
+          this.locale = require('ant-design-vue/es/locale-provider/en_US').default
+          break
+      }
+    },
+    setHtmlTitle () {
+      // 微应用下不设置title
+      if (window.__MICRO_APP_ENVIRONMENT__) {
+        return
+      }
+      const route = this.$route
+      const key = route.path === '/' ? 'home.name' : getI18nKey(route.matched[route.matched.length - 1].path)
+      document.title = process.env.VUE_APP_NAME + ' | ' + this.$t(key)
+    },
+    popContainer () {
+      return document.getElementById('popContainer')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+#id {
+}
+</style>
+<style lang="less">
+@import "./font-style/font.css";
+
+body {
+  font-family: 'PingFangSC-Regular-woff2', 'Microsoft YaHei UI', serif !important;
+}
+
+.water-mark-wrap {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  z-index: 9999;
+  pointer-events: none;
+  top: 0;
+  left: 0;
+  display: flex;
+  overflow: hidden;
+  flex-wrap: wrap;
+}
+
+.water-word {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18px;
+  color: rgba(8, 8, 8, 0.1);
+  transform: rotate(-45deg);
+  user-select: none;
+}
+</style>

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

@@ -1,43 +1,43 @@
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByNameAsync } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'Demo',
-  components: { XAddNativeForm },
-  mounted () {
-    const realTableData = [{ tsc_f_contract_id: null, tsc_f_contract_code: '3316370809565024955', tsc_f_createfile_date: '2025-01-13 00:00:00', tsc_f_data: '王翔测试-15358338312: 繁荣南路滨河花园4楼号4单元19楼层1908门牌号' }]
-    getConfigByNameAsync('signContractForm', 'af-revenue').then(res => {
-      this.$refs.xAddFrom.init(Object.assign(res, {
-        modifyModelData: {
-          data: {
-            oldSignList: realTableData
-          }
-        }
-      }))
-    })
-  },
-  methods: {
-    aaa (attr, value) {
-    },
-    singLocal () {
-      console.log('singLocal')
-    }
-  }
-}
-</script>
-
-<template>
-  <a-card>
-    <x-add-native-form
-      ref="xAddFrom"
-      @getinfo="aaa"
-      @onSubmit="aaa"
-      @singLocal="singLocal"
-    />
-  </a-card>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'Demo',
+  components: { XAddNativeForm },
+  mounted () {
+    const realTableData = [{ tsc_f_contract_id: null, tsc_f_contract_code: '3316370809565024955', tsc_f_createfile_date: '2025-01-13 00:00:00', tsc_f_data: '王翔测试-15358338312: 繁荣南路滨河花园4楼号4单元19楼层1908门牌号' }]
+    getConfigByNameAsync('ceshiCRUD', 'af-system').then(res => {
+      this.$refs.xAddFrom.init(Object.assign(res, {
+        modifyModelData: {
+          data: {
+            oldSignList: realTableData
+          }
+        }
+      }))
+    })
+  },
+  methods: {
+    aaa (attr, value) {
+    },
+    singLocal () {
+      console.log('singLocal')
+    }
+  }
+}
+</script>
+
+<template>
+  <a-card>
+    <x-add-native-form
+      ref="xAddFrom"
+      @getinfo="aaa"
+      @onSubmit="aaa"
+      @singLocal="singLocal"
+    />
+  </a-card>
+</template>
+
+<style scoped lang="less">
+
+</style>

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

@@ -87,7 +87,7 @@ export default {
       currUser: this.currUser
     }
   },
-  inject: ['getParentComponentByName'],
+  inject: ['getParentComponentByName', 'setGlobalData', 'getGlobalData'],
   computed: {
     businessTitle () {
       return this.businessType + this.title

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

@@ -44,6 +44,18 @@ export default {
         return null
       },
     },
+    setGlobalData: {
+      default: () => () => {
+        console.warn('setGlobalData is not provided.')
+        return null
+      },
+    },
+    getGlobalData: {
+      default: () => () => {
+        console.warn('getGlobalData is not provided.')
+        return null
+      },
+    },
     getSelectedData: {
       default: () => () => {
         console.warn('getSelectedData is not provided.')

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

@@ -4,22 +4,23 @@
       <template v-for="(card, itemIndex) in data">
         <a-card :key="'card' + itemIndex" class="data-card">
           <!-- 绑带 -->
-<!--          <div class="ribbon" v-for="column in tableColumns" v-if="column.dataIndex === item.key" :key="column.dataIndex">-->
-<!--            <template v-if="column.slotType === 'badge'">-->
-<!--              <x-badge-->
-<!--                :service-name="serviceName"-->
-<!--                :env="env"-->
-<!--                :dataCard="true"-->
-<!--                :badge-key="column.slotKeyMap"-->
-<!--                :value="card[item.key]" />-->
-<!--            </template>-->
-<!--            <template v-else>-->
-<!--              <slot :name="column.slots.customRender">{{ card[config.bandage] }}</slot>-->
-<!--            </template>-->
-<!--          </div>-->
-          <div v-if="config && card[config.ribbon]"
-               class="ribbon"
-               :style="{ backgroundColor: getRibbonColor(card[config.ribbonColor]) }">
+          <!--          <div class="ribbon" v-for="column in tableColumns" v-if="column.dataIndex === item.key" :key="column.dataIndex">-->
+          <!--            <template v-if="column.slotType === 'badge'">-->
+          <!--              <x-badge-->
+          <!--                :service-name="serviceName"-->
+          <!--                :env="env"-->
+          <!--                :dataCard="true"-->
+          <!--                :badge-key="column.slotKeyMap"-->
+          <!--                :value="card[item.key]" />-->
+          <!--            </template>-->
+          <!--            <template v-else>-->
+          <!--              <slot :name="column.slots.customRender">{{ card[config.bandage] }}</slot>-->
+          <!--            </template>-->
+          <!--          </div>-->
+          <div
+            v-if="config && card[config.ribbon]"
+            class="ribbon"
+            :style="{ backgroundColor: getRibbonColor(card[config.ribbonColor]) }">
             {{ card[config.ribbon] }}
           </div>
           <!-- 自定义标题 -->