Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/package.json

@@ -11,44 +11,44 @@
    "test:e2e": "vue-cli-service test:e2e"
  },
  "dependencies": {
    "avue-plugin-ueditor": "0.1.4",
    "axios": "0.18.0",
    "babel-polyfill": "6.26.0",
    "classlist-polyfill": "1.2.0",
    "crypto-js": "4.1.1",
    "avue-plugin-ueditor": "^0.1.4",
    "axios": "^0.18.0",
    "babel-polyfill": "^6.26.0",
    "classlist-polyfill": "^1.2.0",
    "crypto-js": "^4.1.1",
    "echarts": "4.9.0",
    "element-ui": "2.15.6",
    "instead": "1.0.3",
    "js-base64": "2.5.1",
    "js-cookie": "2.2.0",
    "js-md5": "0.7.3",
    "js-pinyin": "0.2.4",
    "mockjs": "1.0.1-beta3",
    "moment": "2.29.4",
    "node-gyp": "4.0.0",
    "element-ui": "^2.15.6",
    "instead": "^1.0.3",
    "js-base64": "^2.5.1",
    "js-cookie": "^2.2.0",
    "js-md5": "^0.7.3",
    "js-pinyin": "^0.2.4",
    "mockjs": "^1.0.1-beta3",
    "moment": "^2.29.4",
    "node-gyp": "^4.0.0",
    "nprogress": "0.2.0",
    "portfinder": "1.0.23",
    "save": "2.9.0",
    "script-loader": "0.7.2",
    "vue": "2.6.10",
    "vue-axios": "2.1.2",
    "vue-clipboard2": "0.3.3",
    "vue-axios": "^2.1.2",
    "vue-clipboard2": "^0.3.3",
    "vue-echarts": "5.0.0-beta.0",
    "vue-flowchart-editor": "1.0.2",
    "vue-i18n": "8.7.0",
    "vue-router": "3.0.1",
    "vuex": "3.1.1"
    "vue-i18n": "^8.7.0",
    "vue-router": "^3.0.1",
    "vuex": "^3.1.1"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "3.1.1",
    "@vue/cli-plugin-eslint": "3.1.5",
    "@vue/cli-service": "3.1.4",
    "@vue/composition-api": "1.7.2",
    "chai": "4.1.2",
    "@vue/cli-plugin-babel": "^3.5.0",
    "@vue/cli-plugin-eslint": "^3.5.0",
    "@vue/cli-service": "^3.5.0",
    "@vue/composition-api": "^1.7.2",
    "chai": "^4.1.2",
    "node-sass": "6.0.1",
    "sass-loader": "10.0.5",
    "vue-template-compiler": "2.5.17",
    "webpack-bundle-analyzer": "3.0.3"
    "sass-loader": "10.3.1",
    "vue-template-compiler": "2.6.10",
    "webpack-bundle-analyzer": "^3.0.3"
  },
  "lint-staged": {
    "*.js": [

 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue

@@ -278,7 +278,6 @@

        let columnItem = {
          change: (val) => {
            console.log(val)
            if (val.column.field === "drawingno") {
              this.codeattrsecValue = val.value;
              return;
@@ -600,12 +599,16 @@
    // èŽ·å–表单详情数据
    getFormDetail() {
      if (this.type === "add") return;
      if(this.templateOid){
      getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(
        (res) => {
          this.form = Object.assign(this.form, res.data.data[0]);
          this.loading = false;
        }
      );
        return;
      }

    },
    setReferValue(data) {
      if (data.field) {

 Source/UBCS-WEB/src/components/FormTemplate/index.vue

@@ -250,9 +250,11 @@
  },
  methods: {
    openDialog() {
      //新增和修改共同调用
      this.getFormTemplate();
      if (this.type === "add") {
      if (this.type === "add" || (this.type !== "add" && this.status === "amend")) {
        this.getCodeRule();
        return;
      }
    },
    close() {
@@ -260,6 +262,7 @@
    },
    // æŽ¥å£èŽ·å–表单数据
    getFormTemplate() {
      //新增和修改共同调用
      getFormTemplate({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
@@ -277,6 +280,7 @@
            } else {
              this.showResembleQuery = false;
            }
            //传递表单上方区域数据 ï¼ˆæ–°å¢žå’Œä¿®æ”¹ï¼‰
            this.$nextTick(() => {
              this.$refs.FormTemplate.templateRender(
                res.data.formDefineVO.items
@@ -319,7 +323,7 @@
          that.secVOList = (res.data.data.secVOList || []).filter((item) =>
            typeList.includes(item.secType)
          );
          if (that.secVOList.length > 0 && that.type === "add") {
          if (that.secVOList.length > 0 && that.type === "add" ||(that.type !== "add" &&  that.status === "amend")) {
            that.showCodeApply = true;
            that.activeName = "codeApply";


 Source/UBCS-WEB/src/components/Master/MasterTree.vue

@@ -1,12 +1,12 @@
<template>
  <div class="app" style="display: flex;">
  <div class="app" style="position: relative;">
    <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
               :option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
      <template slot-scope="{ node }">
        <span v-html="node.label"></span>
      </template>
    </avue-tree>
    <div style="display: inline-block;">
    <div style="position: absolute; right: 0px; top: -1px;">
      <el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
    </div>
  </div>

 Source/UBCS-WEB/src/views/MasterData/items.vue

@@ -1,7 +1,7 @@
<template>
  <el-container>
    <el-aside>
      <basic-container style="overflow: hidden;">
    <el-aside style="width:250px">
      <basic-container>
        <!--          æ ‘组件-->
        <master-tree
          :currentPage="this.currentPage"

 Source/UBCS-WEB/src/views/code/code.vue

@@ -1385,7 +1385,7 @@
            cols: [
              {title: '算法编号', field: 'id', width: 200},
              {title: '算法名称', field: 'name', width: 150},
              {title: '自定义流水Bean', field: 'classFullName', width: 300},
              {title: '类全路径', field: 'classFullName', width: 300},
              {title: '类型', field: 'serialType', width: 300},
              {title: '描述', field: 'description'}
            ],

 Source/UBCS-WEB/src/views/docking/info.vue

 Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>

</template>

<script>
export default {
  name: "delimiterConfig"
}
</script>

<style scoped>

</style>

 Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>

</template>

<script>
export default {
  name: "paddingCharacter"
}
</script>

<style scoped>

</style>

 Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
<template>

</template>

<script>
export default {
name: "usableCharacter"
}
</script>

<style scoped>

</style>

 Source/UBCS-WEB/vue.config.js

@@ -26,11 +26,11 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        target: 'http://127.0.0.1:37000',
        // target: 'http://127.0.0.1:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://dev.vci-tech.com:37000',
        target: 'http://dev.vci-tech.com:37000',
        //yxc
        // target: 'http:// 192.168.0.104:37000',
        // target: 'http:// 192.168.0.100:37000',
        // target: 'http://192.168.0.105:37000',
        // target: 'http://192.168.0.103:37000',
        // target: 'http://192.168.1.63:37000',