vue2-client 1.8.197 → 1.8.199

package/package.json

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

@@ -15,6 +15,7 @@
           :attr="item"
           :disabled="itemDisabled(item) || readonly(item)"
           :files="files"
+          :style="layout ==='inline'?{marginTop:'5px'}:undefined"
           :form="form"
           :images="images"
           :service-name="serviceName"
@@ -175,8 +176,8 @@ export default {
         }
       }
       return {
-        labelCol: { span: 8 },
-        wrapperCol: { span: 16 },
+        labelCol: { span: 6 },
+        wrapperCol: { span: 18 },
       }
     },
     ...mapState('account', { currUser: 'user' })
@@ -385,6 +386,15 @@ export default {
               case 'orgId':
                 requestForm[item.model] = this.currUser.orgid
                 break
+              case 'orgName':
+                requestForm[item.model] = this.currUser.orgs
+                break
+              case 'depId':
+                requestForm[item.model] = this.currUser.depids
+                break
+              case 'depName':
+                requestForm[item.model] = this.currUser.deps
+                break
             }
           }
           // 通过请求追加静默新增：自定义字段

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

@@ -1,29 +1,35 @@
 <template>
-  <div>
-    <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>
+  <a-row>
+    <a-col :span="$slots.addonAfter ? 20 : 24">
+      <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>
+    </a-col>
+    <a-col v-if="$slots.addonAfter" :span="4">
+      <slot name="addonAfter"></slot>
+    </a-col>
+  </a-row>
 </template>
 <script>
 
 import { mapState } from 'vuex'
-import { getConfig } from '@vue2-client/services/api'
+import { getRealKeyData } from '@vue2-client/utils/formatter'
+import { getConfigByName } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XDescriptions',
@@ -43,7 +49,8 @@ export default {
     // 模型名
     model: {
       type: String,
-      required: true
+      required: false,
+      default: ''
     },
     // 配置名称
     configName: {
@@ -59,6 +66,11 @@ export default {
     column: {
       type: Number,
       default: 2
+    },
+    // 每列显示数量
+    getRealData: {
+      type: Boolean,
+      default: false
     }
   },
   created () {
@@ -73,7 +85,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['isMobile'])
+    ...mapState('setting', { isMobile: 'isMobile' })
   },
   methods: {
     initConfig () {
@@ -87,22 +99,37 @@ export default {
       }
     },
     getConfig () {
-      getConfig(this.configName, this.serviceName, (res) => {
+      getConfigByName(this.configName, this.serviceName, (res) => {
         const mapIndex = {}
-        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
-        })
         const result = {}
-        for (const key of Object.keys(this.content)) {
-          const name = mapIndex[key]
-          if (name) {
-            result[name] = this.content[key]
+        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 {
-            result[key] = this.content[key]
+            content = this.content
           }
+          console.log(res.column)
+          console.log(content)
+          res.column.forEach(item => {
+            result[item.label] = content[item.filed]
+          })
         }
         this.realData = result
         this.loading = false

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

@@ -40,8 +40,10 @@
             :queryParamsName="queryParamsName"
             :query-params-json="queryParamsJson"
             :show-pagination="showPagination"
+            :customDelete="customDelete"
             @add="add"
             @edit="edit"
+            @del="del"
             @afterDelete="afterDelete"
             @action="action"
             @selectRow="selectRow"
@@ -106,7 +108,9 @@ export default {
       },
       loadError: false,
       // 实际查询配置内容
-      realQueryConfig: {}
+      realQueryConfig: {},
+      table_selectedRowKeys: [],
+      table_selectedRows: []
     }
   },
   computed: {
@@ -197,7 +201,22 @@ export default {
     buttonState: {
       type: Object,
       default: undefined
-    }
+    },
+    // 是否自定义新增按钮的功能
+    customAdd: {
+      type: Boolean,
+      default: false
+    },
+    // 是否自定义删除按钮的功能
+    customDelete: {
+      type: Boolean,
+      default: false
+    },
+    // 是否自定义修改按钮的功能
+    customEdit: {
+      type: Boolean,
+      default: false
+    },
   },
   watch: {
     logicParam: {
@@ -343,49 +362,65 @@ export default {
     treeOnChecked (checkedKeys, deepNodes, deepKeys) {
       this.$emit('treeOnChecked', checkedKeys, deepNodes, deepKeys)
     },
+    /**
+     * 新增按钮事件
+     */
+    del (keys, callback) {
+      if (this.customDelete) {
+        this.$emit('del', keys, callback)
+      }
+    },
     /**
      * 新增按钮事件
      */
     add () {
-      const res = this.realQueryConfig
-      this.$refs.xAddForm.init({
-        businessType: '新增',
-        title: this.title,
-        isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
-        configName: this.queryParamsName,
-        configContent: this.queryParamsJson,
-        formItems: res.formJson,
-        viewMode: this.viewMode,
-        isTableTemp: this.isTableTemp,
-        serviceName: this.serviceName,
-        fixedAddForm: this.fixedAddForm,
-        getDataParams: this.getDataParams,
-        layout: res.xAddFormLayout || 'horizontal',
-        env: this.env
-      })
+      if (this.customAdd) {
+        this.$emit('add')
+      } else {
+        const res = this.realQueryConfig
+        this.$refs.xAddForm.init({
+          businessType: '新增',
+          title: this.title,
+          isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
+          configName: this.queryParamsName,
+          configContent: this.queryParamsJson,
+          formItems: res.formJson,
+          viewMode: this.viewMode,
+          isTableTemp: this.isTableTemp,
+          serviceName: this.serviceName,
+          fixedAddForm: this.fixedAddForm,
+          getDataParams: this.getDataParams,
+          layout: res.xAddFormLayout || 'horizontal',
+          env: this.env
+        })
+      }
     },
     /**
      * 修改按钮事件
      * @param modifyModelData 修改表单数据
      */
     edit (modifyModelData) {
-      const res = this.realQueryConfig
-      this.$refs.xAddForm.init({
-        businessType: '修改',
-        title: this.title,
-        isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
-        configName: this.queryParamsName,
-        configContent: this.queryParamsJson,
-        formItems: res.formJson,
-        viewMode: this.viewMode,
-        isTableTemp: this.isTableTemp,
-        serviceName: this.serviceName,
-        fixedAddForm: this.fixedAddForm,
-        getDataParams: this.getDataParams,
-        modifyModelData: modifyModelData,
-        layout: res.xAddFormLayout || 'horizontal',
-        env: this.env
-      })
+      if (this.customAdd) {
+        this.$emit('edit')
+      } else {
+        const res = this.realQueryConfig
+        this.$refs.xAddForm.init({
+          businessType: '修改',
+          title: this.title,
+          isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
+          configName: this.queryParamsName,
+          configContent: this.queryParamsJson,
+          formItems: res.formJson,
+          viewMode: this.viewMode,
+          isTableTemp: this.isTableTemp,
+          serviceName: this.serviceName,
+          fixedAddForm: this.fixedAddForm,
+          getDataParams: this.getDataParams,
+          modifyModelData: modifyModelData,
+          layout: res.xAddFormLayout || 'horizontal',
+          env: this.env
+        })
+      }
     },
     /**
      * 删除后事件
@@ -408,6 +443,8 @@ export default {
      * @param selectedRows 选中列
      */
     selectRow (selectedRowKeys, selectedRows) {
+      this.table_selectedRowKeys = selectedRowKeys
+      this.table_selectedRows = selectedRows
       this.$emit('selectRow', selectedRowKeys, selectedRows)
     },
     /**

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

@@ -91,12 +91,13 @@
               <a class="ant-dropdown-link" @click="e => e.preventDefault()">
                 {{ item.scopedSlots?.customRender || item.slotValue }} <a-icon type="down"/>
               </a>
-              <a-menu slot="overlay">
+              <a-menu slot="overlay" style="min-width: 60px">
                 <a-menu-item
                   v-for="(action_item, index) in item.actionArr"
                   :key="index"
                   v-if="!action_item.customFunction || executeStrFunction( action_item.customFunction,[record,index])">
                   <a
+                    style="text-align: center"
                     @click="action(record, item.dataIndex, action_item.func)"
                   >{{ action_item.text }}</a>
                 </a-menu-item>
@@ -236,6 +237,11 @@ export default {
     showPagination: {
       type: Boolean,
       default: true
+    },
+    // 是否自定义删除功能
+    customDelete: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -254,7 +260,8 @@ export default {
     ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', ['compatible'])
   },
-  mounted () {},
+  mounted () {
+  },
   methods: {
     executeStrFunction,
     /**
@@ -477,20 +484,24 @@ export default {
         zIndex: 1001,
         onOk: () => {
           return new Promise((resolve, reject) => {
-            const requestParameters = {
-              queryParamsName: this.queryParamsName,
-              idList: this.selectedRowKeys
+            if (this.customDelete) {
+              this.$emit('del', this.selectedRows, resolve)
+            } else {
+              const requestParameters = {
+                queryParamsName: this.queryParamsName,
+                idList: this.selectedRowKeys
+              }
+              remove(requestParameters, this.serviceName, this.env === 'dev').then(res => {
+                resolve(res)
+                this.$message.success('删除成功！')
+                this.refresh(true)
+                // afterDelete
+                this.$emit('afterDelete', requestParameters)
+              }).catch(e => {
+                reject(e)
+                this.$message.error('删除失败！')
+              })
             }
-            remove(requestParameters, this.serviceName, this.env === 'dev').then(res => {
-              resolve(res)
-              this.$message.success('删除成功！')
-              this.refresh(true)
-              // afterDelete
-              this.$emit('afterDelete', requestParameters)
-            }).catch(e => {
-              reject(e)
-              this.$message.error('删除失败！')
-            })
           })
         },
         onCancel () {

package/src/utils/lowcode/lowcodeComponentMixin.js

@@ -1,15 +1,17 @@
 // eslint-disable-next-line no-unused-vars
 import Vue from 'vue'
 import lowcodeLog from '@vue2-client/utils/lowcode/lowcodeLog'
+import { uuid } from '@vue2-client/utils/util'
 export default {
   props: {
     mixinComponentId: {
       type: String,
-      required: true
+      required: false,
+      default: uuid()
     },
     propsData: {
       type: Object,
-      default: {}
+      default: () => {}
     }
   },
   methods: {
@@ -48,11 +50,15 @@ export default {
     },
     // 处理本组件发出的事件
     $lowCodeEmit (eventType, data) {
-      this.$emit('onEvent', data, eventType, this.mixinComponentId)
+      if (this.mixinComponentId) {
+        this.$emit('onEvent', data, eventType, this.mixinComponentId)
+      }
     }
   },
   mounted () {
-    this.$emit('componentDidMounted', this, this.mixinComponentId)
+    if (this.mixinComponentId) {
+      this.$emit('componentDidMounted', this, this.mixinComponentId)
+    }
   },
   supportedEventType: [
     'changeValue',