lw-cdp-ui 1.2.43 → 1.2.45

package/dist/components/lwFlow/index.vue

@@ -21,9 +21,22 @@
                 :drawerShow="drawerShow"
                 :nodeData="clickNode"
                 :nodesDataConfig="nodesDataConfig"
-                @onClose="nodeEditClose" />
+                :soltList="soltList"
+                @onClose="nodeEditClose">
+        <template v-slot:[soltName]="{itemCur, formCur}"
+                  v-for="soltName in soltList">
+          <slot :name="soltName"
+                :itemCur="itemCur"
+                :formCur="formCur">
+            <el-tag type="danger">[{{ soltName }}]
+              没有这个默认组件也未自定义插槽内容</el-tag>
+          </slot>
+        </template>
+        <template #mySolt>
+          sssssssssssssssss
+        </template>
+      </nodeEdit>
     </template>
-
   </div>
 </template>
 
@@ -83,41 +96,31 @@ export default {
         return {}
       }
     },
-    /**
-     * 节点数据 在没有 modelValue时 用以自动创建节点  默认使用modelValue
-     */
+    // 节点数据 在没有 modelValue时 用以自动创建节点  默认使用modelValue
     nodes: {
       type: Array,
       default: () => {
         return []
       }
     },
-    /**
-     * 节点配置
-     */
-    // configNodesList: {
-    //   type: Object,
-    //   default: () => {
-    //     return configNodesList
-    //   }
-    // },
-    /**
-     * 是否显示默认节点
-     */
+    // 节点插槽列表
+    soltList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    // 是否显示默认节点
     showDefaultNode: {
       type: Boolean,
       default: true
     },
-    /**
-     * 是否仅查看
-     */
+    // 是否仅查看
     isView: {
       type: Boolean,
       default: false
     },
-    /**
-     * 需要展示的节点分组 不传默认展示所有内置节点
-     */
+    // 需要展示的节点分组 不传默认展示所有内置节点
     showNodeGroup: {
       type: Array,
       default: []
@@ -138,7 +141,7 @@ export default {
           }
         }
      */
-     nodesDataConfig: {
+    nodesDataConfig: {
       type: Object,
       default: {}
     },
@@ -559,7 +562,7 @@ export default {
       this.logicFlow.setProperties(data.id, {
         error: false
       });
-      
+
       this.clickNode = data
       this.drawerShow = true
 
@@ -577,7 +580,7 @@ export default {
         let { formConfig } = nodeDatas[node.type];
         let { formItems } = formConfig;
         let { data } = node.properties;
-        
+
         if (formItems?.length > 0) {
           for (const item of formItems) {
             let value = data ? data[item?.name] : data;

package/dist/components/lwFlow/nodeEdit/basicSettings.vue

@@ -35,6 +35,13 @@
       </lwTableForm>
     </template>
 
+    <template v-slot:[soltName]="{itemCur, formCur}"
+              v-for="soltName in soltList">
+      <slot :name="soltName"
+            :itemCur="itemCur"
+            :formCur="formCur"></slot>
+    </template>
+
     <span></span>
   </lw-form-mini>
 </template>
@@ -52,6 +59,7 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    soltList: { type: Array, default: () => { return [] } },
   },
   data() {
     return {

package/dist/components/lwFlow/nodeEdit/index.vue

@@ -36,7 +36,16 @@
           <template v-else>
             <basicSettings ref="dataFormRef"
                            v-model="dataForm.properties.data"
-                           :config="config" />
+                           :soltList="soltList"
+                           :config="config">
+              <template v-slot:[soltName]="{itemCur, formCur}"
+                        v-for="soltName in soltList">
+                <slot :name="soltName"
+                      :itemCur="itemCur"
+                      :formCur="formCur"></slot>
+              </template>
+
+            </basicSettings>
           </template>
 
         </el-collapse-item>
@@ -52,6 +61,7 @@
         </el-collapse-item>
       </el-collapse>
     </div>
+
     <template #footer>
       <el-button @click="close">取 消</el-button>
       <el-button type="primary"
@@ -85,7 +95,8 @@ export default {
       type: Object,
       default: () => { }
     },
-    drawerShow: { type: Boolean, default: false }
+    drawerShow: { type: Boolean, default: false },
+    soltList: { type: Array, default: () => { return [] } },
   },
   watch: {
     drawerShow: {
@@ -223,6 +234,7 @@ export default {
 
       // 取出对应节点的表单配置
       let nodeConfig = nodeDatasMerge[this.nodeData.type]?.formConfig || {};
+
       // 深拷贝，避免直接修改全局配置
       nodeConfig = JSON.parse(JSON.stringify(nodeConfig));
 

package/dist/components/lwFlow/nodeEdit/styleSettings.vue

@@ -1,7 +1,7 @@
 <template>
   <lw-form-mini ref="dataFormRef"
-           :config="config"
-           v-model="dataForm">
+                :config="config"
+                v-model="dataForm">
     <template #fontStyle>
       <el-button size="small"
                  :type="dataForm.fontWeight  === 'bold'? 'primary' : ''"
@@ -68,7 +68,7 @@ export default {
       return {
         labelWidth: '70px',
         labelPosition: 'right',
-        size: 'medium',
+        size: 'default',
         formItems: [
           {
             label: '背景色',

package/dist/components/lwFlow/nodesData/datas/base.js

@@ -3,6 +3,60 @@
  */
 
 export default {
+	// 表单内容
+	formConfig: {
+		labelWidth: '70px',
+		labelPosition: 'top',
+		formItems: [
+			{
+				label: '节点名称',
+				name: 'name',
+				value: '',
+				component: 'input',
+				options: {
+					placeholder: '请输入节点名称'
+				},
+				span: 24
+			},
+			{
+				label: '节点并行度',
+				name: 'para',
+				value: '',
+				component: 'number',
+				options: {
+					placeholder: '请输入节点并行度'
+				},
+				span: 24
+			},
+			{
+				label: '节点标签',
+				name: 'tags',
+				value: '',
+				component: 'tags',
+				span: 24
+			},
+			{
+				label: '描述信息',
+				name: 'desp',
+				value: '',
+				component: 'input',
+				options: {
+					placeholder: '请输入描述信息'
+				},
+				span: 24
+			},
+			{
+				label: '输出名称',
+				name: 'into',
+				value: '',
+				component: 'select',
+				options: {
+					placeholder: '请选择输出名称'
+				},
+				span: 24
+			}
+		]
+	},
 	// 数据来源
 	configKeyableSource: {
 		treeProps: {
@@ -66,14 +120,13 @@ export default {
 			}
 		]
 	},
-  // 映射动作
+	// 映射动作
 	configMapAction: {
 		treeProps: {
 			children: 'fields'
 		},
 		rowKey: 'id',
 		formItems: [
-
 			{
 				label: '来源字段',
 				name: 'from',

package/dist/components/lwFlow/nodesData/datas/joiner.js

@@ -23,6 +23,23 @@ export default {
 				span: 24,
 				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
 			},
+      {
+				label: '节点并行度',
+				name: 'para',
+				value: '',
+				component: 'number',
+				options: {
+					placeholder: '请输入节点并行度'
+				},
+				span: 24
+			},
+			{
+				label: '节点标签',
+				name: 'tags',
+				value: '',
+				component: 'tags',
+				span: 24
+			},
 			{
 				label: '连接模式',
 				name: 'mode',

package/dist/components/lwFlow/nodesData/datas/source.js

@@ -26,7 +26,7 @@ export default {
 		labelWidth: '70px',
 		labelPosition: 'top',
 		formItems: [
-			{
+      {
 				label: '节点名称',
 				name: 'name',
 				value: '',
@@ -34,8 +34,24 @@ export default {
 				options: {
 					placeholder: '请输入节点名称'
 				},
-				span: 24,
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
+				span: 24
+			},
+			{
+				label: '节点并行度',
+				name: 'para',
+				value: '',
+				component: 'number',
+				options: {
+					placeholder: '请输入节点并行度'
+				},
+				span: 24
+			},
+			{
+				label: '节点标签',
+				name: 'tags',
+				value: '',
+				component: 'tags',
+				span: 24
 			},
 			{
 				label: '运行模式',
@@ -64,65 +80,6 @@ export default {
 					]
 				}
 			},
-			{
-				label: '数据表名',
-				name: 'from',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入数据表名'
-				},
-				tips: '非SQL模式必须填写',
-				span: 24,
-				hideHandle: '$.mode == "sql"',
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
-			},
-			{
-				label: '数据表名',
-				name: 'from',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入数据表名'
-				},
-				tips: '非SQL模式必须填写',
-				span: 24,
-				hideHandle: '$.mode != "sql"'
-			},
-			{
-				label: '所需字段',
-				name: 'cols',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入所需字段'
-				},
-				tips: '多个字段采用逗号分隔，为空时选取所有字段，支持AS关键字。',
-				span: 24
-			},
-			{
-				label: '关联字段',
-				name: 'with',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入关联字段'
-				},
-				span: 24,
-				hideHandle: '$.mode != "expand" && $.mode != "collap"',
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
-			},
-			{
-				label: '关联字段',
-				name: 'with',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入关联字段'
-				},
-				span: 24,
-				hideHandle: '$.mode == "expand" || $.mode == "collap"'
-			},
 			{
 				label: '折叠排序方式',
 				name: 'sort',
@@ -157,24 +114,26 @@ export default {
 				span: 24
 			},
 			{
-				label: '输出名称',
-				name: 'into',
+				label: '数据表名来源',
+				name: 'fromNameSource',
 				value: '',
-				component: 'input',
+				component: 'select',
 				options: {
-					placeholder: '请输入输出名称'
+					placeholder: '请输选择数据表名来源',
+					items:[
+						{value:'hive',label:'hive'},
+						{value:'lake',label:'lake'},
+					]
 				},
 				span: 24,
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
 			},
-			{
-				label: '描述信息',
-				name: 'desp',
+      {
+				label: '输出名称',
+				name: 'into',
 				value: '',
-				component: 'input',
+				component: 'select',
 				options: {
-					type: 'textarea',
-					placeholder: '请输入'
+					placeholder: '请选择输出名称'
 				},
 				span: 24
 			}

package/dist/components/lwFlow/nodesData/datas/target.js

@@ -36,6 +36,23 @@ export default {
 				span: 24,
 				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
 			},
+      {
+				label: '节点并行度',
+				name: 'para',
+				value: '',
+				component: 'number',
+				options: {
+					placeholder: '请输入节点并行度'
+				},
+				span: 24
+			},
+			{
+				label: '节点标签',
+				name: 'tags',
+				value: '',
+				component: 'tags',
+				span: 24
+			},
 			{
 				label: '数据来源',
 				name: 'from',
@@ -57,7 +74,6 @@ export default {
 					items:[]
 				},
 				value: 'id',
-				label:'name',
 				span: 24,
 				isItemsFromProps: true,
 				

package/dist/components/lwFormMini/FormItem.vue

@@ -285,6 +285,11 @@ export default {
         } else {
           this.unflattenObject(this.form, val.name, val.value)
         }
+
+        // 发布 这个数据
+        if (val?.name) {
+          this.$bus.$emit(`lwFormMini-${val.name}`, val)
+        }
       },
       deep: true
     },

package/dist/components/lwFormMini/index.vue

@@ -25,7 +25,7 @@
            :label-width="config.labelWidth"
            :label-position="$i18n.locale == 'en-us' ? 'top' : config.labelPosition"
            v-loading="loading"
-           :size="config.size"
+           :size="config?.size || 'default'"
            element-loading-text="Loading...">
     <el-row :gutter="15">
 

package/dist/components/lwLayout/components/tags.vue

@@ -291,6 +291,7 @@ export default {
     //横向滚动
     scrollInit() {
       const scrollDiv = document.querySelector('.context-menu-list')
+      if (!scrollDiv) { return false }
       scrollDiv.addEventListener('mousewheel', handler, false) || scrollDiv.addEventListener("DOMMouseScroll", handler, false)
       function handler(event) {
         const detail = event.wheelDelta || event.detail;

package/dist/components/lwUpload/index.vue

@@ -364,6 +364,7 @@ export default {
       for (const key in param.data) {
         data.append(key, param.data[key]);
       }
+      console.log(apiObj)
       apiObj(data, {
         onUploadProgress: e => {
           this.file.percentage = parseInt(((e.loaded / e.total) * 100) | 0, 10)