resolver-egretimp-plus 0.1.19 → 0.1.21

package/package.json

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

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

@@ -0,0 +1,70 @@
+<template>
+  <TabPane v-bind="{...attrs, ...tabPaneProps, ...polyProps}">
+    <template #label v-if="labelRenderContent || slotsPageMetalist.length">
+      <component :is="labelRenderContent" v-if="labelRenderContent"></component>
+      <Renderer v-else :config="slotsPageMetalist" v-model="props.refValue.value"></Renderer>
+    </template>
+    <ElRow>
+      <Renderer :config="(props.config.pmPageMetaList || []).filter(config => !config.collapseSlot)" v-model="props.refValue.value"></Renderer>
+    </ElRow>
+    <template v-for="(_, key) in slots" :key="key" v-slot:[key]="scope">
+      <slot :name="key" v-bind="scope"></slot>
+    </template>
+  </TabPane>
+</template>
+<script setup>
+import { ElTabPane, ElRow } from 'element-plus'
+import Renderer from '../../renderer.jsx'
+import { computed, inject, useAttrs, useSlots } from 'vue'
+import { commonPropsType } from '../../utils/index.js'
+import { TabPane } from '../tabs'
+import { h } from 'vue'
+
+const slots = useSlots()
+const props = defineProps({
+  ...commonPropsType,
+  ...TabPane.props,
+  hidden: [String, Boolean, Number],
+  activeNames: String,
+})
+const attrs = useAttrs()
+
+const slotsPageMetalist = computed(() => {
+  return (props.config.pmPageMetaList || []).filter(config => config.collapseSlot)
+})
+
+const lang = inject('lang')
+const polyProps = computed(() => {
+  return {
+    label: lang.value.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
+    name: props.config?.metaCode
+  }
+})
+const tabPaneProps = computed(() => {
+  const ret = Object.keys(TabPane.props).reduce((ret, key) => {
+    ret[key] = props[key]
+    return ret
+  }, {})
+  if (typeof ret.hidden !== 'boolean') {
+    ret.hidden = ret.hidden == '1'
+  }
+  return ret
+})
+
+// 自定义渲染label方法
+const labelRenderContent = computed(() => {
+  const context = props.config?.labelRender?.(getLableRenderParams())
+  if (typeof context === 'string') {
+    return h('span', context)
+  } else {
+    return context
+  }
+})
+function getLableRenderParams() {
+  return {
+    config: props.config,
+    tabPaneData: props.refValue.value,
+    isActive: props.activeNames === props.config?.metaCode,
+  }
+}
+</script>

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

@@ -1,70 +1,20 @@
 <template>
-  <TabPane v-bind="{...attrs, ...tabPaneProps, ...polyProps}">
-    <template #label v-if="labelRenderContent || slotsPageMetalist.length">
-      <component :is="labelRenderContent" v-if="labelRenderContent"></component>
-      <Renderer v-else :config="slotsPageMetalist" v-model="props.refValue.value"></Renderer>
-    </template>
-    <ElRow>
-      <Renderer :config="(props.config.pmPageMetaList || []).filter(config => !config.collapseSlot)" v-model="props.refValue.value"></Renderer>
-    </ElRow>
-    <template v-for="(_, key) in slots" :key="key" v-slot:[key]="scope">
-      <slot :name="key" v-bind="scope"></slot>
-    </template>
-  </TabPane>
+  <component :is="comp" v-bind="attrs"></component>
 </template>
 <script setup>
-import { ElTabPane, ElRow } from 'element-plus'
-import Renderer from '../../renderer.jsx'
-import { computed, inject, useAttrs, useSlots } from 'vue'
-import { commonPropsType } from '../../utils/index.js'
-import { TabPane } from '../tabs'
-import { h } from 'vue'
+import { useAttrs } from 'vue'
+import CustomComponentCycleTabPane from './CustomComponentCycleTabPane.vue'
+import CustomComponentNativeTabPane from './CustomComponentNativeTabPane.vue'
+import { computed } from 'vue'
 
-const slots = useSlots()
-const props = defineProps({
-  ...commonPropsType,
-  ...TabPane.props,
-  hidden: [String, Boolean, Number],
-  activeNames: String,
-})
 const attrs = useAttrs()
-
-const slotsPageMetalist = computed(() => {
-  return (props.config.pmPageMetaList || []).filter(config => config.collapseSlot)
-})
-
-const lang = inject('lang')
-const polyProps = computed(() => {
-  return {
-    label: lang.value.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
-    name: props.config?.metaCode
-  }
-})
-const tabPaneProps = computed(() => {
-  const ret = Object.keys(TabPane.props).reduce((ret, key) => {
-    ret[key] = props[key]
-    return ret
-  }, {})
-  if (typeof ret.hidden !== 'boolean') {
-    ret.hidden = ret.hidden == '1'
+const props = defineProps({
+  isCycle: {
+    type: [String, Number],
+    default: '0'
   }
-  return ret
 })
-
-// 自定义渲染label方法
-const labelRenderContent = computed(() => {
-  const context = props.config?.labelRender?.(getLableRenderParams())
-  if (typeof context === 'string') {
-    return h('span', context)
-  } else {
-    return context
-  }
+const comp = computed(() => {
+  return props.isCycle == '1' ? CustomComponentCycleTabPane : CustomComponentNativeTabPane
 })
-function getLableRenderParams() {
-  return {
-    config: props.config,
-    tabPaneData: props.refValue.value,
-    isActive: props.activeNames === props.config?.metaCode,
-  }
-}
 </script>

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

@@ -41,13 +41,23 @@ const activeNames = computed({
   get() {
     const currentTab = tabpanes.value.find(tab => tab.defaultShowFlag == '1')
     const currentCycleTab = tabpanes.value.find(tab => tab.currentCode)
-    return (currentTab && currentTab.metaCode)
-      || (currentCycleTab && currentCycleTab.currentCode)
-      || tabpanes.value[0] && ((assertMetaType(tabpanes.value[0], 'CustomComponentCycleTabPane') && `${tabpanes.value[0].metaCode}-0`) || (tabpanes.value[0].metaType === 'CustomComponentTabPane' && tabpanes.value[0].metaCode))
+    if (currentTab) {
+      return currentTab?.isCycle == '1' ? `${currentTab.metaCode}-0` : currentTab.metaCode
+    }
+    if (currentCycleTab) {
+      return currentCycleTab.currentCode
+    }
+    if (tabpanes.value[0]) {
+      if (assertMetaType(tabpanes.value[0], 'CustomComponentCycleTabPane') || tabpanes.value[0]?.isCycle == '1') {
+        return `${tabpanes.value[0].metaCode}-0`
+      } else {
+        return tabpanes.value[0].metaCode
+      }
+    }
   },
   set(val) {
     tabpanes.value.forEach(tab => {
-      if (assertMetaType(tab, 'CustomComponentCycleTabPane')) {
+      if (assertMetaType(tab, 'CustomComponentCycleTabPane') || tab?.isCycle == '1') {
         if (/^cycleTabpane-(\d+)$/.test(val)) {
           tab.currentCode = val
         } else {

package/src/rules/ruleUtils.js

@@ -47,7 +47,7 @@ export function setFormVal(pathStr, val) {
   configs.forEach(cg => {
     if (hasOwn(cg, 'refValue')) {
       if (cg.metaType === 'ElSelect') {
-        val = formatSelectVal({config, val: val})
+        val = formatSelectVal({config: cg, val: val, isActive: true})
       }
       cg.refValue = val
     } else {

package/src/utils/defaultVal.js

@@ -43,10 +43,11 @@ export default function defaultVal(config) {
 
 export function formatSelectVal({
   config,
-  val
+  val,
+  isActive = false
 }) {
   let retValue = val
-  if (!isHidden({config})) {
+  if (!isHidden({config}) || isActive) {
     const valueType = config?.valueType
     const separator = config?.separator
     if (valueType == VALUE_TYPES.STRING) {
@@ -61,10 +62,10 @@ export function formatSelectVal({
       if ((val && isString(val)) || isNumber(val)) {
         retValue = `${val}`?.split(separator)
         if (valueType == VALUE_TYPES.OBJECT) {
-          retValue = val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {})
+          retValue = retValue?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {})
         }
       }
     }
   }
-  return val
+  return retValue
 }

package/src/utils/valid.js

@@ -67,14 +67,14 @@ function validFail(config, cycleIdx) {
         if (tab.metaType === 'CustomComponentTabPane') {
           tab.defaultShowFlag = '0'
         }
-        if (tab.metaType === 'CustomComponentCycleTabPane') {
+        if (tab.metaType === 'CustomComponentCycleTabPane' || tab?.isCycle == '1') {
           tab.currentCode = ''
         }
       })
-      if (type === 'CustomComponentTabPane') {
+      if (type === 'CustomComponentTabPane' && config?.isCycle != '1') {
         config.defaultShowFlag = '1'
       }
-      if (type === 'CustomComponentCycleTabPane') {
+      if (type === 'CustomComponentCycleTabPane' || config?.isCycle == '1') {
         config.currentCode = `${config.metaCode}-${cycleIdx}`
       }
       break