resolver-egretimp-plus 0.0.46 → 0.0.48

package/package.json

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

package/scripts/webpack.config.js

@@ -80,7 +80,9 @@ module.exports = {
     '@element-plus/icons-vue': '@element-plus/icons-vue',
     'element-plus/es/components/icon/index.mjs': 'element-plus/es/components/icon/index.mjs',
     'element-plus/es/constants/index.mjs': 'element-plus/es/constants/index.mjs',
-    'element-plus/es/utils/index.mjs': 'element-plus/es/utils/index.mjs'
+    'element-plus/es/utils/index.mjs': 'element-plus/es/utils/index.mjs',
+    'element-plus/es/locale/lang/zh-cn': 'element-plus/es/locale/lang/zh-cn',
+    'element-plus/es/locale/lang/en': 'element-plus/es/locale/lang/en'
   },
   externalsType: 'module',
   experiments: {

package/src/components/childDialog/src/index.vue

@@ -1,6 +1,8 @@
 <script setup>
 import { computed, defineAsyncComponent, ref } from 'vue';
 import { ElDialog } from 'element-plus';
+import zhCn from 'element-plus/es/locale/lang/zh-cn'
+import en from 'element-plus/es/locale/lang/en'
 const Resolver = defineAsyncComponent(() => import('../../../resolver-web.vue'))
 
 const props = defineProps({
@@ -38,6 +40,9 @@ const rootOptionComp = ref({})
 const dialogHeight = computed(() => {
   return rootOptionComp.value?.widgetHeight
 })
+const locale = computed(() => {
+  return props.lang?.indexOf('zh') > -1 ? zhCn : en
+})
 const dialogWidth = computed(() => {
   return rootOptionComp.value?.widgetWidth
 })
@@ -58,24 +63,26 @@ defineExpose({
 })
 </script>
 <template>
-  <ElDialog class="open-child-frame" v-model="dialogVisible"
-    :style="dialogStyle"
-    :close-on-click-modal="false" :width="dialogWidth"
-  >
-    <div>
-    </div>
-    <Resolver v-if="dialogVisible" ref="resolverRef"
-      @loadedConfigCompeted="loadedConfigCompeted"
-      @rootStoreChange="rootStoreChange"
-      v-model="formData"
-      :busiIdentityId="busiIdentityId"
-      :lang="props.lang"
-      :loadEvnetsReq="props.loadEvnetsReq"
-      :polyfillConfigs="props.polyfillConfigs"
-      :axiosInstance="props.axiosInstance"
-      :axiosConfig="props.axiosConfig"
-    ></Resolver>
-  </ElDialog>
+  <ElConfigProvider :locale="locale">
+    <ElDialog class="open-child-frame" v-model="dialogVisible"
+      :style="dialogStyle"
+      :close-on-click-modal="false" :width="dialogWidth"
+    >
+      <div>
+      </div>
+      <Resolver v-if="dialogVisible" ref="resolverRef"
+        @loadedConfigCompeted="loadedConfigCompeted"
+        @rootStoreChange="rootStoreChange"
+        v-model="formData"
+        :busiIdentityId="busiIdentityId"
+        :lang="props.lang"
+        :loadEvnetsReq="props.loadEvnetsReq"
+        :polyfillConfigs="props.polyfillConfigs"
+        :axiosInstance="props.axiosInstance"
+        :axiosConfig="props.axiosConfig"
+      ></Resolver>
+    </ElDialog>
+  </ElConfigProvider>
 </template>
 
 <style lang="scss">

package/src/components/helper/eventOrchestration.js

@@ -128,9 +128,10 @@ export function openDailg({
   const reqData = getReqData(pagePopupMap.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
 
   const outParamMappingList = pagePopupMap?.outParamMappingList?.map(item => {
+    const orignParamArr = item.orignParam ? item.orignParam.split('->') : []
     return {
       ...item,
-      orignParam: item.orignParam ? item.orignParam.split('->')[0] : ''
+      orignParam: item.orignParam ? orignParamArr[orignParamArr.length - 1] : ''
     }
   }) || []
 
@@ -231,6 +232,11 @@ export async function executeDataValid(validConfig, { dynamicMapComp, mixinServi
   })
 }
 
+function closePage() {
+  // window?.close()
+  // window?.history?.back()
+}
+
 export async function executeEventOrchestration({props, axiosInstance, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
   const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []

package/src/components/helper/resolver.js

@@ -1,6 +1,6 @@
 export async function executeLoadServices(services = [], { axiosInstance, messageInstance, reqData, respCb }) {
   const loadServices = services.filter(ser => ser.eventType == '1')
-  // const mixinServiceConfig = services.find(service => service.serviceType === '1')
+  const mixinServiceConfig = services.find(service => service.serviceType === '1')
 
   for (let i = 0; i < loadServices.length; i++) {
     const service = loadServices[i]
@@ -13,7 +13,7 @@ export async function executeLoadServices(services = [], { axiosInstance, messag
           busiIdentityId: service.busiIdentityId,
           pageMetaId: service.pageMetaId,
           tenantId: service.tenantId,
-          // mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+          mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
         },
         ...(reqData || {})
       }

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

@@ -46,7 +46,6 @@ const reserveBottomMargin = computed(() => {
 </script>
 <style lang="scss">
 .custom-component-row {
-  width: 100%;
   .el-col {
     & > .el-form-item {
     }

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

@@ -1,5 +1,5 @@
 <template>
-  <component :is="component" :class="[component === ElCard ? 'is-card' : '']" class="standard-wrap custom-component-collapse" v-bind="{...componentProps, ...attrs}">
+  <component :is="component" class="standard-wrap" v-bind="{...componentProps, ...attrs}">
     <ElCollapse v-bind="{...collapseProps}" :class="collapseClass"  v-model="activeNames">
       <ElCollapseItem v-bind="collapseItemProps" >
         <template #title>
@@ -93,7 +93,7 @@ const activeNames = computed({
 })
 
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .collapge-slot-title {
   display: flex;
   justify-content: space-between;
@@ -112,72 +112,4 @@ const activeNames = computed({
     }
   }
 }
-.not-wrap-border {
-  &.el-collapse {
-    border-top: none;
-    border-bottom: none;
-  }
-}
-</style>
-<style lang="scss">
-// 配置被包裹的一层样式
-.standard-wrap {
-  box-sizing: border-box;
-}
-.custom-component-collapse {
-  .el-collapse-item__wrap, .el-collapse-item__header {
-    border-bottom: none;
-    &::before {
-      display: none;
-    }
-  }
-  .el-collapse-item__wrap {
-    overflow: none;
-  }
-  .el-collapse-item {
-    position: relative;
-    &::after {
-      content: "";
-      display: block;
-      position: absolute;
-      width: 100%;
-      bottom: 0;
-      left: 0;
-      height: 1px;
-      background-color: #d0d3d6;
-      // margin-bottom: var(--prmary-marign);
-    }
-    .el-collapse-item__content {
-      & > .el-row {
-        > .el-col {
-          &:last-child {
-            & > .el-form-item {
-              margin-bottom: 24px;
-            }
-          }
-        }
-      }
-    }
-  }
-  .el-collapse-item__arrow {
-    font-size: 16px;
-    color: #646A73;
-    svg path {
-      d: path("M 338.752 104.704 a 64 64 0 0 0 0 90.496 l 316.8 316.8 l -316.8 316.8 a 64 64 0 0 0 90.496 90.496 l 362.048 -362.048 a 64 64 0 0 0 0 -90.496 L 429.248 104.704 a 64 64 0 0 0 -90.496 0 Z");
-    }
-  }
-  .el-collapse-item__content {
-    .el-tabs {
-      margin-right: 16px;
-      margin-bottom: 16px;
-    }
-  }
-}
-.underline-hidden {
-  .el-collapse-item {
-    &::after {
-      display: none;
-    }
-  }
-}
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-  <ElRow class="custom-component-row" :class="classRef" v-bind="{...elRowProps, ...attrs}">
+  <ElRow class="custom-component-row" :class="classRef" v-bind="{...attrs, ...elRowProps}">
     <Renderer :config="pmPageMetaList" v-model="props.refValue.value"></Renderer>
   </ElRow>
 </template>
@@ -22,7 +22,6 @@ const elRowProps = computed(() => {
   }, {})
 })
 const attrs = useAttrs()
-
 const classRef = computed(() => {
   return {
     'clear-right-margin': !reserveRightMargin.value,
@@ -44,7 +43,6 @@ const reserveBottomMargin = computed(() => {
 </script>
 <style lang="scss">
 .custom-component-row {
-  width: 100%;
   .el-col {
     & > .el-form-item {
     }

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

@@ -360,7 +360,7 @@ export default {
           <ElTable {...tableProps.value} {...tableEvents}
             ref={(e) => {tableRef.value = e}}
             highlight-current-row={selectable.value || tableProps.value?.highlightCurrentRow ? true : false}
-            onCurrentChange={selectable.value ? currentChange : () => {}}
+            onCurrentChange={selectable.value || tableProps.value?.highlightCurrentRow ? currentChange : () => {}}
             data={[...(props.refValue.value || []), ...totalRow.value]}
             onSelectionChange={handleSelectionChange}
           >

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

@@ -1,7 +1,6 @@
 <template>
-  <ElCheckboxGroup v-model="modeValue" v-if="props.options && props.options.length" v-bind="{...checkboxGroupProps, ...attrs}">
+  <ElCheckboxGroup v-if="isMutiple" v-bind="{...checkboxGroupProps, ...attrs}" v-model="proxyValue" >
     <ElCheckbox 
-      v-bind="{...checkboxProps }"
       v-for="option in props.options"
       :key="option.columnValue"
       :value="option.columnValue"
@@ -9,13 +8,13 @@
       {{lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}}
     </ElCheckbox>
   </ElCheckboxGroup>
-  <ElCheckbox v-else v-bind="{...checkboxProps, ...attrs}" v-model="modeValue">
+  <ElCheckbox v-else v-bind="{...checkboxProps, ...attrs}" v-model="proxyValue">
     {{ label }}
   </ElCheckbox>
 </template>
 <script setup>
 import { ElCheckbox, ElCheckboxGroup } from 'element-plus'
-import { useAttrs, computed, inject } from 'vue'
+import { useAttrs, computed, inject, ref } from 'vue'
 import { commonPropsType, hasOwn } from '../../utils/index.js'
 
 const props = defineProps({
@@ -51,5 +50,27 @@ const checkboxProps = computed(() => {
   return ret
 })
 const attrs = useAttrs()
-const modeValue = defineModel()
+// 是否为多选
+const isMutiple = computed(() => {
+  return props.options && props.options.length
+})
+const modelValue = defineModel()
+
+const proxyValue = computed({
+  get() {
+    if (isMutiple.value) {
+      const val = modelValue.value || ''
+      return val ? val.split(',') : []
+    } else {
+      return modelValue.value
+    }
+  },
+  set(val) {
+    if (isMutiple.value) {
+      modelValue.value = val.join(',')
+    } else {
+      modelValue.value = val
+    }
+  }
+})
 </script>

package/src/components/styles/CustomComponenTable.scss

@@ -6,7 +6,7 @@
 .custom-component-table {
   --boder-radius: 4px;
   border-radius: var(--boder-radius);
-  width: 100%;
+  // width: 100%;
   .el-table, &.el-table {
     --el-table-header-bg-color: #f5f6f7;
     --el-table-header-text-color: #646a73;

package/src/resolver-H5.vue

@@ -1,6 +1,6 @@
 <script setup>
 import getNativeComps from './components/patchComponents-H5.js'
-import { useAttrs } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import Resolver from './resolver-common.vue'
 import CmiToast from "cmid/lib/toast"
 import CmiFullLoading from "cmid/lib/fullloading"
@@ -36,9 +36,31 @@ defineOptions({
 })
 const attrs = useAttrs()
 
+const resolverRef = ref(null)
+defineExpose({
+  dynamicMapComp: computed({
+    get() {
+      return resolverRef.value?.dynamicMapComp
+    }
+  }),
+  validate(...arg) {
+    return resolverRef.value?.validate(...arg)
+  },
+  pageConfig: computed({
+    get() {
+      return resolverRef.value?.pageConfig
+    }
+  }),
+  rootForm: computed({
+    get() {
+      return resolverRef.value?.rootForm
+    }
+  }),
+})
 </script>
 <template>
   <Resolver
+    ref="resolverRef"
     v-bind="attrs"
     :isH5="true" :getNativeComps="getNativeComps"
     :messageInstance="props.messageInstance"

package/src/resolver-common.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, useAttrs } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import Resolver from './index.jsx'
 import { useBuildInData } from './hooks/pageConfig';
 import { initInterceptors } from './utils/request.js';
@@ -43,7 +43,29 @@ const allSelects = computed(() => {
     ...selects.value
   }
 })
+
+const resolverRef = ref(null)
+defineExpose({
+  dynamicMapComp: computed({
+    get() {
+      return resolverRef.value?.dynamicMapComp
+    }
+  }),
+  validate(...arg) {
+    return resolverRef.value?.validate(...arg)
+  },
+  pageConfig: computed({
+    get() {
+      return resolverRef.value?.pageConfig
+    }
+  }),
+  rootForm: computed({
+    get() {
+      return resolverRef.value?.rootForm
+    }
+  }),
+})
 </script>
 <template>
-  <Resolver v-bind="attrs" :loadingInstance="props.loadingInstance" :messageInstance="props.messageInstance" :getNativeComps="props.getNativeComps" :config="pageConfig || null" :selects="allSelects"></Resolver>
+  <Resolver ref="resolverRef" v-bind="attrs" :loadingInstance="props.loadingInstance" :messageInstance="props.messageInstance" :getNativeComps="props.getNativeComps" :config="pageConfig || null" :selects="allSelects"></Resolver>
 </template>

package/src/resolver-web.vue

@@ -2,7 +2,7 @@
 import getNativeComps from './components/patchComponents-web'
 import { ElMessage, ElMessageBox } from "element-plus"
 import { loadingInstance } from './components/loading'
-import { useAttrs } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import Resolver from './resolver-common.vue'
 import { openChildDialog } from './components/childDialog';
 
@@ -35,9 +35,31 @@ defineOptions({
 })
 const attrs = useAttrs()
 
+const resolverRef = ref(null)
+defineExpose({
+  dynamicMapComp: computed({
+    get() {
+      return resolverRef.value?.dynamicMapComp
+    }
+  }),
+  validate(...arg) {
+    return resolverRef.value?.validate(...arg)
+  },
+  pageConfig: computed({
+    get() {
+      return resolverRef.value?.pageConfig
+    }
+  }),
+  rootForm: computed({
+    get() {
+      return resolverRef.value?.rootForm
+    }
+  }),
+})
 </script>
 <template>
   <Resolver
+    ref="resolverRef"
     v-bind="attrs"
     :getNativeComps="getNativeComps"
     :messageInstance="props.messageInstance"

package/src/theme/element/components/collapse.scss

@@ -1,16 +1,104 @@
+@import "./common.scss";not-wrap-border
 
-.el-collapse {
-  --el-collapse-header-height: 22px;
-  --el-collapse-header-font-size: 14px;
-  // margin-bottom: var(--prmary-marign);
-  .el-collapse-item__header {
-    padding-bottom: 12px;
-    box-sizing: content-box;
+// 配置被包裹的一层样式
+.standard-wrap {
+  box-sizing: border-box;
+}
+.CustomComponentCollapse {
+  .el-collapse {
+    --el-collapse-header-height: 22px;
+    --el-collapse-header-font-size: 14px;
+    // margin-bottom: var(--prmary-marign);
+    .el-collapse-item__header {
+      padding-bottom: 12px;
+      box-sizing: content-box;
+    }
+    .el-collapse-item__content {
+      padding-bottom: 0;
+    }
+    .el-collapse-item__wrap {
+      margin-right: calc(var(--prmary-marign) - var(--prmary-marign) * 2);
+    }
   }
-  .el-collapse-item__content {
-    padding-bottom: 0;
+
+  .el-collapse-item__wrap, .el-collapse-item__header {
+    border-bottom: none;
+    &::before {
+      display: none;
+    }
   }
   .el-collapse-item__wrap {
-    margin-right: calc(var(--prmary-marign) - var(--prmary-marign) * 2);
+    overflow: none;
+  }
+  .el-collapse-item {
+    position: relative;
+    &::after {
+      content: "";
+      display: block;
+      position: absolute;
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      height: 1px;
+      background-color: #d0d3d6;
+      // margin-bottom: var(--prmary-marign);
+    }
+    .el-collapse-item__content {
+      & > .el-row {
+        > .el-col {
+          &:last-child {
+            & > .el-form-item {
+              margin-bottom: 24px;
+            }
+          }
+        }
+      }
+    }
+  }
+  .el-collapse-item__arrow {
+    font-size: 16px;
+    color: #646A73;
+    svg path {
+      d: path("M 338.752 104.704 a 64 64 0 0 0 0 90.496 l 316.8 316.8 l -316.8 316.8 a 64 64 0 0 0 90.496 90.496 l 362.048 -362.048 a 64 64 0 0 0 0 -90.496 L 429.248 104.704 a 64 64 0 0 0 -90.496 0 Z");
+    }
+  }
+  .el-collapse-item__content {
+    @include nestMargin
+  }
+
+  .el-collapse-item__arrow {
+    margin-right: 0;
+  }
+}
+
+.CustomComponentCollapse:first-child {
+  margin-bottom: 12px;
+}
+.CustomComponentCollapse + .CustomComponentCollapse {
+  margin-bottom: 12px;
+}
+
+.CustomComponentCollapse.is-card:first-child {
+  margin-bottom: 16px;
+}
+.CustomComponentCollapse.is-card + .CustomComponentCollapse.is-card {
+  margin-bottom: 16px;
+}
+
+// 加权
+.CustomComponentCollapse.CustomComponentCollapse.CustomComponentCollapse:last-child {
+  margin-bottom: 0;
+}
+.underline-hidden {
+  .el-collapse-item {
+    &::after {
+      display: none;
+    }
+  }
+}
+.not-wrap-border {
+  &.el-collapse {
+    border-top: none;
+    border-bottom: none;
   }
 }

package/src/theme/element/components/common.scss

@@ -0,0 +1,12 @@
+@mixin nestMargin {
+  & > div {
+    & > .CustomComponentTable,
+    & > .CustomComponentCollapse,
+    & > .CustomComponentRow {
+      & > div {
+        margin-right: 16px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+}

package/src/theme/element/components/dialog.scss

@@ -0,0 +1,42 @@
+
+// 组件弹框样式定义调整
+.custom-component-dialog {
+  padding-top: 0px;
+  padding-bottom: 0;
+  
+  .el-dialog__header {
+    display: none;
+  }
+  .el-dialog__body {
+    height: 100%;
+    .header {
+      line-height: 46px;
+      font-size: 14px;
+      font-weight: 500;
+      color: #1F2329;
+    }
+    .content {
+      height: 100%;
+      box-sizing: border-box;
+      // .el-scrollbar__wrap {
+      //   overflow-x: hidden;
+      // }
+      // .is-horizontal {
+      //   display: none;
+      // }
+    }
+    .footer {
+      height: 68px;
+      text-align: right;
+      overflow: hidden;
+      .dialog-footer {
+        margin-top: 16px;
+      }
+    }
+  }
+  &.el-dialog footer {
+    position: initial;
+    transform: none;
+    padding: 0;
+  }
+}

package/src/theme/element/components/index.scss

@@ -40,3 +40,4 @@
 @import './tabs.scss';
 @import './tree.scss';
 @import './steps.scss';
+@import './dialog.scss'

package/src/theme/element/components/tabs.scss

@@ -1,4 +1,6 @@
 
+@import "./common.scss";
+
 .resolver-tabs {
   // 这个是渲染器里面tabs
   display: block;
@@ -69,4 +71,12 @@
       border: none;
     }
   }
+}
+.CustomComponentTabs {
+  .el-tabs__content {
+    margin-right: -16px;
+    .el-tab-pane {
+      @include nestMargin
+    }
+  }
 }