cloud-web-corejs 1.0.54-dev.336 → 1.0.54-dev.338

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.336",
+  "version": "1.0.54-dev.338",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -259,6 +259,9 @@ modules = {
             this.oldFieldValue = baseRefUtil.deepClone(this.fieldModel),
             void this.initFileList();
         }*/
+       if(this.field.options.name=="status85657"){
+        debugger
+       }
         let defaultValue = this.field.options.defaultValue;
         let dataId = this.getFormRef()?.dataId ?? null;
         let nullValue = null;
@@ -548,6 +551,14 @@ modules = {
       }
     },
     initOptionItemsHandle() {
+      if(this.tableParam){
+        if(this.field._syncInited){
+          this.handleCustomEvent(
+            this.field.options.formScriptSuccess
+          );
+        }
+        return
+      }
       this.initGloatOptionItems(true);
     },
     initGloatOptionItems(initFlag) {
@@ -560,7 +571,8 @@ modules = {
         this.field.type === "radio" ||
         this.field.type === "checkbox" ||
         this.field.type === "select" ||
-        this.field.type === "cascader"
+        this.field.type === "cascader" ||
+        this.field.type === "status"
       ) {
         /* this.field.options.optionItems.forEach(item=>{
           if (!item.hasOwnProperty('disabled')) {
@@ -643,7 +655,8 @@ modules = {
         this.getOptionItemLabelKey(),
         this.getOptionItemValueKey()
       );
-      this.field.options.optionItems = optionItems
+      // this.field.options.optionItems = optionItems
+      this.setOptionItems(optionItems)
       let tableParam = this.tableParam;
       if (tableParam) {
         if (initFlag) {
@@ -652,6 +665,15 @@ modules = {
         this.loadTableOtions(optionItems)
       }
     },
+    setOptionItems(rows){
+      let formScriptEnabledTypes = ['select', 'checkbox', 'radio',"cascader"]
+      let widgetType = this.field.type;
+      if(formScriptEnabledTypes.includes(widgetType)){
+        this.field.options.optionItems = rows || [];
+      }else if(widgetType=="status"){
+        this.field.options.statusParam = rows || [];
+      }
+    },
     loadTableOtions(e) {
       let tableParam = this.tableParam;
       if (tableParam) {
@@ -1400,7 +1422,8 @@ modules = {
         this.getOptionItemLabelKey(),
         this.getOptionItemValueKey()()
       );
-      this.field.options.optionItems = optionItems
+      // this.field.options.optionItems = optionItems
+      this.setOptionItems(optionItems)
     },
     loadOptions: function (e, rowOptionFlag) {
       let optionItems = baseRefUtil.translateOptionItems(
@@ -1409,7 +1432,8 @@ modules = {
         this.getOptionItemLabelKey(),
         this.getOptionItemValueKey()
       );
-      this.field.options.optionItems = optionItems
+      // this.field.options.optionItems = optionItems
+      this.setOptionItems(optionItems)
     },
     getOptionKey() {
       let key = "optionItems-" + this.field.options.name
@@ -1430,7 +1454,8 @@ modules = {
         this.getOptionItemLabelKey(),
         this.getOptionItemValueKey()
       );
-      this.field.options.optionItems = optionItems;
+      // this.field.options.optionItems = optionItems;
+      this.setOptionItems(optionItems)
     },
     getOptions: function () {
       return this.getOptionItems();

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

@@ -4,10 +4,10 @@
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
     <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 v-if="fieldModel===item[valueField]">
+        <span v-if="field.options.formScriptEnabled || field.options.commonAttributeEnabled"  :key="index" >{{ getI18nLabel(item[labelField]) }}</span>
+        <span v-else :key="index" class="list-tag" :class="item.type">{{ getI18nLabel(item[labelField]) }}</span>
+      </template>
     </template>
   </form-item-wrapper>
 </template>
@@ -64,6 +64,14 @@ export default {
       statusParam: [],
     }
   },
+  computed: {
+    labelField(){
+      return this.getOptionItemLabelKey();
+    },
+    valueField(){
+      return this.getOptionItemValueKey();
+    }
+  },
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
@@ -85,6 +93,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
+    this.initOptionItemsHandle()
     // this.initStatusParam();
   },