vue2-client 1.4.57 → 1.4.58

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.4.58 -2022-11-29 @江超**
+- 修复一些小问题
+
 **1.4.57 -2022-11-27 @江超**
 - 优化登录态和未登录态的页面跳转方式
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.57",
+  "version": "1.4.58",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -523,6 +523,7 @@ export default {
         pathKey: undefined,
         accept: undefined,
         selectType: undefined,
+        groupIndex: undefined,
         groupIndexView: undefined,
         addOrEdit: 'all',
         selectKeyName: undefined,
@@ -555,7 +556,7 @@ export default {
           this.lowerPath = this.stockList.filter(item => item.id === _item.resUploadStock)[0]?.f_lower_path_json ?? []
         }
       }
-      if (_item.selectKey && _item.selectType === 'logic' && _item.selectKey.substring(0, 6) === 'logic@') {
+      if (_item.selectKey && _item.selectKey.length >= 6 && _item.selectType === 'logic' && _item.selectKey.substring(0, 6) === 'logic@') {
         _item.selectKey = _item.selectKey.substring(6)
       }
       if (_item.formType === 'selects') {

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

@@ -1,149 +1,151 @@
-<template>
-  <a-drawer
-    title="选择参数组"
-    placement="right"
-    :width="isMobile ? screenWidth : screenWidth * 0.85"
-    :visible="visible"
-    @close="onClose"
-  >
-    <x-add-form
-      business-title="参数设置"
-      business-type="编辑"
-      :visible.sync="editQueryVisible"
-      :json-data="formObj.formJson"
-      :modify-model-data="this.modifyModelData[this.formObj.groupName]"
-      :loading="loading"
-      @onSubmit="submit"/>
-    <a-list
-      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
-      :dataSource="columnJson.groups"
-    >
-      <a-list-item slot="renderItem" slot-scope="item">
-        <a-card :hoverable="true" @click="toEdit(item)">
-          <a-card-meta >
-            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
-            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
-            <div class="meta-content" slot="description">{{ item.describe }}</div>
-          </a-card-meta>
-        </a-card>
-      </a-list-item>
-    </a-list>
-  </a-drawer>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { commonApi, post } from '@vue2-client/services/api'
-
-export default {
-  name: 'FormGroupEdit',
-  components: {
-    XAddForm
-  },
-  data () {
-    return {
-      // 页面宽度
-      screenWidth: document.documentElement.clientWidth,
-      // 是否显示参数下发抽屉
-      editQueryVisible: false,
-      targetIndex: 0,
-      columnJson: {},
-      editIndex: -1,
-      formObj: {
-        groupName: '',
-        formJson: []
-      },
-      // 参数设置业务执行状态
-      loading: false
-    }
-  },
-  mounted () {
-    this.initView()
-  },
-  computed: {
-    ...mapState('setting', ['isMobile'])
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    modifyModelData: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    }
-  },
-  watch: {
-    visible (rel) {
-      if (rel) {
-        this.initView()
-      }
-    }
-  },
-  methods: {
-    // 初始化组件
-    initView () {
-      this.$emit('getColumnJson', val => {
-        this.columnJson = val
-      })
-    },
-    toEdit (item) {
-      post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
-        this.formObj = res
-        this.editQueryVisible = true
-      })
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    },
-    submit (res) {
-      if (res.valid) {
-        this.loading = true
-        const requestParameters = {
-          paramsJson: {}
-        }
-        requestParameters.paramsJson[this.formObj.groupName] = {}
-        for (const key of Object.keys(res.form)) {
-          const realKey = key.substring(key.indexOf('_') + 1)
-          requestParameters.paramsJson[this.formObj.groupName][realKey] = res.form[key]
-        }
-        this.$emit('onSubmit', requestParameters, result => {
-          if (result) {
-            this.$message.success('参数设置成功！')
-          } else {
-            this.$message.error('参数设置失败！')
-          }
-          this.loading = false
-          this.editQueryVisible = false
-        })
-      } else {
-        return false
-      }
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-  .card-avatar {
-    width: 48px;
-    height: 48px;
-    border-radius: 48px;
-  }
-  .new-btn{
-    border-radius: 2px;
-    width: 100%;
-    height: 187px;
-  }
-  .meta-content{
-    position: relative;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    height: 64px;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
-  }
-</style>
+<template>
+  <a-drawer
+    title="选择参数组"
+    placement="right"
+    :width="isMobile ? screenWidth : screenWidth * 0.85"
+    :visible="visible"
+    @close="onClose"
+  >
+    <x-add-form
+      business-title="参数设置"
+      business-type="编辑"
+      :visible.sync="editQueryVisible"
+      :json-data="formObj.formJson"
+      :modify-model-data="modifyModelDataItem"
+      :loading="loading"
+      @onSubmit="submit"/>
+    <a-list
+      :grid="{gutter: 24, lg: 4, md: 3, sm: 1, xs: 1}"
+      :dataSource="columnJson.groups"
+    >
+      <a-list-item slot="renderItem" slot-scope="item">
+        <a-card :hoverable="true" @click="toEdit(item)">
+          <a-card-meta >
+            <div style="margin-bottom: 3px" slot="title">{{ item.group }}</div>
+            <a-icon type="tags" slot="avatar" :style="{ fontSize:'2em' }"/>
+            <div class="meta-content" slot="description">{{ item.describe }}</div>
+          </a-card-meta>
+        </a-card>
+      </a-list-item>
+    </a-list>
+  </a-drawer>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
+import { commonApi, post } from '@vue2-client/services/api'
+
+export default {
+  name: 'FormGroupEdit',
+  components: {
+    XAddForm
+  },
+  data () {
+    return {
+      // 页面宽度
+      screenWidth: document.documentElement.clientWidth,
+      // 是否显示参数下发抽屉
+      editQueryVisible: false,
+      targetIndex: 0,
+      columnJson: {},
+      editIndex: -1,
+      formObj: {
+        groupName: '',
+        formJson: []
+      },
+      modifyModelDataItem: {},
+      // 参数设置业务执行状态
+      loading: false
+    }
+  },
+  mounted () {
+    this.initView()
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    modifyModelData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    visible (rel) {
+      if (rel) {
+        this.initView()
+      }
+    }
+  },
+  methods: {
+    // 初始化组件
+    initView () {
+      this.$emit('getColumnJson', val => {
+        this.columnJson = val
+      })
+    },
+    toEdit (item) {
+      post(commonApi.getColumnsJson, { queryObject: item }).then(res => {
+        this.formObj = res
+        this.modifyModelDataItem = { data: this.modifyModelData[this.formObj.groupName] }
+        this.editQueryVisible = true
+      })
+    },
+    onClose () {
+      this.$emit('update:visible', false)
+    },
+    submit (res) {
+      if (res.valid) {
+        this.loading = true
+        const requestParameters = {
+          paramsJson: {}
+        }
+        requestParameters.paramsJson[this.formObj.groupName] = {}
+        for (const key of Object.keys(res.form)) {
+          const realKey = key.substring(key.indexOf('_') + 1)
+          requestParameters.paramsJson[this.formObj.groupName][realKey] = res.form[key]
+        }
+        this.$emit('onSubmit', requestParameters, result => {
+          if (result) {
+            this.$message.success('参数设置成功！')
+          } else {
+            this.$message.error('参数设置失败！')
+          }
+          this.loading = false
+          this.editQueryVisible = false
+        })
+      } else {
+        return false
+      }
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .card-avatar {
+    width: 48px;
+    height: 48px;
+    border-radius: 48px;
+  }
+  .new-btn{
+    border-radius: 2px;
+    width: 100%;
+    height: 187px;
+  }
+  .meta-content{
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    height: 64px;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+  }
+</style>

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

@@ -220,6 +220,11 @@ export default {
     },
     fixedQueryForm: {
       handler () {
+        if (this.queryParamsName) {
+          this.getColumnsJson()
+        } else if (this.queryParamsJson) {
+          this.getColumnsJsonBySource()
+        }
         this.form = {}
       },
       deep: true
@@ -229,6 +234,11 @@ export default {
         this.getColumnsJsonBySource()
       },
       deep: true
+    },
+    queryParamsName: {
+      handler () {
+        this.getColumnsJson()
+      }
     }
   },
   created () {

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

@@ -1,105 +1,109 @@
-<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'
-  export default {
-    name: 'XTreeOne',
-    components: { ComponentLayoutOne },
-    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 () {
-    },
-    mounted () {
-    },
-    watch: {
-      'treeData' () {
-        // 添加title插槽
-        for (const index of this.treeData.keys()) {
-          this.treeData[index].scopedSlots = { title: 'title' }
-        }
-        this.searchData = Object.assign([], this.treeData)
-      }
-    },
-    methods: {
-      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)
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-  #XTreeOne {
-    .pd-20 {
-      padding: 20px;
-    }
-  }
-</style>
+<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'
+  export default {
+    name: 'XTreeOne',
+    components: { ComponentLayoutOne },
+    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)
+      }
+    }
+  }
+</script>
+
+<style lang="less">
+  #XTreeOne {
+    .pd-20 {
+      padding: 20px;
+    }
+  }
+</style>

package/src/layouts/ComponentLayoutOne.vue

@@ -1,46 +1,47 @@
-<template>
-  <div id="ComponentLayoutOne">
-    <a-layout>
-      <a-layout-sider v-bind="siderProps">
-        <slot name="left"></slot>
-      </a-layout-sider>
-      <a-layout>
-        <slot></slot>
-      </a-layout>
-    </a-layout>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'ComponentLayoutOne',
-    props: {
-      // Layout.Sider props对象
-      siderProps: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    data () {
-      return {}
-    },
-    created () {
-    },
-    mounted () {
-    },
-    methods: {}
-  }
-</script>
-
-<style lang="less">
-  #ComponentLayoutOne {
-    .ant-layout-sider {
-      .ant-layout-sider-zero-width-trigger {
-        top: 50%;
-        background-color: @shadow-color;
-      }
-    }
-  }
-</style>
+<template>
+  <div id="ComponentLayoutOne">
+    <a-layout>
+      <a-layout-sider v-bind="siderProps">
+        <slot name="left"></slot>
+      </a-layout-sider>
+      <a-layout>
+        <slot></slot>
+      </a-layout>
+    </a-layout>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'ComponentLayoutOne',
+    props: {
+      // Layout.Sider props对象
+      siderProps: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    data () {
+      return {}
+    },
+    created () {
+    },
+    mounted () {
+    },
+    methods: {}
+  }
+</script>
+
+<style lang="less">
+  #ComponentLayoutOne {
+    .ant-layout-sider {
+      .ant-layout-sider-zero-width-trigger {
+        top: 50%;
+        background-color: @shadow-color;
+        z-index: 9999;
+      }
+    }
+  }
+</style>