cloud-web-corejs 1.0.54-dev.253 → 1.0.54-dev.255

package/src/components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue

@@ -128,7 +128,7 @@ export default {
       let queryParam = this.$baseLodash.cloneDeep(this.dialogParam);
       let murl = queryParam.urlmobile;
       let purl = murl && isMobile ? murl : queryParam.url;
-      let dataId = queryParam.dataId;
+      let dataId = queryParam.dataId??null;
       if (purl == '/index') {
         location.hash = '/home';
         location.reload();

package/src/components/xform/form-designer/form-widget/field-widget/status-widget.vue

@@ -3,8 +3,12 @@
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
-    <status-tag ref="statusTag" :statusType="field.options.statusType" :param="statusParam"
-                :value="fieldModel"></status-tag>
+    <template v-for="(item,index) in field.options.statusParam">
+      <span
+        v-if="fieldModel===item.value"
+        :key="index" class="list-tag"
+        :class="item.type">{{ getI18nLabel(item.label) }}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -56,7 +60,8 @@ export default {
       fieldModel: null,
       rules: [],
       isH5: false,
-      option: {}
+      option: {},
+      statusParam: [],
     }
   },
   watch: {
@@ -64,16 +69,6 @@ export default {
       this.handleChangeEvent(val);
     }
   },
-  computed: {
-    statusParam() {
-      return this.field.options.statusParam ? this.field.options.statusParam.map(item => {
-        return {
-          ...item,
-          label: this.getI18nLabel(item.label)
-        }
-      }) : [];
-    }
-  },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },
@@ -90,6 +85,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
+    // this.initStatusParam();
   },
 
   mounted() {
@@ -114,12 +110,17 @@ export default {
     },
     refreshWidget() {
       this.initStatusForDesign();
-      this.$refs.statusTag.init();
+      // this.$refs.statusTag.init();
     },
-    getFieldModelLabel(){
-      return this.$refs.statusTag.getShowLabel();
+    getFieldModelLabel() {
+      let label = null;
+      let fieldModel = this.fieldModel;
+      let item = this.field.options.statusParam.find(item => item.value === fieldModel)
+      if (item) {
+        label = this.getI18nLabel(item.label);
+      }
+      return label;
     }
-
   }
 }
 </script>

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -2,8 +2,9 @@
   <vxe-grid :ref="widget.id" v-bind="vxeOption" :auto-resize="true" v-show="!widget.options.hidden"
             @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"
             @checkbox-change="handleCheckboxChange" @checkbox-all="handleCheckboxAll"
-            @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel"
-            >
+            @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class"
+            :data="fieldModel"
+  >
     <template #form>
       <!--            <div v-if="widget.options.showSearchArea" class="clearfix screen-btns">
                     <div class="fl">
@@ -186,43 +187,56 @@
       <treeMoveDialog v-if="showTreeMoveDialog" :visiable.sync="showTreeMoveDialog" :rows.sync="sortRows"
                       :parent-target="_self" @confirm="confirmTreeMoveDialog"></treeMoveDialog>
     </template>
-<!--    <template v-for="fieldWidget in widgets" v-slot:[fieldWidget.id]="obj">
-      <component
-        :is="getColumnWidgetName(fieldWidget)"
-        :field="fieldWidget"
-        :form-model="globalModel.formModel"
-        :designer="null"
-        :key="fieldWidget.id+'-'+obj.rowIndex"
-        :parent-widget="widget"
-        :columnConfig="obj.column.params.columnConfig"
-        :subFormRowIndex="obj.rowIndex"
-        :formItemProp="getColumnProp(widget,obj)"
-        :tableParam="obj"
-      >
-        <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-          <slot :name="slot" v-bind="scope"/>
-        </template>
-      </component>
-    </template>-->
+    <!--    <template v-for="fieldWidget in widgets" v-slot:[fieldWidget.id]="obj">
+          <component
+            :is="getColumnWidgetName(fieldWidget)"
+            :field="fieldWidget"
+            :form-model="globalModel.formModel"
+            :designer="null"
+            :key="fieldWidget.id+'-'+obj.rowIndex"
+            :parent-widget="widget"
+            :columnConfig="obj.column.params.columnConfig"
+            :subFormRowIndex="obj.rowIndex"
+            :formItemProp="getColumnProp(widget,obj)"
+            :tableParam="obj"
+          >
+            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+              <slot :name="slot" v-bind="scope"/>
+            </template>
+          </component>
+        </template>-->
     <template #widget="obj">
-      <component
-        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
-        :is="getColumnWidgetName(obj.column.params.widget)"
-        :field="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]"
-        :form-model="globalModel.formModel"
-        :designer="null"
-        :key="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id"
-        :parent-widget="widget"
-        :columnConfig="obj.column.params.columnConfig"
-        :subFormRowIndex="obj.rowIndex"
-        :formItemProp="getColumnProp(widget,obj)"
-        :subFormRowId="obj.row._X_ROW_KEY"
-        :tableParam="obj"
-      >
-        <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-          <slot :name="slot" v-bind="scope"/>
+      <template
+        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY] && fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]">
+        <template v-if="obj.column.params.widget.type == 'status'">
+          <template
+            v-for="(item,index) in fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].options.statusParam">
+            <span
+              v-if="obj.row[getFieldKeyName(fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id])]===item.value"
+              :key="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id+'-'+index" class="list-tag"
+              :class="item.type">{{ getI18nLabel(item.label) }}</span>
+          </template>
         </template>
-      </component>
+        <component
+          v-else
+          :is="getColumnWidgetName(obj.column.params.widget)"
+          :field="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]"
+          :form-model="globalModel.formModel"
+          :designer="null"
+          :key="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id"
+          :parent-widget="widget"
+          :columnConfig="obj.column.params.columnConfig"
+          :subFormRowIndex="obj.rowIndex"
+          :formItemProp="getColumnProp(widget,obj)"
+          :subFormRowId="obj.row._X_ROW_KEY"
+          :tableParam="obj"
+        >
+          <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+            <slot :name="slot" v-bind="scope"/>
+          </template>
+        </component>
+      </template>
+
     </template>
     <template #widgetList="obj">
       <div>