lw-cdp-ui 1.2.30 → 1.2.32

package/dist/components/lwFlow/config/dagre.js

@@ -157,22 +157,22 @@ export default class Dagre {
 			// 根据源节点和目标节点的位置计算路径点
 			if (newSourceNodeData.x < newTargetNodeData.x) {
 				pointsList.push({
-					x: newSourceNodeData.x + sourceNodeModel.width / 2 + 5,
-					y: newSourceNodeData.y + 5
-				})
+          x: newSourceNodeData.x + sourceNodeModel.width / 2,
+          y: newSourceNodeData.y,
+        });
 				pointsList.push({
 					x: newSourceNodeData.x + sourceNodeModel.width / 2 + (model.offset || 50),
-					y: newSourceNodeData.y + 5
-				})
+          y: newSourceNodeData.y,
+        });
 				pointsList.push({
 					x: newSourceNodeData.x + sourceNodeModel.width / 2 + (model.offset || 50),
-					y: newTargetNodeData.y + 5
-				})
+          y: newTargetNodeData.y,
+        });
 				pointsList.push({
-					x: newTargetNodeData.x - targetNodeModel.width / 2 + 5,
-					y: newTargetNodeData.y + 5
-				})
-				return this.pointFilter(pointsList)
+          x: newTargetNodeData.x - targetNodeModel.width / 2,
+          y: newTargetNodeData.y,
+        });
+        return this.pointFilter(pointsList);
 			}
 			if (newSourceNodeData.x > newTargetNodeData.x) {
 				if (newSourceNodeData.y >= newTargetNodeData.y) {

package/dist/components/lwFlow/index.vue

@@ -283,7 +283,7 @@ export default {
       })
       this.initMenu()
       await this.initNode()
-      if (this.modelValue && this.modelValue?.nodes.length > 0) {
+      if (this.modelValue && this.modelValue?.nodes?.length > 0) {
         this.logicFlow.render(this.modelValue)
       } else {
         // 根据节点数据初始化节点

package/dist/components/lwFormMini/ViewItem.vue

@@ -101,7 +101,12 @@
     </template>
     <!-- date -->
     <template v-else-if="item.component == 'date'">
-      {{ dayjs(objItem.value).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') }}
+      <template v-if="typeof objItem.value == 'string'">
+        {{ dayjs(objItem.value).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') }}
+      </template>
+      <template v-if="typeof objItem.value == 'object'">
+        {{ objItem.value.length > 0 ? dayjs(objItem.value[0]).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') + ' - ' + dayjs(objItem.value[1]).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') : '--' }}
+      </template>
     </template>
     <!-- number -->
     <template v-else-if="item.component == 'number'">
@@ -282,7 +287,7 @@ export default {
     // key to label
     getKeyToLabel(val, items = []) {
       let item = items.find(item => { return item.value == val })
-      return item?.label || '--'
+      return item?.label || val || '--'
     },
     dayjs: dayjs
   }

package/dist/components/lwFormMini/index.vue

@@ -21,6 +21,7 @@
   <el-form v-else
            ref="form"
            :model="form"
+           :disabled="isView"
            :label-width="config.labelWidth"
            :label-position="$i18n.locale == 'en-us' ? 'top' : config.labelPosition"
            v-loading="loading"

package/dist/components/lwFormMini/textToPassword.vue

@@ -2,7 +2,7 @@
   <span class="item-text"
         :style="{width: textWidth}">
     <!-- 根据加密状态显示加密或解密后的文本 -->
-    <span>{{ isEncrypted ? encryptedText : modelValue }}</span>
+    <span>{{ isEncrypted ? encryptedText : (modelValue || '--') }}</span>
     <!-- 切换加密/解密按钮 -->
     <el-icon v-if="password"
              class="primary"