vue2-client 1.15.26 → 1.15.27

package/docs/Logic/345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -11,7 +11,6 @@
 - ENV 对应 一个 org.json.JSONObject {tenantName:"租户名称",orgName:"分公司名称",applicationName:"应用名称",dbType:"数据库类型"}
 - logic 对应 LogicService 类，其中有方法
   * logic.run(logicName,param) 执行logic / logicName 执行的业务逻辑名称，param 参数 返回 org.json.JSONObject
-  * logic.remoteRun("服务名","logicName", "param")
 - sql 对应 [SqlService]() 类，其中有方法
   * sql.query(sql别名 string，sql参数 string) 执行已经注册的sql  返回 org.json.JSONArray
   * sql.query(sql别名 string，sql参数 string，页数 int，每页行数 int) 执行已经注册的sql 返回 org.json.JSONArray

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -10,12 +10,11 @@
 - openDialog(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
 - setColSpanByName(slotRef, colSpan)：设置栅格的宽度
 - openDrawer(configName, selectedId, mixinData)：打开一个对话框，例如：this.openDialog('xxx', 5, {})
-- openDrawer(configName, selectedId, mixinData, outEnv, attr, showButton)：打开一个对话框：
+- openDrawer(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
   - selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
   - mixinData: form表单需要的数据
   - outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
   - attr: 用于传递参数绑定到 modal 弹框上
-  - showButton: true/false 是否显示提交按钮 默认：true，当showButton为false时可通过 this.closeAddReport() 关闭当前表单
 - getOutEnv 获取获取 outEnv
 - this.getRealKeyData(obj) 获取真实的数据 传递 {a_a:"1"} 返回 {a:"1"}
 - this.currUser.operaInfo 获取当前用户信息
@@ -61,8 +60,7 @@ this.openDialog('xxx', 5, {}, {}, {})
     afterDelete( res (删除接口返回数据)) 删除后触发
     action(record (当前记录), id （当前记录主键）, actionType （操作类型）) 操作按钮触发
   - expandedGrid:"栅格名"
-- json配置相关
-  - "pageMaxSize": (int) num 每页最大行数,
+
 # x-report 插槽 使用说明
 
 - init(configName,configData) 配置名称 / 报表数据

package/package.json

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

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

@@ -1,174 +1,174 @@
-<template>
-  <div class="row">
-    <div class="content">
-      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
-      <div v-show="!loading">
-        <template v-if="!loadError">
-          <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
-            <a-descriptions-item
-              v-for="(value, key) in realData"
-              :key="key"
-              :label="key">
-              {{ formatText(value) }}
-            </a-descriptions-item>
-          </a-descriptions>
-        </template>
-        <template v-else>
-          <a-empty>
-            <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
-          </a-empty>
-        </template>
-      </div>
-    </div>
-    <div class="extra" v-if="extraShow">
-      <slot name="addonAfter"/>
-    </div>
-  </div>
-</template>
-<script>
-
-import { mapState } from 'vuex'
-import { getRealKeyData } from '@vue2-client/utils/formatter'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XDescriptions',
-  components: {
-  },
-  props: {
-    // 标题
-    title: {
-      type: String,
-      required: true
-    },
-    // 内容
-    content: {
-      type: Object,
-      required: true
-    },
-    // 模型名
-    model: {
-      type: String,
-      required: false,
-      default: ''
-    },
-    // 配置名称
-    configName: {
-      type: String,
-      required: true
-    },
-    // 配置所属命名空间
-    serviceName: {
-      type: String,
-      default: undefined
-    },
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    // 每列显示数量
-    column: {
-      type: Number,
-      default: 2
-    },
-    // 每列显示数量
-    getRealData: {
-      type: Boolean,
-      default: false
-    },
-    // 是否展示插槽
-    extraShow: {
-      type: Boolean,
-      default: true
-    }
-  },
-  created () {
-    this.initConfig()
-  },
-  data () {
-    return {
-      // 加载状态
-      loading: false,
-      loadError: false,
-      realData: undefined
-    }
-  },
-  computed: {
-    ...mapState('setting', { isMobile: 'isMobile' })
-  },
-  methods: {
-    initConfig () {
-      this.loading = true
-      this.loadError = false
-      if (this.configName) {
-        this.getConfig()
-      } else {
-        this.loading = false
-        this.loadError = true
-      }
-    },
-    getConfig () {
-      getConfigByName(this.configName, this.serviceName, (res) => {
-        const mapIndex = {}
-        const result = {}
-        if (res.formJson) {
-          res.formJson.filter(item => {
-            const model = item.model
-            return model.indexOf(this.model) > 0
-          })[0].groupItems.forEach(item => {
-            mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
-          })
-          for (const key of Object.keys(this.content)) {
-            const name = mapIndex[key]
-            if (name) {
-              result[name] = this.content[key]
-            } else {
-              result[key] = this.content[key]
-            }
-          }
-        } else if (res.column) {
-          // [{label:'标签1',filed:'字段1'}]
-          let content = {}
-          if (this.getRealData) {
-            content = getRealKeyData(this.content)
-          } else {
-            content = this.content
-          }
-          if (typeof content === 'string') {
-            content = JSON.parse(content)
-          }
-          res.column.forEach(item => {
-            result[item.label] = content[item.filed]
-          })
-        }
-        this.realData = result
-        this.loading = false
-      }, this.env === 'dev')
-    },
-    // 文字格式化
-    formatText (value) {
-      return value ?? '--'
-    }
-  }
-}
-</script>
-<style>
-.row {
-  display: flex;
-
-  .content {
-    -webkit-box-flex: 1;
-    flex: auto;
-    -ms-flex: auto;
-  }
-
-  .extra {
-    flex: 0 1 auto;
-    -webkit-box-flex: 0;
-    -ms-flex: 0 1 auto;
-    min-width: 242px;
-    margin-left: 88px;
-    text-align: right;
-  }
-}
-</style>
+<template>
+  <div class="row">
+    <div class="content">
+      <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
+      <div v-show="!loading">
+        <template v-if="!loadError">
+          <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
+            <a-descriptions-item
+              v-for="(value, key) in realData"
+              :key="key"
+              :label="key">
+              {{ formatText(value) }}
+            </a-descriptions-item>
+          </a-descriptions>
+        </template>
+        <template v-else>
+          <a-empty>
+            <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
+          </a-empty>
+        </template>
+      </div>
+    </div>
+    <div class="extra" v-if="extraShow">
+      <slot name="addonAfter"/>
+    </div>
+  </div>
+</template>
+<script>
+
+import { mapState } from 'vuex'
+import { getRealKeyData } from '@vue2-client/utils/formatter'
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XDescriptions',
+  components: {
+  },
+  props: {
+    // 标题
+    title: {
+      type: String,
+      required: true
+    },
+    // 内容
+    content: {
+      type: Object,
+      required: true
+    },
+    // 模型名
+    model: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    // 配置名称
+    configName: {
+      type: String,
+      required: true
+    },
+    // 配置所属命名空间
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    // 每列显示数量
+    column: {
+      type: Number,
+      default: 2
+    },
+    // 每列显示数量
+    getRealData: {
+      type: Boolean,
+      default: false
+    },
+    // 是否展示插槽
+    extraShow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  created () {
+    this.initConfig()
+  },
+  data () {
+    return {
+      // 加载状态
+      loading: false,
+      loadError: false,
+      realData: undefined
+    }
+  },
+  computed: {
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+  methods: {
+    initConfig () {
+      this.loading = true
+      this.loadError = false
+      if (this.configName) {
+        this.getConfig()
+      } else {
+        this.loading = false
+        this.loadError = true
+      }
+    },
+    getConfig () {
+      getConfigByName(this.configName, this.serviceName, (res) => {
+        const mapIndex = {}
+        const result = {}
+        if (res.formJson) {
+          res.formJson.filter(item => {
+            const model = item.model
+            return model.indexOf(this.model) > 0
+          })[0].groupItems.forEach(item => {
+            mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
+          })
+          for (const key of Object.keys(this.content)) {
+            const name = mapIndex[key]
+            if (name) {
+              result[name] = this.content[key]
+            } else {
+              result[key] = this.content[key]
+            }
+          }
+        } else if (res.column) {
+          // [{label:'标签1',filed:'字段1'}]
+          let content = {}
+          if (this.getRealData) {
+            content = getRealKeyData(this.content)
+          } else {
+            content = this.content
+          }
+          if (typeof content === 'string') {
+            content = JSON.parse(content)
+          }
+          res.column.forEach(item => {
+            result[item.label] = content[item.filed]
+          })
+        }
+        this.realData = result
+        this.loading = false
+      }, this.env === 'dev')
+    },
+    // 文字格式化
+    formatText (value) {
+      return value ?? '--'
+    }
+  }
+}
+</script>
+<style>
+.row {
+  display: flex;
+
+  .content {
+    -webkit-box-flex: 1;
+    flex: auto;
+    -ms-flex: auto;
+  }
+
+  .extra {
+    flex: 0 1 auto;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 1 auto;
+    min-width: 242px;
+    margin-left: 88px;
+    text-align: right;
+  }
+}
+</style>