cloud-web-corejs 1.0.75 → 1.0.77

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

@@ -10,19 +10,13 @@
         :key="index"
         type="warning"
         :disable-transitions="false"
-        :closable="!field.options.disabled && field.options.closable"
-        @close="fieldModel.splice(index,1)"
+        :closable="!field.options.disabled && field.options.tabDeleteEnabled"
+        @close="deleteCallback(index)"
       >
-        {{ tag[field.options.tagFieldKey] }}
+        {{ tag[field.options.tagLabelField] }}
       </el-tag>
       <el-button icon="el-icon-plus" type="warning" class="el-button-tag" @click="openProjectTagDialog"
                  v-if="!field.options.disabled"></el-button>
-      <projectTagDialog v-if="showProjectTagDialog"
-                        :visiable.sync="showProjectTagDialog"
-                        @confirm="confirmProjectTagDialog"
-                        :multi="true"
-                        :rows="checkRows"
-                        fieldKey="tagCode"></projectTagDialog>
     </div>
 
   </form-item-wrapper>
@@ -33,8 +27,6 @@ import FormItemWrapper from './form-item-wrapper'
 import emitter from '../../../../../components/xform/utils/emitter'
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-import projectTagView from "../../../../../components/projectTag/view.vue";
-import projectTagDialog from "@base/views/user/project_tag/dialog.vue";
 
 export default {
   name: "project-tag-widget",
@@ -66,7 +58,6 @@ export default {
     }
   },
   components: {
-    projectTagDialog,
     FormItemWrapper,
   },
   inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
@@ -145,8 +136,57 @@ export default {
       });
 
     },
-    openProjectTagDialog(){
-
+    openProjectTagDialog() {
+      if (this.field.options.onClick) {
+        this.handleCustomEvent(this.field.options.onClick);
+        return
+      }
+      let formCode = this.field.options.tagFormCode;
+      let tagLabelField = this.field.options.tagLabelField;
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let tagFormLabelField = this.field.options.tagFormLabelField;
+      let tagFormUniqueField = this.field.options.tagFormUniqueField;
+      /*let checkRows = this.fieldModel.map(item => {
+        return {
+          [tagFormUniqueField]: item[tagUniqueField] ?? null,
+          [tagFormLabelField]: item[tagLabelField] ?? null,
+        }
+      })*/
+      let tagFormParam = this.handleCustomEvent(this.field.options.tagFormParam)
+      this.getFormRef().openSearchDialog({
+        formCode,
+        param: tagFormParam,
+        // rows: checkRows,
+        multiple: true,
+        confirm: (rows) => {
+          if (!this.field.options.tagConfirmCallback) {
+            let tagFillConfig = this.field.options.tagFillConfig || [];
+            let items = rows.map(item => {
+              let newData = {
+                [tagUniqueField]: item[tagFormUniqueField],
+                [tagLabelField]: item[tagFormLabelField],
+              }
+              tagFillConfig.forEach(item1 => {
+                newData[item1.targetField] = item[item1.sourceField]
+              })
+              return newData
+            });
+            this.addTagData(items);
+          } else {
+            this.handleCustomEvent(this.field.options.tagConfirmCallback, ['rows'], [rows])
+          }
+        }
+      });
+    },
+    addTagData(rows) {
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let keys = this.fieldModel.map(item => item[tagUniqueField]);
+      let items = rows.filter(item => !keys.includes(item[tagUniqueField]))
+      this.fieldModel.push(...items);
+    },
+    deleteCallback(index) {
+      this.fieldModel.splice(index, 1)
+      this.handleCustomEvent(this.field.options.tagDeleteCallback)
     }
   }
 }

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

@@ -11,9 +11,9 @@
                          :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio-button>
       </template>
       <template v-else>
-        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item[valueField]"
                   :disabled="item.disabled" :border="field.options.border"
-                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio>
+                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
     </el-radio-group>
   </form-item-wrapper>
@@ -67,7 +67,12 @@
       }
     },
     computed: {
-
+      labelField(){
+        return this.field.options.labelKey || "label";
+      },
+      valueField(){
+        return this.field.options.valueKey || "value";
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +83,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItems()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -18,8 +18,8 @@
                @change="handleChangeEvent"
                :style="'width:'+field.options.widgetWidth+' !important;'"
                :class="{'custom-width':field.options.widgetWidth!=null}">
-      <el-option v-for="item in field.options.optionItems" :key="item.value" :label="getI18nLabel(item.label)"
-                 :value="item.value" :disabled="item.disabled">
+      <el-option v-for="item in field.options.optionItems" :key="item[valueField]" :label="getI18nLabel(item[labelField])"
+                 :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>
     <span v-else>{{ fieldModelLabel }}</span>
@@ -73,6 +73,12 @@ export default {
     }
   },
   computed: {
+    labelField(){
+      return this.field.options.labelKey || "label";
+    },
+    valueField(){
+      return this.field.options.valueKey || "value";
+    },
     allowDefaultFirstOption() {
       return (!!this.field.options.filterable && !!this.field.options.allowCreate)
     },

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

@@ -57,8 +57,8 @@
     inject: ['refList', 'globalOptionData', 'globalModel'],
     data() {
       return {
-        oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
+        oldFieldValue: [], //field组件change之前的值
+        fieldModel: [],
         rules: [],
       }
     },

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

@@ -141,6 +141,7 @@ export default {
           callback: res => {
             let rows = res.objx || [];
             this.setValue(rows)
+            this.handleCustomEvent(this.field.options.formScriptSuccess,['res'],[res]);
           }
         });
       }