vue2-client 1.8.246 → 1.8.249

package/package.json

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

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

@@ -2,7 +2,7 @@
   <a-modal
     :confirm-loading="loading"
     :destroyOnClose="true"
-    :title="businessTitle"
+    :title="customTitle? customTitle : businessTitle"
     :visible="visible"
     :width="1000"
     :zIndex="1001"
@@ -37,6 +37,8 @@ export default {
         businessType: '',
         // 业务标题
         title: '',
+        // 自定义标题
+        customTitle: '',
         // 新增或修改业务是否执行中
         loading: false,
         // 是否显示新增/修改模态框
@@ -53,10 +55,14 @@ export default {
       init (params) {
         params.showSubmitBtn = false
         const {
-          businessType, title
+          businessType, title, customTitle, xAddFormLayout
         } = params
+        if (xAddFormLayout) {
+          params.layout = xAddFormLayout
+        }
         this.businessType = businessType
         this.title = title
+        this.customTitle = customTitle
         this.visible = true
         const that = this
         that.$nextTick(() => {

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

@@ -69,6 +69,7 @@
 <script>
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import dayjs from 'dayjs'
+import { mapState } from 'vuex'
 
 export default {
   name: 'XForm',
@@ -104,6 +105,7 @@ export default {
     }
   },
   computed: {
+    ...mapState('account', { currUser: 'user' }),
     // 过滤掉仅用于新增/修改场景的表单项
     realJsonData: function () {
       return this.formItems.filter(item => (!item.isOnlyAddOrEdit && item.type !== 'group') || (item.type === 'group' && item.groupItems.some(groupItem => !groupItem.isOnlyAddOrEdit)))
@@ -178,6 +180,16 @@ export default {
       if (item.queryFormDefault) {
         if (['datePicker', 'rangePicker', 'yearPicker', 'monthPicker'].includes(item.type)) {
           formData[item.model] = this.getDateRange(item.type, item.queryFormDefault)
+        } else if (['treeSelect'].includes(item.type) && ['curOrgId', 'curDepId', 'curUserId'].includes(item.queryFormDefault)) {
+          if (item.queryFormDefault === 'curOrgId') {
+            formData[item.model] = [this.currUser.orgid]
+          }
+          if (item.queryFormDefault === 'curDepId') {
+            formData[item.model] = [this.currUser.depids]
+          }
+          if (item.queryFormDefault === 'curUserId') {
+            formData[item.model] = [this.currUser.id]
+          }
         } else {
           formData[item.model] = item.queryFormDefault
         }

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

@@ -145,7 +145,6 @@ export default {
         formItems: res.formJson,
         showSubmitBtn: false,
         serviceName: this.serviceName,
-        modifyModelData: modifyModelData,
         fixedAddForm: modifyModelData.data,
         businessType: this.businessType,
         ...res

package/src/base-client/components/index.js

@@ -24,28 +24,28 @@ import XFormGroup from './common/XFormGroup'
 import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
 
 export default {
-  XForm,
-  XAddForm,
-  XAddNativeForm,
-  XFormCol,
-  XTable,
-  XTreeOne,
-  XImportExcel,
-  XDataDrawer,
-  XCard,
-  XBadge,
-  Upload,
-  JSONToTree,
-  FormGroupEdit,
-  FormGroupQuery,
   AddressSearchCombobox,
   AmapMarker,
   CreateQuery,
   CreateSimpleFormQuery,
-  XFormTable,
+  FormGroupEdit,
+  FormGroupQuery,
+  JSONToTree,
   PersonSetting,
   Tree,
-  XStepView,
+  Upload,
+  XAddForm,
+  XAddNativeForm,
+  XBadge,
+  XCard,
+  XDataDrawer,
+  XDescriptionsGroup,
+  XForm,
+  XFormCol,
   XFormGroup,
-  XDescriptionsGroup
+  XFormTable,
+  XImportExcel,
+  XStepView,
+  XTable,
+  XTreeOne
 }

package/src/base-client/components/common/XModal/XTreeOne.vue

@@ -1,114 +0,0 @@
-<template>
-  <div id="XTreeOne">
-    <component-layout-one :siderProps="{width: leftWidth,collapsible: collapsible,collapsedWidth: collapsedWidth,theme: 'light'}">
-      <template slot="left">
-        <div class="bg-white pd-20" :style="{height: treeHeight}">
-          <a-input-search style="margin-bottom: 8px" placeholder="Search" allow-clear @change="onChange" />
-          <a-tree
-            :tree-data="searchData"
-            @select="onSelect">
-            <template #title="{ title }">
-              <span v-if="title.indexOf(searchValue) > -1">
-                {{ title.substr(0, title.indexOf(searchValue)) }}
-                <span style="color: #f50">{{ searchValue }}</span>
-                {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
-              </span>
-              <span v-else>{{ title }}</span>
-            </template>
-          </a-tree>
-        </div>
-      </template>
-      <slot></slot>
-    </component-layout-one>
-  </div>
-</template>
-
-<script>
-  import ComponentLayoutOne from '@vue2-client/layouts/ComponentLayoutOne'
-  import lowcodeComponentMixin from '@vue2-client/utils/lowcode/lowcodeComponentMixin'
-  export default {
-    name: 'XTreeOne',
-    components: { ComponentLayoutOne },
-    mixins: [lowcodeComponentMixin],
-    props: {
-      // 左侧宽度
-      leftWidth: {
-        type: [Number, String],
-        default: () => {
-          return 200
-        }
-      },
-      // 左侧是否可收起
-      collapsible: {
-        type: Boolean,
-        default: true
-      },
-      // 左侧收起后宽度
-      collapsedWidth: {
-        type: Number,
-        default: 0
-      },
-      // Tree 树形控件数据
-      // array<{key, title, children, [disabled, selectable]}>
-      treeData: {
-        type: Array,
-        required: true
-      },
-      treeHeight: {
-        type: String,
-        default: '85vh'
-      }
-    },
-    data () {
-      return {
-        // 用于展示筛选出的数据
-        searchData: [],
-        // 查询值
-        searchValue: ''
-      }
-    },
-    created () {
-      this.init()
-    },
-    mounted () {
-    },
-    watch: {
-      'treeData' () {
-        this.init()
-      }
-    },
-    methods: {
-      init () {
-        // 添加title插槽
-        for (const index of this.treeData.keys()) {
-          this.treeData[index].scopedSlots = { title: 'title' }
-        }
-        this.searchData = Object.assign([], this.treeData)
-      },
-      onChange (e) {
-        const name = e.target.value
-        this.searchValue = name
-        this.searchData = []
-        for (const row of this.treeData) {
-          if (row.title.indexOf(name) > -1) {
-            this.searchData.push(row)
-          }
-        }
-      },
-      onSelect (selectedKeys, e) {
-        this.$emit('onSelect', selectedKeys, e)
-        this.$lowCodeEmit('onChange', selectedKeys[0])
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-  .pd-20 {
-    padding: 20px;
-  }
-  /deep/ .ant-tree-switcher-icon svg{
-    width: 1.5em;
-    height: 1.5em;
-  }
-</style>

package/src/base-client/components/common/XModal/index.js

@@ -1,3 +0,0 @@
-import XTreeOne from './XTreeOne'
-
-export default XTreeOne

package/src/base-client/components/common/XModal/lowcodeEditorRegister.js

@@ -1,9 +0,0 @@
-export const XTreeOneConfig = {
-  type: 'XTreeOne',
-  properties: {
-    treeData: {
-      type: 'object'
-    }
-  },
-  selfEvent: ['onChange']
-}