resolver-egretimp-plus 0.1.121 → 0.1.123

package/dist/web/index.js.LICENSE.txt

@@ -63,3 +63,20 @@
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
+
+/** @preserve
+	 * Counter block mode compatible with  Dr Brian Gladman fileenc.c
+	 * derived from CryptoJS.mode.CTR
+	 * Jan Hruby jhruby.web@gmail.com
+	 */
+
+/** @preserve
+	(c) 2012 by Cédric Mesnil. All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	    - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.121",
+  "version": "0.1.123",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/analysisComponent.jsx

@@ -10,6 +10,7 @@ import { useRouter } from 'vue-router'
 import { onErrorCaptured } from 'vue'
 import LoadingComponent from './components/loadingComponent/LoadingComponent.vue'
 import { useConfigLoad } from './hooks/configLoad.js'
+import { OPEN_DATA_RULES } from './config.js'
 
 export default {
   name: 'AnalysisComponent',
@@ -239,20 +240,21 @@ export default {
     configLinks.reduce((parent, config) => {
       definePrivatelyProp(config, 'parent', parent)
       definePrivatelyProp(config, 'dynamicMapComp', dynamicMapComp)
-      
-      // 如果已经有dynamicHireRelat值的时候，就不需要再进行以下赋值了
-      if (
-        config?.dynamicHireRelat_bak && !configsSet?.has(config)
-        // && props.mode !== 'operate'
-      ) {
-        definePrivatelyProp(config, 'dynamicHireRelat', `${config.dynamicHireRelat_bak}__@__${props.mode}__`)
-      } else {
-        const dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(config, 'rowIndex') ? `[${config.rowIndex}]` : ''}->${(config.metaCode || '')}` : config.metaCode
-        definePrivatelyProp(config, 'dynamicHireRelat', dynamicHireRelat)
-        config.dynamicHireRelat_bak = dynamicHireRelat
+      if (!OPEN_DATA_RULES) {
+        // 如果已经有dynamicHireRelat值的时候，就不需要再进行以下赋值了
+        if (
+          config?.dynamicHireRelat_bak && !configsSet?.has(config)
+          // && props.mode !== 'operate'
+        ) {
+          definePrivatelyProp(config, 'dynamicHireRelat', `${config.dynamicHireRelat_bak}__@__${props.mode}__`)
+        } else {
+          const dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(config, 'rowIndex') ? `[${config.rowIndex}]` : ''}->${(config.metaCode || '')}` : config.metaCode
+          definePrivatelyProp(config, 'dynamicHireRelat', dynamicHireRelat)
+          config.dynamicHireRelat_bak = dynamicHireRelat
+        }
+        configsSet?.add(config) // 搜集所有的config
+        config.dynamicHireRelat && (dynamicMapComp[config.dynamicHireRelat] = config)
       }
-      configsSet?.add(config) // 搜集所有的config
-      config.dynamicHireRelat && (dynamicMapComp[config.dynamicHireRelat] = config)
       return config
     })
 

package/src/components/helper/dock.js

@@ -47,7 +47,8 @@ export const dynamicLoadScript = (src = { type: 'js', url: '', id: '' }) => {
         resolve(src.url)
       }
       link.onerror = function () {
-        reject(new Error('Failed to load ' + src.url), link)
+        resolve(src.url)
+        // reject(new Error('Failed to load ' + src.url), link)
       }
       document.head.appendChild(link)
     }

package/src/components/helper/eventOrchestration.js

@@ -595,6 +595,7 @@ export async function executeDataValid(validConfig, {
   const ret = await buildInRequest(url, {
     aid_language: lang,
     requestTraceId,
+    busiIdentityId: validConfig.busiIdentityId, 
     ...reqData,
     ...(builtPolyfillReq || {}),
     pmHandleBusinessIdentity: {

package/src/components/packages-web/CustomComponentPlain.vue

@@ -1,10 +1,10 @@
 <template>
-  <span class="custom-component-plain" :class="classObj" @click.stop.self="clickAction">{{ props.formatter?.(value) ?? value }}</span>
+  <span class="custom-component-plain" v-bind="currentPorps"  @click.stop.self="clickAction">{{ props.formatter?.(value) ?? value }}</span>
 </template>
 <script setup>
 import { findComponent } from '../../utils/common';
 import { commonPropsType, PLAIN_TYPE_OPTIONS_COLUMNS } from '../../utils/const' // 这边不能用utils/index去引用，因为这个组件在utils/render.js中被引入了，会造成循环引用
-import { computed, defineModel, defineProps, inject, getCurrentInstance, watch, nextTick } from 'vue'
+import { computed, defineModel, defineProps, inject, getCurrentInstance, watch, nextTick, useAttrs } from 'vue'
 import dayjs from 'dayjs'
 import { isNaN } from '../../utils/is';
 import { useFormItem } from 'element-plus'
@@ -13,6 +13,7 @@ defineOptions({
   inheritAttrs: false
 })
 
+const attrs = useAttrs()
 const { formItem: elFormItem } = useFormItem()
 const modelValue = defineModel()
 const props = defineProps({
@@ -144,6 +145,13 @@ const classObj = computed(() => ([
   }
 ]))
 
+const currentPorps = computed(() => {
+  return {
+    style: attrs.style,
+    class: classObj.value
+  }
+})
+
 
 const appContext = getCurrentInstance()?.appContext
 const buttonActions = inject('buttonActions', {})

package/src/components/packages-web/CustomComponentTable.jsx

@@ -152,7 +152,9 @@ export default {
       }
       return porpsObj
     })
-
+    const multiPmPageMetaList = computed(() => {
+      return props.config.multiPmPageMetaList || []
+    })
     const getCompEvents = (comp) => {
       let emitKeys = comp.emits || {}
       if(!Array.isArray(emitKeys)) {
@@ -385,9 +387,6 @@ export default {
       modelValue.value[idx] = val
     }
 
-    const multiPmPageMetaList = computed(() => {
-      return props.config.multiPmPageMetaList || []
-    })
 
     /**
      * 设置 multiPmPageMetaList 的值

package/src/hooks/pageConfig.js

@@ -87,6 +87,8 @@ export function useBuildInData({ messageInstance, loadingInstance, requestTraceI
         }
         getSelects({
           tenantId: ret.data.result?.pmBusinessIdentityVO?.tenantId,
+          busiIdentityId: reqData.busiIdentityId,
+          requestTraceId: requestTraceId,
           ...(selectPolyReq || {})
         }, selectsCb)
         return

package/src/hooks/reactive.js

@@ -0,0 +1,160 @@
+import { computed, inject, nextTick, reactive, unref } from "vue"
+import rulesDriver from '../rules/rulesDriver'
+import defaultVal from '../utils/defaultVal.js'
+import {assignmentPathVal, definePrivatelyProp, getPathVal, isNonRefType, modelValueDeepMerge } from "../utils"
+
+export function useVModel(config, props, emit, modelKey = 'update:modelValue') {
+  const { hireRelatMapRules, messageInstance, rootValue, ruleExecuter, dataLoad, dynamicMapComp, lang, _mapComp } = this
+  const currentRules = hireRelatMapRules.value[config.hireRelat]
+  let metaCodeKey = config.metaCode
+  if (modelKey !== 'update:modelValue') {
+    const matchs = modelKey.match(/^update:(\w+)$/)
+    if (!matchs) {
+      return
+    }
+    metaCodeKey = matchs[1]
+    const dynamicMapKey = config.dynamicHireRelat.replace(/->\w+$/, `->${metaCodeKey}`)
+    config = dynamicMapComp[dynamicMapKey]
+  }
+  const retModelVale = computed({
+    get() {
+      if (!config) {
+        // 如果使用v-model:[]方式绑定非modelValue，可能会出现没有对应的config
+        return
+      }
+      const val = (metaCodeKey ? props.modelValue?.[metaCodeKey] : props.modelValue) ?? null
+      if (modelKey === 'update:modelValue' && (val === undefined || val === null)) {
+        defaultVal(config)
+        // setTimeout(() => {
+        //   defaultVal(config)
+        // }, 0)
+      }
+      config && (config.bindValue = val)
+      if (config) {
+        // 事件初始化执行，在dataLoaded请求完成之后，执行一次事件
+        if (dataLoad.value && !config.eventInit && !config.notInit) {
+          setTimeout(() => {
+            ruleExecuter?.run({
+              rootValue,
+              rules: currentRules,
+              config,
+              dynamicMapComp,
+              lang,
+              messageInstance,
+              _mapComp,
+              isInit: true,
+            })
+            rulesDriver.call({
+              config,
+              dynamicMapComp,
+              lang,
+              _mapComp,
+              messageInstance
+            }, currentRules, true)
+            definePrivatelyProp(config, 'eventInit', true)
+          }, 0)
+        }
+      }
+      return val
+    },
+    set(val) {
+      if (!config) {
+        return
+      }
+      const modelValue = props.modelValue
+      const metaCode = metaCodeKey
+      // if (!metaCode) return
+      if (!modelValue) {
+        // frameSet 表示的是一帧之内重复设置对应metaCode的值
+        // 一帧之内重复设置metaCode的值需要进行merge，也就是下面modelValueDeepMerge走的逻辑
+        //（
+        //  原因是因为一帧之后重复设置，如果不走merge，会出现val值直接覆盖原本对应的metaCode的值，
+        //  这个在正常情况下没什么问题，但是如果刚开始根数据对应的层级对应出现断层为空，在进行emit(update:modelValue)进行赋值之后
+        //  并不能立即更新到对应的props.modelValue下面去，所以会出现 同时通过config.refValue设置同层级，并且是根数据断层的情况下；会出现覆盖
+        // ）
+        config.parent && (config.parent.frameSet = true)
+        nextTick(() => {
+          config.parent && (config.parent.frameSet = false)
+        })
+        let updateValue = {
+          [metaCode]: val
+        }
+        if (!metaCode) {
+          updateValue = val
+        }
+        emit('update:modelValue', updateValue)
+      } else {
+        let updateValue = modelValue?.[metaCode]
+        if (config?.frameSet) {
+          if (!metaCode) {
+            updateValue = modelValue
+          }
+          if (updateValue) {
+            if (typeof updateValue === 'object' || typeof val === 'object') {
+              val = modelValueDeepMerge(updateValue, val)
+            }
+          }
+        }
+        if (isNonRefType(updateValue) && isNonRefType(val) && updateValue === val) {
+          // 这边的值没有变,就不用出触发下面的其他动作了
+          return
+        }
+        try {
+          if (!metaCode) {
+            props.modelValue = val
+          } else {
+            props.modelValue[metaCode] = val
+          }
+        } catch (error) {
+          console.log('config', config, metaCode)
+        }
+      }
+      if (config) {
+        setTimeout(() => {
+          ruleExecuter?.run({
+            rootValue,
+            rules: currentRules,
+            config,
+            dynamicMapComp,
+            lang,
+            messageInstance,
+            _mapComp,
+          })
+          rulesDriver.call({
+            config,
+            dynamicMapComp,
+            lang,
+            _mapComp,
+            messageInstance
+          }, currentRules)
+        }, 0)
+      }
+    }
+  })
+  return retModelVale
+}
+
+export function useVmodels(config) {
+  const modelValue = computed({
+    get() {
+      const {
+        _rootValue,
+        dynamicHireRelat
+      } = config
+      return getPathVal(unref(_rootValue), dynamicHireRelat, '->')
+    },
+    set(val) {
+      const {
+        _rootValue,
+        dynamicHireRelat
+      } = config
+      return assignmentPathVal(_rootValue, dynamicHireRelat, val, '->')
+    }
+  })
+  return {
+    modelValue,
+    // vModelObjs,
+    // initVmodels
+  }
+  
+}

package/src/hooks/watchRuels.js

@@ -13,21 +13,21 @@ export function toWatchRules({
 }) {
   const ruleKeys = Object.keys(rules)
   ruleKeys.forEach(originKey => {
+    const keys = originKey.split('->')
     let comps = []
-    let key = originKey
-    while (key) {
-      const comp = mapComp[key]
+    for (let index = 0; index < keys.length; index++) {
+      const key = keys[index];
+      let comp = null
+      if (index === 0) {
+        comp = mapComp[key]
+      } else {
+        comp = comps[comps.length - 1]?.pmPageMetaList?.find(item => item.metaCode === key)
+      }
       if (comp) {
-        comps.unshift(comp)
-        const convertkey = key.replace(/->\w*$/, '')
-        if (convertkey === key) {
-          key = ''
-        } else {
-          key = convertkey
-        }
+        comps.push(comp)
       } else {
-        comps = []
-        key = ''
+        comp = null
+        break
       }
     }
     if (comps && comps.length) {
@@ -42,23 +42,18 @@ export function toWatchRules({
           currentPath,
         })
       }
-      watchRuleTrace({comps, rootValue, watchCb})
+      watchRuleTrace({comps, originKey, rootValue, watchCb})
     }
   })
 }
 
-function watchRuleTrace({comps, rootValue, watchCb}, prefix = '', idx = 0, unWatchsList = []) {
+function watchRuleTrace({comps, originKey, rootValue, watchCb}, prefix = '', idx = 0, unWatchsList = []) {
   if (comps && comps.length) {
     const comp = comps[idx]
-    try {
-      prefix += prefix ? `->${comp.metaCode}` : comp.metaCode
-    } catch (error) {
-      debugger
-    }
+    prefix += prefix ? `->${comp.metaCode}` : comp.metaCode
     if (comps.length === (idx + 1)) {
       const unWatch = watch(() => getPathVal(unref(rootValue), prefix, '->'), (val) => {
         // 开始执行规则
-        console.log('watch====:', prefix)
         watchCb?.(prefix)
       }, {
         immediate: true
@@ -70,36 +65,39 @@ function watchRuleTrace({comps, rootValue, watchCb}, prefix = '', idx = 0, unWat
       return
     }
     if (isCycleConfig(comp)) {
-      const _mapUnWatchs = comp._mapUnWatchs || (comp._mapUnWatchs = Object.create(null))
-      const _rowMapWatchs = _mapUnWatchs[prefix] || (_mapUnWatchs[prefix] = new Map())
-      watch(() => getPathVal(unref(rootValue), prefix, '->')?.length, () => {
-        const list = getPathVal(unref(rootValue), prefix, '->') || []
-        list.forEach((row, index) => {
-          if (!_rowMapWatchs.get(row)) {
-            const childUnWatchs = []
-            unWatchsList.push(childUnWatchs)
-            const currentPrefix = `${prefix}[${index}]`
-            const currentIdx = idx + 1
-            watchRuleTrace({comps, rootValue, watchCb}, currentPrefix, currentIdx, [...unWatchsList])
-            _rowMapWatchs.set(row, {key: currentPrefix, childUnWatchs})
-          }
-        })
-        try {
-          const mapKeys = _rowMapWatchs.keys()
-          Array.from(mapKeys).forEach(row => {
-            if (!list.some(row2 => row2 === row)) {
-              _rowMapWatchs.get(row)?.childUnWatchs?.forEach(un => un?.())
-            }
-          })
-        } catch (error) {
-          debugger
+      const _mapChildUnWatchs = comp._mapChildUnWatchs || (comp._mapChildUnWatchs = Object.create(null))
+      const _rowMapWatchs = _mapChildUnWatchs[prefix] || (_mapChildUnWatchs[prefix] = new Map())
+
+      const _mapUnWatch = comp._mapUnWatch || (comp._mapUnWatch = Object.create(null))
+      !_mapUnWatch[prefix] && (_mapUnWatch[prefix] = {cbs: [], unwatch: null})
+      _mapUnWatch[prefix].cbs.push(({index}) => {
+        if (!_rowMapWatchs.get(`${originKey}__${index}`)) {
+          const currentUnWatchsList = [...unWatchsList]
+          const childUnWatchs = []
+          currentUnWatchsList.push(childUnWatchs)
+          const currentPrefix = `${prefix}[${index}]`
+          const currentIdx = idx + 1
+          watchRuleTrace({comps, originKey, rootValue, watchCb}, currentPrefix, currentIdx, currentUnWatchsList)
+          _rowMapWatchs.set(`${originKey}__${index}`, {key: currentPrefix, childUnWatchs})
         }
-      }, {
-        immediate: true
       })
+      if (!_mapUnWatch[prefix].unwatch) {
+        _mapUnWatch[prefix].unwatch = watch(() => getPathVal(unref(rootValue), prefix, '->')?.length, (length) => {
+          
+          // 这边只需要根据index进行判断是否生成watch就行了，因为监听数据都是根据index索引来的，
+          // 在数组减少的时候，也不需要进行unwatch操作，直接留着，如果数组新增，可以直接用
+          for (let index = 0; index < length; index++) {
+            _mapUnWatch[prefix].cbs.forEach(cb => {
+              cb({index})
+            })
+          }
+        }, {
+          immediate: true
+        })
+      }
     } else {
       idx++
-      watchRuleTrace({comps, rootValue, watchCb}, prefix, idx)
+      watchRuleTrace({comps, originKey, rootValue, watchCb}, prefix, idx, unWatchsList)
     }
   }
 }

package/src/index.jsx

@@ -309,7 +309,7 @@ export default {
       instance,
       dynamicMapComp,
       isH5: props.isH5,
-      rootValue: props.modelValue,
+      rootValue: toRef(props, 'modelValue'),
       parentRootValue: props.parentRootValue,
       parentDynamicMapComp: props.parentDynamicMapComp,
       axiosInstance: axiosInstance.value,
@@ -331,7 +331,7 @@ export default {
         instance,
         dynamicMapComp,
         isH5: props.isH5,
-        rootValue: props.modelValue,
+        rootValue: toRef(props, 'modelValue'),
         parentRootValue: props.parentRootValue,
         parentDynamicMapComp: props.parentDynamicMapComp,
         axiosInstance: axiosInstance.value,
@@ -422,6 +422,9 @@ export default {
         messageInstance: props.messageInstance,
         lang: props.lang,
       })
+      setInterval(() => {
+        console.log("dynamicMapComp===:", dynamicMapComp)
+      }, 3000);
     }
     onMounted(() => {
       if (props.openBpm) {

package/src/rulesOfDate/eventsSupplement.js

@@ -404,14 +404,17 @@ const allInitEvents = {
     }
   },
   limitDataRange({event, rootValue, mapComp, dynamicMapComp, currentPath, messageInstance, isInit}) {
-    const { targetObj: target, targetObjVal = '' } = event
+    let { targetObj: target, targetObjVal = '' } = event
     if (!target) return
     const targetObj = `${target}`
+    targetObjVal = targetObjVal || ''
     let range = []
-    if (targetObjVal?.indexOf('~') > -1) {
-      range = targetObjVal.split('~')
-    } else {
-      range = targetObjVal.split(',')
+    if (targetObjVal) {
+      if (targetObjVal?.indexOf('~') > -1) {
+        range = targetObjVal.split('~')
+      } else {
+        range = targetObjVal.split(',')
+      }
     }
     if (range && range.length) {
       const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})

package/src/utils/cipher.js

@@ -1,7 +1,8 @@
+import CryptoJs from 'crypto-js';
 import { decrypt as aesDecrypt, encrypt as aesEncrypt } from 'crypto-js/aes';
 import UTF8 from 'crypto-js/enc-utf8';
 import pkcs7 from 'crypto-js/pad-pkcs7';
-import CTR from 'crypto-js/mode-ctr';
+// import CTR from 'crypto-js/mode-ctr';
 import Base64 from 'crypto-js/enc-base64';
 import MD5 from 'crypto-js/md5';
 import SHA256 from 'crypto-js/sha256';
@@ -17,7 +18,7 @@ class AesEncryption {
 
   get getOptions() {
     return {
-      mode: CTR,
+      mode: CryptoJs.mode.CBC,
       padding: pkcs7,
       iv: this.iv,
     };