vue2-client 1.8.438 → 1.8.440

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.438",
+  "version": "1.8.440",
   "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

@@ -271,9 +271,9 @@ export default {
     getFromItem (formItems, formJson) {
       const _formItems = formItems || formJson
       if (typeof formItems === 'string') {
-        this.formItems = JSON.parse(_formItems)
+        return JSON.parse(_formItems)
       } else {
-        this.formItems = JSON.parse(JSON.stringify(_formItems))
+        return JSON.parse(JSON.stringify(_formItems))
       }
     },
     // 时间组件赋默认值
@@ -680,6 +680,10 @@ export default {
     },
     // 默认提交事件
     defaultSubmit (realForm, callback) {
+      // 新增移除id
+      if (this.businessType === '新增') {
+        delete realForm.id
+      }
       // 组织请求
       const requestParameters = {
         queryParamsName: this.configName,

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

@@ -35,6 +35,14 @@ export default {
       type: String,
       default: ''
     },
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
     isExternalText: {
       type: Boolean,
       required: false
@@ -65,7 +73,7 @@ export default {
         this.dictionary = result
         return
       }
-      this.dictionary = await this.$appdata.getDictValue(this.badgeKey, this.value, undefined)
+      this.dictionary = await this.$appdata.getDictValue(this.badgeKey, this.value, undefined, this.env === 'dev', this.serviceName)
     },
     badgeFilter (key, value) {
       return this.$appdata.getParam(key, value)

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

@@ -885,7 +885,7 @@ export default {
         this.initRadioValue()
       } else if (this.attr.type === 'richText') {
         this.initRichText()
-      } else if (this.attr.keyName) {
+      } else 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) {

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

@@ -139,7 +139,7 @@ export default {
     // 命名空间
     serverName: {
       type: String,
-      default: 'af-system'
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 只做展示
     displayOnly: {

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

@@ -33,6 +33,12 @@
               @click="importData">
               <a-icon :style="iconStyle" type="import"/>导入
             </a-button>
+            <a-button
+              v-if="!buttonState || buttonState.import && buttonRendering('editRow')"
+              type="dashed"
+              @click="()=>editRow = true">
+              <a-icon :style="iconStyle" type="import"/>行编辑
+            </a-button>
             <a-dropdown v-if="!buttonState || buttonState.export && buttonRendering('export')">
               <a-menu slot="overlay">
                 <a-menu-item :disabled="selectedRowKeys.length === 0" key="1" @click="handleExport(true)"><a-icon
@@ -127,7 +133,7 @@
           </span>
           <!-- 徽标(badge) -->
           <span v-else-if="item.slotType === 'badge'" :key="'badge-' + c_index">
-            <x-badge v-if="text !== null && text !== undefined" :badge-key="item.slotKeyMap" :value="text"/>
+            <x-badge :service-name="serviceName" :env="env" v-if="text !== null && text !== undefined" :badge-key="item.slotKeyMap" :value="text"/>
           </span>
           <!-- 日期(date) -->
           <span v-else-if="item.slotType === 'date'" :key="'date-' + c_index">
@@ -360,7 +366,9 @@ export default {
       // 允许看板模式
       allowCardMode: false,
       // 看板模式配置
-      cardModeConfig: undefined
+      cardModeConfig: undefined,
+      // 是否开启行编辑
+      editRow: false
     }
   },
   props: {

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

@@ -54,7 +54,7 @@ const GetAppDataService = {
     const object = JSON.parse(str)
     return object[key]
   },
-  async getDictValue (dictKey, value, func) {
+  async getDictValue (dictKey, value, func, isDev = false, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
     const processResult = (result) => {
       if (!result.value) {
         return {
@@ -75,12 +75,12 @@ const GetAppDataService = {
       }
     }
     if (func) {
-      getConfigByName(dictKey, undefined, result => {
+      getConfigByName(dictKey, serviceName, result => {
         func(processResult(result))
-      })
+      }, isDev)
     } else {
       const result = await new Promise((resolve) => {
-        getConfigByName(dictKey, undefined, resolve)
+        getConfigByName(dictKey, serviceName, resolve, isDev)
       })
       return processResult(result)
     }

package/src/layouts/GridView.vue

@@ -0,0 +1,43 @@
+<template>
+  <div id="test">
+    <a-card :bordered="false">
+      <XReport
+        ref="main"
+        :use-oss-for-img="false"
+        config-name="adviceCheckCover"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true"/>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReport'
+
+export default {
+  name: 'GridView',
+  components: {
+    XReport
+  },
+  mounted () {
+    // 获取当前路由中的meta
+    this.configName = this.$router.currentRoute.meta.configName
+    this.nothing = !this.configName
+  },
+  data () {
+    return {
+      configName: '',
+      nothing: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/services/api/common.js

@@ -120,6 +120,7 @@ export function getConfigByLogic (logicName, parameter, serviceName = process.en
 
 /**
  * 配置解析
+ * @deprecated 这个函数应该只有琉璃中心会使用，其他项目不能使用 之后会删除这个
  * @param configContent 原配置内容
  * @param configType 配置类型
  * @param serviceName 命名空间名称