resolver-egretimp-plus 0.1.122 → 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.122",
+  "version": "0.1.123",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

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/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,
     };

package/src/utils/render.jsx

@@ -1,7 +1,7 @@
 import { getCodeMapRules } from '../rules/rulesDriver.js'
 import SimpleFormItemPc from '../components/simpleFormItemPc'
 import { resolveAssetComponents, findComponent, compareComponet, normalPixel, isPlainObject, hasOwn, isFnStr, normalCapitalizeComponent, capitalize, camelize, formatDate, definePrivatelyProp, extend, getPathVal, cloneDeep, generateUniqueId} from './common.js'
-import { resolveComponent, inject, watch, unref, markRaw } from 'vue'
+import { resolveComponent, inject, watch, unref, markRaw, reactive } from 'vue'
 import CustomComponentColH5 from '../components/packages-H5/CustomComponentColH5.vue'
 import {
   commonPropsType,
@@ -229,13 +229,18 @@ export function normalConfig({
   parentDynamicMapComp,
   noParsePageMetaList,
   changeConfig,
+  notParseConfig,
 }, config, hireRelat = '', mapComp = {}, needformItem = false, dynamicHireRelat = '', unWatchsList = []) {
+
   const metaCode = config.metaCode || ''
-  hireRelat += hireRelat ? `->${metaCode}` : metaCode
   dynamicHireRelat += dynamicHireRelat ? `->${metaCode}` : metaCode
-
+  hireRelat += hireRelat ? `->${metaCode}` : metaCode
   const originMetaType = config.metaType
-  const metaType = normalMetaType(config.metaType)
+  let metaType = originMetaType
+
+  if (!notParseConfig) {
+    metaType = normalMetaType(config.metaType)
+  }
 
   // 这个对象是不可以被配置进行覆盖
   const extendNativeObj = {
@@ -247,83 +252,80 @@ export function normalConfig({
     wrapVm: null, // 当前组件的实例（也就是analysisComponent）
     hireRelat,
     parent: null, // 这个是执行过程中，动态获取的
-    dynamicHireRelat: '', // 这个也是执行过程中，动态获取的层级
   }
 
   if (OPEN_DATA_RULES) {
-    extendNativeObj.dynamicHireRelat = dynamicHireRelat
     if (changeConfig) {
       // 设置multiPmPageMetaList的时候，如果数组变了，如果数组中的值变换了位置，需要对dynamicMapComp设置正确的映射
       correctConfigDynamicMap(dynamicMapComp, dynamicHireRelat)
     }
+    config.dynamicHireRelat = dynamicHireRelat
     dynamicMapComp[dynamicHireRelat] = config
     definePrivatelyProp(config, '_rootValue', rootValue)
     definePrivatelyProp(config, 'refValue', useVmodels(config).modelValue)
   }
 
-  let extendAttrObj = parseExtendAttr(config)
-  let extendObj = {
-    removeCol: findComponent(NOT_NEED_COL_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_COL_ITEM_META_TYPE, metaType) !== -1,
-    needformItem: (findComponent(NOT_NEED_FORM_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_FORM_ITEM_META_TYPE, metaType) !== -1) ? false : needformItem, // 表示这个配置项对应的渲染组件是否需要formItem进行包装 移动端是cmi-form-item
-  }
-  if (config.defStyle) {
-    extendObj.style = parseDefStyle(config.defStyle)
-  }
-  // 组件是根据数据进行动态循环渲染，这边需要进行特殊处理，确保config配置项独立
-  if (findComponent(MULTI_PAGE_META_LIST_TYPES, extendAttrObj.renderby) !== -1 || findComponent(MULTI_PAGE_META_LIST_TYPES, metaType) !== -1) {
-    extendObj.multiPmPageMetaList = []
-  }
-  // let pageConfig = {
-  //   ...extendObj,
-  //   ...config,
-  //   ...extendAttrObj,
-  //   ...extendNativeObj,
-  // }
-
-  extend(config, extendObj, true)
-  extend(config, extendAttrObj)
-  extend(config, extendNativeObj)
+  if (!notParseConfig) {
+    let extendAttrObj = parseExtendAttr(config)
+    let extendObj = {
+      removeCol: findComponent(NOT_NEED_COL_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_COL_ITEM_META_TYPE, metaType) !== -1,
+      needformItem: (findComponent(NOT_NEED_FORM_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_FORM_ITEM_META_TYPE, metaType) !== -1) ? false : needformItem, // 表示这个配置项对应的渲染组件是否需要formItem进行包装 移动端是cmi-form-item
+    }
+    if (config.defStyle) {
+      extendObj.style = parseDefStyle(config.defStyle)
+    }
+    // 组件是根据数据进行动态循环渲染，这边需要进行特殊处理，确保config配置项独立
+    if (isCycleConfig({renderby: extendAttrObj.renderby, metaType})) {
+      extendObj.multiPmPageMetaList = reactive([])
+    }
+  
+    extend(config, extendObj, true)
+    extend(config, extendAttrObj)
+    extend(config, extendNativeObj)
+  }
 
   let pageConfig = config
 
-  if (originMetaType == 'textarea') {
-    pageConfig.type = 'textarea'
-  }
-  if (originMetaType == 'time-range') {
-    pageConfig['isRange'] = true
-  }
-  if (originMetaType == 'date-range') {
-    pageConfig.type = 'daterange'
-  }
-  if (originMetaType == 'card' && !hasOwn(pageConfig, 'needWrap')) {
-    pageConfig.needWrap = '1'
-  }
-  // 在详情的情况下，配置组件是否显示
-  if (mode === MODE.DETAIL) {
-    if (pageConfig.detailExtendAttr) {
-      const detailExtendAttrObj = parseExtendAttr({
-        extendAttr: typeof pageConfig.detailExtendAttr === 'string' ? pageConfig.detailExtendAttr : JSON.stringify(pageConfig.detailExtendAttr),
-        metaCode: `detail-${pageConfig.metaCode}`
-      })
-      extend(pageConfig, detailExtendAttrObj)
+  if (!notParseConfig) {
+    if (originMetaType == 'textarea') {
+      pageConfig.type = 'textarea'
+    }
+    if (originMetaType == 'time-range') {
+      pageConfig['isRange'] = true
+    }
+    if (originMetaType == 'date-range') {
+      pageConfig.type = 'daterange'
+    }
+    if (originMetaType == 'card' && !hasOwn(pageConfig, 'needWrap')) {
+      pageConfig.needWrap = '1'
+    }
+    // 在详情的情况下，配置组件是否显示
+    if (mode === MODE.DETAIL) {
+      if (pageConfig.detailExtendAttr) {
+        const detailExtendAttrObj = parseExtendAttr({
+          extendAttr: typeof pageConfig.detailExtendAttr === 'string' ? pageConfig.detailExtendAttr : JSON.stringify(pageConfig.detailExtendAttr),
+          metaCode: `detail-${pageConfig.metaCode}`
+        })
+        extend(pageConfig, detailExtendAttrObj)
 
+      }
+      pageConfig.hidden = pageConfig.detailHidden || pageConfig.hidden
     }
-    pageConfig.hidden = pageConfig.detailHidden || pageConfig.hidden
-  }
-  // 在日志的情况下，配置组件是否显示
-  if (mode === MODE.LOG) {
-    if (pageConfig.logExtendAttr) {
-      const logExtendAttrObj = parseExtendAttr({
-        extendAttr: typeof pageConfig.logExtendAttr === 'string' ? pageConfig.logExtendAttr : JSON.stringify(pageConfig.logExtendAttr),
-        metaCode: `log-${pageConfig.metaCode}`
-      })
-      extend(pageConfig, logExtendAttrObj)
+    // 在日志的情况下，配置组件是否显示
+    if (mode === MODE.LOG) {
+      if (pageConfig.logExtendAttr) {
+        const logExtendAttrObj = parseExtendAttr({
+          extendAttr: typeof pageConfig.logExtendAttr === 'string' ? pageConfig.logExtendAttr : JSON.stringify(pageConfig.logExtendAttr),
+          metaCode: `log-${pageConfig.metaCode}`
+        })
+        extend(pageConfig, logExtendAttrObj)
+      }
+      pageConfig.hidden = pageConfig.logHidden || pageConfig.hidden
     }
-    pageConfig.hidden = pageConfig.logHidden || pageConfig.hidden
-  }
 
-  mapComp[hireRelat] = pageConfig
-  parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp }, pageConfig)
+    mapComp[hireRelat] = pageConfig
+    parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp }, pageConfig)
+  }
   
   if (!OPEN_DATA_RULES) {
     // 如果有子项，需要进行递归遍历
@@ -356,13 +358,18 @@ export function normalConfig({
   
     function normalPmPageMetaList(config) {
       const isCycleFlag = isCycleConfig(config)
-      config.pmPageMetaList = simpleNormalPmPageMetaList(config.pmPageMetaList, dynamicHireRelat, unWatchsList, isCycleFlag)
+      config.pmPageMetaList = simpleNormalPmPageMetaList({
+        pmPageMetaList: config.pmPageMetaList,
+        dynamicHireRelat,
+        unWatchsList,
+        noParsePageMetaList: isCycleFlag,
+        changeConfig
+      })
 
       definePrivatelyProp(config, '_rowColumnConfgsMap', markRaw(new Map()))
       config._unPageMetaListWatch?.() // 删除当前的监听
       if (isCycleFlag) {
         const currentUnWatchsList = [...unWatchsList]
-        definePrivatelyProp(config, 'multiPmPageMetaList', [])
 
         // 这边先执行，因为当前的_unWatchs里面只放子级的watch
         const oldUnWatchsList = [...currentUnWatchsList]
@@ -375,7 +382,7 @@ export function normalConfig({
           const list = getPathVal(unref(rootValue), config.dynamicHireRelat, '->')
           if (list && list.length) {
             const cbFns = []
-            config.multiPmPageMetaList = list.map((row, idx) => {
+            const pageMetaList = list.map((row, idx) => {
               const columnsCgs = config._rowColumnConfgsMap.get(row)
               if (columnsCgs) {
                 columnsCgs.forEach(config => {
@@ -401,13 +408,22 @@ export function normalConfig({
                   definePrivatelyProp(ret, 'parent', config) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
                   return ret
                 })
+                retColumnConfigs = reactive(retColumnConfigs)
                 cbFns.push(() => {
-                  simpleNormalPmPageMetaList(retColumnConfigs, `${config.dynamicHireRelat}[${idx}]`, currentUnWatchsList, false, true)
+                  simpleNormalPmPageMetaList({
+                    pmPageMetaList: retColumnConfigs,
+                    dynamicHireRelat: `${config.dynamicHireRelat}[${idx}]`,
+                    unWatchsList: currentUnWatchsList,
+                    noParsePageMetaList: false,
+                    changeConfig: true,
+                    notParseConfig: true,
+                  })
                 })
                 config._rowColumnConfgsMap.set(row, retColumnConfigs)
                 return retColumnConfigs
               }
             })
+            config.multiPmPageMetaList = reactive(pageMetaList)
             cbFns.forEach(cb => cb())
             
             const mapKeys = config._rowColumnConfgsMap.keys()
@@ -424,6 +440,7 @@ export function normalConfig({
         }, {
           immediate: true,
           deep: true,
+          // flush: 'sync'
         })
 
         oldUnWatchsList?.forEach(list => {
@@ -431,7 +448,7 @@ export function normalConfig({
         })
       }
   
-      function simpleNormalPmPageMetaList(pmPageMetaList, dynamicHireRelat, unWatchsList, noParsePageMetaList, changeConfig) {
+      function simpleNormalPmPageMetaList({pmPageMetaList, dynamicHireRelat, unWatchsList, noParsePageMetaList, changeConfig, notParseConfig}) {
         return pmPageMetaList.map(metaItem => {
           const { pageConfig } = normalConfig({
             requestTraceId,
@@ -450,6 +467,7 @@ export function normalConfig({
             parentDynamicMapComp,
             noParsePageMetaList,
             changeConfig,
+            notParseConfig,
           }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType), dynamicHireRelat, unWatchsList)
           return pageConfig
         })?.sort((a, b) => a.seqNo - b.seqNo)
@@ -550,13 +568,13 @@ export function isPlainColumn(config, disabled) {
 export function canHiddenConfig(config) {
   let retFlag = OPEN_DATA_RULES && config.hidden == '1'
   if (!retFlag) return false
-
+  
   let travseConfigs = [config]
   let currentConfig = null
   while(travseConfigs.length) {
     currentConfig = travseConfigs.shift()
     // 如果子级别中有onVnodeMounted、onMounted中一个有值，就表示需要进行渲染
-    if (currentConfig.onVnodeMounted || currentConfig.onMounted) {
+    if (currentConfig.onVnodeMounted || currentConfig.onMounted || currentConfig.immediateClickEvent) {
       return false
     }
     if (isCycleConfig(currentConfig)) {

package/src/utils/request.js

@@ -85,7 +85,7 @@ export function initInterceptors(messageInstance) {
   )
 }
 
-const encryptKey = '%cmi_lcp@10086#'
+const encryptKey = '%cmi_lcp@10086#S'
 export function buildInRequest(url, data, config = {}) {
   const randomUuidStr = `${data.busiIdentityId}_${data.requestTraceId}`
   const reqConfig = {