n20-common-lib 2.9.13 → 2.9.14

package/src/components/HandlingAdvice/index.vue

@@ -0,0 +1,191 @@
+<template>
+  <div>
+    <el-dialog
+      :visible.sync="visible"
+      width="600px"
+      :title="'提交意见' | $lc"
+      @close="$emit('close')"
+      @closed="$emit('closed')"
+      @open="$emit('open')"
+      @opened="$emit('opened')"
+    >
+      <el-form v-if="whether" style="margin-bottom: 50px">
+        <el-form-item>
+          <div slot="label">
+            <span v-if="optionsRequired" style="color: red">*</span>
+            {{ $lc('请确认提交内容') }}
+          </div>
+          <el-select v-model="reasonSelect" class="w-100p" @change="changeReasonSelect">
+            <el-option v-for="(item, i) in flowOptions" :key="i" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-input
+            v-model="reason"
+            type="textarea"
+            :rows="rows"
+            :show-word-limit="showWordLimit"
+            :maxlength="maxlength"
+            class="w-100p"
+            :placeholder="placeholder"
+          />
+        </el-form-item>
+      </el-form>
+      <ExpandablePane v-if="otherAttDataA.length > 0" title="自定义项" :default-expand="true">
+        <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+          <div
+            class="p-b-lg p-t-lg p-r-lg"
+            style="max-height: 150px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
+          >
+            <show-other-att-new
+              ref="showOtherAttNew"
+              :form="customizationList"
+              :other-att-data-a="otherAttDataA"
+              :proc-inst-id="procInstId || this.$route.query.processInstanceId"
+              :required="true"
+            />
+          </div>
+        </el-form>
+      </ExpandablePane>
+      <span slot="footer">
+        <el-button type="primary" @click="submit">{{ $lc('提交') }}</el-button>
+        <el-button plain @click="visible = false">{{ $lc('取消') }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { $lc } from '../../utils/i18n/index'
+import ShowOtherAttNew from '../ApprovalButtons/showOtherAttrNew.vue'
+import ExpandablePane from '../Expandable/main.vue'
+export default {
+  name: 'HandlingAdvice',
+  components: { ShowOtherAttNew, ExpandablePane },
+  props: {
+    afterGetConf: {
+      type: Function,
+      default: undefined
+    },
+    beforeSubmit: {
+      type: Function,
+      default: undefined
+    },
+    maxlength: {
+      type: Number,
+      default: 150
+    },
+    showWordLimit: {
+      type: Boolean,
+      default: true
+    },
+    rows: {
+      type: Number,
+      default: 5
+    }
+  },
+  data() {
+    return {
+      customizationList: {},
+      visible: false,
+      flowOptions: [],
+      cb: null,
+      reasonSelect: '',
+      reason: '',
+      otherAttDataA: [],
+      procInstId: '',
+      whether: false,
+      optionsRequired: false,
+      placeholder: ''
+    }
+  },
+  methods: {
+    /**
+     *
+     * @param typeCode {String} 业务类型编码
+     */
+    async getHandlingAdvice(typeCode, procInstId) {
+      try {
+        const { code, data } = await this.$axios.post(
+          `/bems/activiti/admin/todo/isFlowStartWithOptions`,
+          { typeCode },
+          {
+            noMsg: true
+          }
+        )
+        // data.whether = true
+        // data.optionsRequired = true
+
+        if (code === 200) {
+          this.otherAttDataA = data.customizationList || []
+          this.whether = data.whether
+          this.optionsRequired = data.optionsRequired
+          if (data.optionsRequired) {
+            this.placeholder = '请选择或输入意见（必填）'
+          } else {
+            this.placeholder = '请选择或输入意见（选填）'
+          }
+          this.visible = data.whether === true || this.otherAttDataA.length > 0
+          this.flowOptions = data?.opinions?.map((d) => {
+            return {
+              label: d,
+              value: d
+            }
+          })
+          if (!data.whether && this.afterGetConf && this.otherAttDataA.length === 0) {
+            this.afterGetConf()
+          }
+        }
+        // 回显操作
+        if (procInstId) {
+          const { data: data1 } = await this.$axios.get(
+            `/bems/activiti/sample/getStartEventFlowHistory/${procInstId}`,
+            {},
+            {
+              noMsg: true
+            }
+          )
+          this.reason = data1?.suggestion || ''
+          this.reasonSelect = data1?.suggestion || ''
+          if (data1 && data1.flowHistoryCfgs && data1.flowHistoryCfgs.length > 0) {
+            this.otherAttDataA = this.otherAttDataA.map((item) => {
+              const bcData = data1.flowHistoryCfgs.find((item2) => {
+                return item2.cfgKey === item.cfgKey
+              })
+              return {
+                ...item,
+                cfgVal: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : bcData.cfgVal,
+                selectList: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
+                checkList: ['32'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
+                cfgHasRemark: bcData.cfgHasRemark,
+                cfgRemark: bcData.cfgRemark
+              }
+            })
+          }
+        }
+        // 重新执行一次 使数据更新
+        this.$refs.showOtherAttNew && this.$refs.showOtherAttNew.getData(this.otherAttDataA)
+      } catch (error) {
+        if (this.afterGetConf) {
+          this.afterGetConf()
+        }
+      }
+    },
+    changeReasonSelect(val) {
+      this.reason = val
+    },
+    submit() {
+      if (this.whether && this.optionsRequired && !this.reason) {
+        this.$message.warning('请选择或输入意见')
+        return
+      }
+      const getOtherAttData = this.$refs['showOtherAttNew'] && this.$refs['showOtherAttNew']?.getOtherAttData()
+      this.visible = false
+      if (this.beforeSubmit) {
+        this.beforeSubmit(this.reason, getOtherAttData)
+      }
+      this.$emit('submit', this.reason, getOtherAttData)
+    }
+  }
+}
+</script>

package/src/components/InputAccount/index.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="n20-num-w" @mouseenter="isHove = true" @mouseleave="isHove = false">
+    <el-input
+      ref="input"
+      v-model="valueStr"
+      v-bind="$attrs"
+      class="n20-stc"
+      :disabled="disabled"
+      :placeholder="phd"
+      :clearable="isClearable"
+      :validate-event="false"
+      maxlength="40"
+      @focus="focusFn"
+      @input="inputFn"
+      @blur="blurFn"
+      @clear="clearFn"
+      @change="changeFn"
+    >
+      <!-- <template slot="suffix">
+        <slot name="suffix"></slot>
+      </template>
+      <template slot="prefix">
+        <slot name="prefix"></slot>
+      </template>
+      <template v-if="type === 'rate'">
+        <span v-if="suffixV" slot="suffix" class="el-input__icon">{{ suffix }}</span>
+      </template> -->
+    </el-input>
+  </div>
+</template>
+
+<script>
+import emitter from '../../utils/element-ui-emitter'
+import { $lc } from '../../utils/i18n/index'
+import N from '../../utils/numberPor'
+
+export default {
+  name: 'InputAccount',
+  mixins: [emitter],
+  props: {
+    value: {
+      type: [Number, String],
+      default: undefined
+    },
+    disabled: {
+      type: Boolean,
+      default: undefined
+    },
+    isClearable: {
+      type: Boolean,
+      default: true
+    },
+    placeholder: {
+      type: String,
+      default: undefined
+    },
+    format: {
+      type: String,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      valueStr: '',
+      isFocus: false
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+    focusFn() {
+      this.isFocus = true
+      if (!this.disabled && this.valueStr) {
+        this.valueStr = this.valueStr.replace(/\s+/g, '')
+        this.preValue = this.valueStr
+      }
+    },
+    blurFn() {
+      this.isFocus = false
+      if (!this.disabled && this.valueStr) {
+        this.valueStr = this.valueStr.replace(/(.{4})/g, '$1 ')
+        this.preValue = this.valueStr
+      }
+      this.$emit('blur')
+    },
+    clearFn() {
+      this.$emit('clear')
+    },
+    inputFn(valStr) {
+      if (isNaN(valStr.replace(/,/g, ''))) {
+        this.valueStr = this.preValue
+      } else {
+        this.preValue = valStr
+      }
+      this.$emit('input', this.preValue)
+    },
+    changeFn(valStr) {
+      if (!this.disabled && this.valueStr) {
+        this.valueStr = valStr.replace(/\s+/g, '')
+      }
+      this.$emit('change', this.preValue)
+    }
+  }
+}
+</script>

package/src/components/InputNumber/index.vue

@@ -1,5 +1,9 @@
 <template>
-  <div class="n20-num-w"  @mouseenter="isHove = true" @mouseleave="isHove = false">
+  <div
+    class="n20-num-w"
+    @mouseenter="isHove = true"
+    @mouseleave="isHove = false"
+  >
     <el-input
       ref="input"
       v-model="valueStr"
@@ -9,6 +13,7 @@
       :placeholder="phd"
       :clearable="isClearable"
       :validate-event="false"
+      maxlength="16"
       @focus="focusFn"
       @input="inputFn"
       @blur="blurFn"
@@ -23,7 +28,9 @@
         <slot name="prefix"></slot>
       </template>
       <template v-if="type === 'rate'">
-        <span v-if="suffixV" slot="suffix" class="el-input__icon">{{ suffix }}</span>
+        <span v-if="suffixV" slot="suffix" class="el-input__icon">{{
+          suffix
+        }}</span>
       </template>
     </el-input>
   </div>
@@ -141,7 +148,9 @@ export default {
           if (val || val === 0) {
             let nF = N.toString(val).split('.')[1] || ''
             if (nF.length < this.fNum) {
-              return (this.valueStr = N.addThousands(N.subFixed(val, this.fNum)))
+              return (this.valueStr = N.addThousands(
+                N.subFixed(val, this.fNum)
+              ))
             }
           }
           this.valueStr = N.addThousands(val)
@@ -170,7 +179,10 @@ export default {
       this.$emit('clear')
     },
     stepFn(ev) {
-      if ((ev.code === 'ArrowUp' || ev.code === 'ArrowDown') && !this.disabled) {
+      if (
+        (ev.code === 'ArrowUp' || ev.code === 'ArrowDown') &&
+        !this.disabled
+      ) {
         let val = N(this.valueStr)
         if (!isNaN(val)) {
           ev.preventDefault()

package/src/components/InputNumber/numberRange.vue

@@ -6,6 +6,7 @@
       :max="endValue || endValue === 0 ? endValue : $attrs.max"
       :type="type"
       style="width: calc(50% - 8px)"
+      :disabled="disabled || leftDisabled"
       @input="startChange"
       @clear="$emit('clear')"
       @blur="blurFn"
@@ -17,6 +18,7 @@
       :min="startValue || startValue === 0 ? startValue : $attrs.min"
       :type="type"
       style="width: calc(50% - 8px)"
+      :disabled="disabled || rightDisabled"
       @input="endChange"
       @clear="$emit('clear')"
       @blur="blurFn"
@@ -32,6 +34,18 @@ export default {
     inputNumber
   },
   props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    leftDisabled: {
+      type: Boolean,
+      default: false
+    },
+    rightDisabled: {
+      type: Boolean,
+      default: false
+    },
     startValue: {
       type: [String, Number],
       default: undefined

package/src/components/InputSearch/index.vue

@@ -1,6 +1,8 @@
 <template>
   <el-input
     v-if="!select"
+    ref="input-search"
+    v-title
     class="n20-input-search-1"
     v-bind="Object.assign($attrs, { disabled: disabled })"
     :value="value"
@@ -131,4 +133,10 @@ export default {
 .n20-input-search .el-input__suffix-inner {
   background: var(--color-white);
 }
+.n20-input-search-1 .el-input__inner,
+.n20-input-search .el-select .el-input__inner {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>

package/src/components/Layout/HeaderWrap/changePwd.vue

@@ -49,10 +49,11 @@
 </template>
 
 <script>
-import { $lc } from '../../../utils/i18n/index.js'
+import JsEncrypt from 'jsencrypt'
+import { jsonp } from 'vue-jsonp'
 import auth from '../../../utils/auth.js'
 import axios from '../../../utils/axios.js'
-import { jsonp } from 'vue-jsonp'
+import { $lc } from '../../../utils/i18n/index.js'
 
 export default {
   props: {
@@ -73,7 +74,8 @@ export default {
         newPassword: '',
         validatePassword: ''
       },
-      ipInfo:{},
+      ipInfo: {},
+      publicKey: '',
       laoding: false
     }
   },
@@ -87,31 +89,56 @@ export default {
   created() {
     this.getPwdRule()
     this.getIpInfo()
+    this.getRSAPublicKey()
   },
   methods: {
+    /**
+     *   v1.15.0 修改密码渗透漏洞
+     */
+    async getRSAPublicKey() {
+      const { data, code } = await this.$axios.get(`/bems/prod_1.0/user/wfMasterUser/getRSAPubKey`)
+      if (code === 200) {
+        this.publicKey = data
+      }
+    },
     /**
      *  v1.12.0 增加第三方ip信息查询接口
      */
     getIpInfo() {
-      jsonp(`https://tbip.alicdn.com/api/queryip`).then(({code,data}) => {
-        if (code ===0) {
-          this.ipInfo = {
-            headers: {
-              reqIp: data?.ip,
-              reqAddr: encodeURIComponent(data?.region && data?.city ? `${data?.region}-${data?.city}`:data?.region ?data?.region:data?.city),
-              reqCountry: encodeURIComponent(data?.country),
+      jsonp(`https://tbip.alicdn.com/api/queryip`)
+        .then(({ code, data }) => {
+          if (code === 0) {
+            this.ipInfo = {
+              headers: {
+                reqIp: data?.ip,
+                reqAddr: encodeURIComponent(
+                  data?.region && data?.city
+                    ? `${data?.region}-${data?.city}`
+                    : data?.region
+                    ? data?.region
+                    : data?.city
+                ),
+                reqCountry: encodeURIComponent(data?.country)
+              }
             }
           }
-        }
-      }).catch(
-        this.ipInfo = {
-          headers: {
-            reqIp: '127.0.0.1',
-            reqAddr: encodeURIComponent('内网'),
-            reqCountry: encodeURIComponent('中国'),
-          }
-        }
-      )
+        })
+        .catch(
+          (this.ipInfo = {
+            headers: {
+              reqIp: '127.0.0.1',
+              reqAddr: encodeURIComponent('内网'),
+              reqCountry: encodeURIComponent('中国')
+            }
+          })
+        )
+    },
+    //加密方法
+    RSAencrypt(pas) {
+      let jse = new JsEncrypt()
+      //设置公钥
+      jse.setPublicKey(this.publicKey)
+      return jse.encrypt(pas)
     },
     getPwdRule() {
       axios
@@ -153,7 +180,7 @@ export default {
           '/bems/prod_1.0/uas/api/authorization/password/validate',
           {
             // username: this.form.username,
-            password: value
+            password: this.RSAencrypt(value)
           },
           { noMsg: true, loading: false }
         )
@@ -208,8 +235,8 @@ export default {
             .post(
               '/bems/prod_1.0/uas/api/authorization/password/update',
               {
-                password: this.form.orginPassword,
-                newPassword: this.form.newPassword
+                password: this.RSAencrypt(this.form.orginPassword),
+                newPassword: this.RSAencrypt(this.form.newPassword)
               },
               {
                 loading: () => {

package/src/components/Layout/HeaderWrap/index.vue

@@ -257,7 +257,7 @@ export default {
     }
   },
   created() {
-    getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting }) => {
+    getJsonc('/server-config.jsonc').then(({ _layoutData = {}, loginSetting, langConf = {} }) => {
       let _loginSetting = loginSetting || _layoutData.loginSetting
       this.headerLogoUrl = realUrl(_layoutData.headerLogoUrl)
       this.headerUserUrl = realUrl(_layoutData.headerUserUrl)
@@ -268,7 +268,7 @@ export default {
       this.headerBgUrl = realUrl(_layoutData.headerBgUrl)
       this.headerBgColor = _layoutData.headerBgColor
       this.hideHelpDoc = _layoutData.hideHelpDoc
-      this.hideLang = _layoutData.hideLang
+      this.hideLang = (_layoutData.hideLang || langConf.hideLang) ?? false
       this.hideDowApp = _layoutData.hideDowApp
       this.hideTheme = _layoutData.hideTheme