t20-common-lib 0.15.31 → 0.15.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.15.31",
+  "version": "0.15.33",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/dynamic-form/src/components/unitTreeSelect.vue

@@ -40,10 +40,6 @@ export default {
       type: [Boolean, Array, Number],
       defalut: false,
     },
-    multiple:{
-      type:Boolean,
-      default:false
-    },
     items: {
       type: Object,
       defalut: () => {
@@ -63,22 +59,15 @@ export default {
       handler(value,oldV){
         if(JSON.stringify(value)!==JSON.stringify(oldV)){
           if(!value) return this.upDateValue=[];
-          if(!this.multiple){  
-              this.upDateValue=[{
+          this.upDateValue=[
+            {
               unitNo:this.value,
               unitName:this.label
-            }];
-          }else{
-            this.upDateValue=value.map((item,index)=>{
-              return {
-                unitNo:item,
-                unitName:this.label?.split(',')?.[index]
-              }
-            })
-          }
+            }
+          ];
           this.$nextTick(()=>{
-              this.$refs?.unitRef?.upDateShowValue()
-            })
+            this.$refs?.unitRef?.upDateShowValue()
+          })
         }
       },
       immediate:true
@@ -90,7 +79,7 @@ export default {
         return this.value;
       },
       set(value) {
-        if(Array.isArray(value) && !this.multiple){
+        if(Array.isArray(value)){
           this.$emit("input", value[0]);
         }else{
           this.$emit("input", value)
@@ -99,24 +88,16 @@ export default {
     },
   },
   methods: {
-    dataChange(item) {
+    dataChange(item, type) {
       //item一直是数组
       if (Array.isArray(item) && item.length) {
-        if (this.multiple) {
-          this.$emit(`update:label`, item.map((list)=>list.unitName).join(','));
-          this.$emit("change", item);
-        } else {
-          this.$emit(`update:label`, item[0].unitName);
-          this.$emit("change", item);
-        }
+        this.$emit(`update:label`, item[0].unitName);
+        this.$emit("change", item[0].unitNo, item, type);
       } else {
         this.$emit(`update:label`, "");
-        this.$emit("change", []);
+        this.$emit("change", null, [], type);
       }
     },
   },
 };
-</script>
-
-<style>
-</style>
+</script>

package/packages/dynamic-form/src/main.vue

@@ -36,13 +36,14 @@
               :label.sync="formData[group.prop][item.nameProp]"
               v-bind="item.props"
               @change="
-                (val, option) =>
+                (val, option, ...args) =>
                   $emit('change', {
                     val,
                     option,
                     groupProp: group.prop,
                     item,
                     group,
+                    args
                   })
               "
               @dialogChange="

package/packages/dynamic-form-detail/src/main.vue

@@ -8,24 +8,25 @@
     >
       <template v-if="group.unitType === 'FORM' || group.unitType === 'UNIT_FORM'">
         <N20-descriptions>
-          <el-descriptions-item
-            v-for="item in group.elements"
-            :key="`${group.prop}.${item.prop}.${item.elementType}`"
-            :label="item.label"
-            v-show="item.isShow !== 0"
-          >
-            <template v-if="item.elementType === 'SLOT_ELEMENT'">
-              <slot
-                :name="item.prop"
-                :form-data="formData"
-                :group-prop="group.prop"
-                :prop="item.prop"
-                :element-item="item"
-                :value="rowValue(group.prop, item.prop)"
-              />
-            </template>
-            <span v-else class="dynamic-form-detail__text">{{ displayText(group.prop, item) }}</span>
-          </el-descriptions-item>
+          <template v-for="item in group.elements">
+            <el-descriptions-item
+              v-if="item.isShow !== 0"
+              :key="`${group.prop}.${item.prop}.${item.elementType}`"
+              :label="item.label"
+            >
+              <template v-if="item.elementType === 'SLOT_ELEMENT'">
+                <slot
+                  :name="item.prop"
+                  :form-data="formData"
+                  :group-prop="group.prop"
+                  :prop="item.prop"
+                  :element-item="item"
+                  :value="rowValue(group.prop, item.prop)"
+                />
+              </template>
+              <span v-else class="dynamic-form-detail__text">{{ displayText(group.prop, item) }}</span>
+            </el-descriptions-item>
+          </template>
         </N20-descriptions>
       </template>
     </N20-expandable-pane>