cloud-web-corejs 1.0.54-dev.148 → 1.0.54-dev.149

package/src/components/vb-tabs/x-tabs.vue

@@ -36,14 +36,15 @@ export default {
     }
   },
   methods: {
-    openEditTab(row) {
+    openEditTab(row,param) {
       let paneKeyName = this.paneKeyName;
       let tab = this.tabs.find(tab => tab.data[paneKeyName] === row[paneKeyName])
       if (!tab) {
         tab = {
           data: row,
           showContent: false,
-          dataId: row[paneKeyName]
+          dataId: row[paneKeyName],
+          param
         }
         if (this.tabs.length >= 30) {
           this.tabs.splice(0, 1, tab);

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

@@ -46,6 +46,7 @@ modules = {
   },
   inject: [
     "refList",
+    "widgetKeyNameMap",
     "getFormConfig",
     "globalOptionData",
     "globalModel",
@@ -64,12 +65,18 @@ modules = {
       requestAccess: null,
       extraAccessData: {},
       timerMap: {},
+
+      disabled: false,
+      hidden: false,
+      readonly: false
     };
   },
   beforeDestroy() {
     this.clearAllInterval();
   },
   created() {
+    // this.initFieldAttrs();
+    this.initValueWatchEvent();
     if (this.field.options.searchDialogConfig) {
       if (this.field.options.searchDialogConfig.multipleChoices === void 0) {
         if (this.field.type == "vabsearch") {
@@ -90,11 +97,11 @@ modules = {
   },
   mounted() {
   },
-  watch: {
+  /*watch: {
     currentValue(val) {
       this.initFieldModel(true);
     },
-  },
+  },*/
   computed: {
     currentValue() {
       let currentData =
@@ -147,6 +154,28 @@ modules = {
     },
   },
   methods: {
+    initValueWatchEvent() {
+      this.$watch(() => {
+        let currentData = this.tableParam && this.tableParam.row
+          ? this.tableParam.row
+          : this.formModel;
+        let currentValue = currentData[this.fieldKeyName];
+        return currentValue;
+      }, (newValue, oldValue) => {
+
+        if(oldValue!==undefined){
+          this.initFieldModel(true);
+        }
+
+        // console.log(newValue, oldValue)
+      })
+
+    },
+    initFieldAttrs() {
+      this.setDisabled(this.field.options.disabled)
+      this.setHidden(this.field.options.hidden)
+      this.setReadonly(this.field.options.readonly)
+    },
     initConfig() {
       let config = this.designer.getFieldWidgetByType(this.field.type);
       this.field.options = Object.assign(
@@ -404,11 +433,18 @@ modules = {
         if (this.tableParam && !this.designState) {
           let row = this.tableParam.row;
           let keyVal = row._X_ROW_KEY;
-          e && delete this.refList[e + "_" + keyVal],
-            (this.refList[this.field.options.name + "_" + keyVal] = this);
+          e && delete this.refList[e + "_" + keyVal];
+          this.refList[this.field.options.name + "_" + keyVal] = this;
         } else {
-          e && delete this.refList[e],
-            (this.refList[this.field.options.name] = this);
+          e && delete this.refList[e];
+          this.refList[this.field.options.name] = this;
+          if (this.widgetKeyNameMap) {
+            if (!this.widgetKeyNameMap[this.fieldKeyName]) {
+              this.widgetKeyNameMap[this.fieldKeyName] = [this.field.options.name]
+            } else {
+              this.widgetKeyNameMap[this.fieldKeyName].push(this.field.options.name);
+            }
+          }
         }
       }
     },
@@ -868,7 +904,8 @@ modules = {
                 newData[vabSearchName] =
                   item[searchDialogConfig.labelSourceField] ?? null;
                 tableData.forEach((item1) => {
-                  newData[item1.targetField] = item[item1.sourceField];
+                  let targetFormField = item1.targetFormField || item1.targetField
+                  newData[targetFormField] = item[item1.sourceField];
                 });
                 return newData;
               });
@@ -882,10 +919,11 @@ modules = {
                 ? row[searchDialogConfig.labelSourceField]
                 : null;
             tableData.forEach((item) => {
+              let targetFormField = item.targetFormField || item.targetField;
               if (!isClear) {
-                rowData[item.targetField] = row[item.sourceField];
+                rowData[targetFormField] = row[item.sourceField];
               } else {
-                rowData[item.targetField] = null;
+                rowData[targetFormField] = null;
               }
             });
           }
@@ -901,7 +939,12 @@ modules = {
           tableData.forEach((item) => {
             // formModel[item.targetField] = row[item.sourceField]
             let value = !isClear ? row[item.sourceField] ?? null : null;
-            this.getWidgetRef(item.targetField).setValue(value);
+            if(item.targetField){
+              this.getWidgetRef(item.targetField).setValue(value);
+            }else if(item.targetFormField){
+              formModel[item.targetFormField] = value;
+            }
+
             // formModel[item.targetField] = value;
           });
           // this.$forceUpdate();
@@ -912,7 +955,8 @@ modules = {
           let addRows = rows.map((rowData) => {
             let itemData = {};
             tableData.forEach((item) => {
-              itemData[item.targetField] = rowData[item.sourceField];
+              let targetFormField = item.targetFormField || item.targetField;
+              itemData[targetFormField] = rowData[item.sourceField];
             });
             return itemData;
           });
@@ -924,7 +968,15 @@ modules = {
           tableData.forEach((item) => {
             let value = row[item.sourceField] ?? null;
             // formModel[item.targetField] = value
-            this.getWidgetRef(item.targetField).setValue(value);
+            // this.getWidgetRef(item.targetField).setValue(value);
+
+            if(item.targetField){
+              this.getWidgetRef(item.targetField).setValue(value);
+            }else if(item.targetFormField){
+              formModel[item.targetFormField] = value;
+            }
+
+
           });
           // this.$forceUpdate();
         }
@@ -998,9 +1050,11 @@ modules = {
     },
     setReadonly: function (e) {
       this.field.options.readonly = e;
+      this.readonly = e;
     },
     setDisabled: function (e) {
       this.field.options.disabled = e;
+      this.disabled = e;
     },
     setAppendButtonVisible: function (e) {
       this.field.options.appendButton = e;
@@ -1009,8 +1063,9 @@ modules = {
       this.field.options.appendButtonDisabled = e;
     },
     setHidden: function (e) {
-      (this.field.options.hidden = e),
-        e ? this.clearFieldRules() : this.buildFieldRules();
+      this.field.options.hidden = e;
+      this.hidden = e;
+      e ? this.clearFieldRules() : this.buildFieldRules();
     },
     setRequired: function (e) {
       (this.field.options.required = e), this.buildFieldRules();

package/src/components/xform/form-designer/indexMixin.js

@@ -140,7 +140,8 @@ modules = {
       getObjectName: () => "",
       getHasWf: () => false,
       readonly:this.readonly,
-      columnFlag:this.columnFlag
+      columnFlag:this.columnFlag,
+      widgetKeyNameMap:{}
     };
   },
   created() {

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -101,6 +101,14 @@
           <el-form-item :label="i18nt('designer.setting.formRulesName')"><el-input type="text" v-model="formConfig.rulesName"></el-input></el-form-item>
         -->
         </el-collapse-item>
+        <el-collapse-item name="2" title="列表标签页信息">
+          <el-form-item :label="i18nt('列表启用多标签')">
+            <el-switch v-model="formConfig.multiTabEnabled"></el-switch>
+          </el-form-item>
+          <el-form-item :label="i18nt('标签名称字段')">
+            <el-input type="text" v-model="formConfig.multiTabLabelField"></el-input>
+          </el-form-item>
+        </el-collapse-item>
         <el-collapse-item name="3" title="详情表单信息">
           <el-form-item :label="i18nt('表单编码')">
             <el-input

package/src/components/xform/form-designer/setting-panel/property-editor/field-button/search-dialog-event-editor.vue

@@ -58,7 +58,7 @@
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
       top="5vh"
-      width="500px"
+      width="600px"
       v-dialog-drag
     >
       <div class="cont">
@@ -76,6 +76,11 @@
               <el-input v-model="scope.row.targetField"></el-input>
             </template>
           </el-table-column>
+          <el-table-column label="目标数据属性名称" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetFormField"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="来源字段" width="150" prop="sourceField">
             <template slot-scope="scope">
               <el-input v-model="scope.row.sourceField"></el-input>
@@ -114,6 +119,7 @@
         </el-table>
       </div>
       <div class="dialog-footer" slot="footer">
+        <span class="fl tips">注：'目标字段'与'目标数据属性名称'只需要维护一个即可。</span>
         <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
           {{ i18nt('designer.hint.cancel') }}
         </el-button>

package/src/components/xform/form-render/container-item/containerItemMixin.js

@@ -24,7 +24,7 @@ modules = {
     },
   },
   mixins: [scriptHttpMixin, defaultHandleMixin],
-  inject: ['doScriptAccess', 'getReportTemplate'],
+  inject: ['widgetKeyNameMap','doScriptAccess', 'getReportTemplate'],
   data() {
     return {
       extraAccessData: {},

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

@@ -149,22 +149,22 @@
           </vxe-button>
         </template>
 
-          <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
-            <component
-              v-if="'container' !== subWidget.category"
-              :key="swIdx"
-              :is="subWidget.type + '-widget'"
-              :field="subWidget"
-              :designer="null"
-              :parent-list="subWidget.widgetList"
-              :parent-widget="widget"
-            >
-              <!-- 递归传递插槽！！！ -->
-              <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                <slot :name="slot" v-bind="scope"/>
-              </template>
-            </component>
-          </template>
+        <template v-for="(subWidget, swIdx) in widget.widgetList" v-slot:[subWidget.options.name]>
+          <component
+            v-if="'container' !== subWidget.category"
+            :key="swIdx"
+            :is="subWidget.type + '-widget'"
+            :field="subWidget"
+            :designer="null"
+            :parent-list="subWidget.widgetList"
+            :parent-widget="widget"
+          >
+            <!-- 递归传递插槽！！！ -->
+            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+              <slot :name="slot" v-bind="scope"/>
+            </template>
+          </component>
+        </template>
 
         <template #searchWidget="{searchColumn}">
           <component
@@ -183,7 +183,8 @@
         </template>
 
       </tableForm>
-      <treeMoveDialog v-if="showTreeMoveDialog" :visiable.sync="showTreeMoveDialog" :rows.sync="sortRows" :parent-target="_self" @confirm="confirmTreeMoveDialog"></treeMoveDialog>
+      <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
@@ -245,10 +246,10 @@
     <template #editWidget="obj">
       <component
         :is="getColumnWidgetName(obj.column.params.editWidget)"
-        :field="obj.column.params.editWidget"
+        :field="getRowWidget(obj,obj.column.params.editWidget)"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.editWidget.id+'-'+obj.rowIndex"
+        :key="getRowWidgetKey(obj,obj.column.params.editWidget)"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"

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

@@ -106,6 +106,7 @@ modules = {
       tableConfig: {},
       showTableFormDialogContent: true,
       widgetMap: {},
+      rowWidgetList:[]
     };
   },
   watch: {
@@ -232,6 +233,7 @@ modules = {
     },
     setValue(val) {
       // console.log("rows:",val);
+      this.clearRowWidgets()
       let rows = val || [];
       this.formModel[this.fieldKeyName] = rows;
       let $grid = this.getGridTable();
@@ -371,6 +373,7 @@ modules = {
       return conditions;
     },
     createColumns() {
+      let rowWidgetList = [];
       let tableColumns = this.widget.options.tableColumns;
       let newColumns = [];
       newColumns.push({
@@ -429,6 +432,19 @@ modules = {
           }
         }
         col = addColumProperty(col, t);
+
+        if(col.params.widget){
+          rowWidgetList.push(col.params.widget)
+        }
+        if(col.params.editWidget){
+          rowWidgetList.push(col.params.editWidget)
+        }
+        if(col.params.widgetList && col.params.widgetList.length){
+          col.params.widgetList.forEach((item) => {
+            rowWidgetList.push(item)
+          })
+
+        }
         return col;
       };
 
@@ -509,6 +525,7 @@ modules = {
           }
         }
       }
+      this.rowWidgetList = rowWidgetList;
       return this.$baseLodash.cloneDeep(newColumns);
     },
     initTableList() {
@@ -526,6 +543,7 @@ modules = {
       let dataId = this.formDataId;
       let accessScript = this.widget.options.accessScript;
       let searchColumns = null;
+
       if (isQueryTable) {
         path = "#";
         paramFun = () => {
@@ -836,151 +854,6 @@ modules = {
               let accessReturnType = this.widget.options.accessReturnType || 2;
               let scriptCode = this.getScriptCode();
               return new Promise((resolve, reject) => {
-                /*let items = [
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 224,
-                    "f_code": "202501068569",
-                    "f_grade": "1",
-                    "f_name": "呃呃呃呃呃呃俄文",
-                    "company_code": "mk1",
-                    "id": 95,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-06 17:53:34",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-16 21:11:44"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 224,
-                    "f_code": "202501068569",
-                    "f_grade": "1",
-                    "f_name": "呃呃呃呃呃呃俄文",
-                    "company_code": "mk1",
-                    "id": 10095,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-06 17:53:34",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-16 21:11:44"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 221,
-                    "f_code": "202501037347",
-                    "f_grade": "1",
-                    "f_name": "张三",
-                    "company_code": "mk1",
-                    "id": 92,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 17:49:55",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-05 17:21:46"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 222,
-                    "f_code": "202501037348",
-                    "f_grade": "2",
-                    "f_name": "李四",
-                    "company_code": "mk1",
-                    "id": 93,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 17:49:55",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 17:49:55"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 222,
-                    "f_code": "202501037348",
-                    "f_grade": "2",
-                    "f_name": "李四",
-                    "company_code": "mk1",
-                    "id": 10093,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 17:49:55",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 17:49:55"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 223,
-                    "f_code": "202501037349",
-                    "f_grade": "3",
-                    "f_name": "王五",
-                    "company_code": "mk1",
-                    "id": 94,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 17:49:55",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 17:49:55"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 218,
-                    "f_code": "202501037340",
-                    "f_grade": "4",
-                    "f_name": "林一",
-                    "company_code": "mk1",
-                    "id": 89,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 15:02:31",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 15:02:31"
-                  },
-                  {
-                    "create_by": "admin",
-                    "object_foreign_id": 219,
-                    "f_code": "202501037341",
-                    "f_grade": "3",
-                    "f_name": "林二",
-                    "company_code": "mk1",
-                    "id": 90,
-                    "modify_by": "admin",
-                    "create_date": "2025-01-03 15:02:31",
-                    "f_flag": "A",
-                    "modify_date": "2025-01-03 15:02:31"
-                  }
-                ];
-                let currentId = 0;
-                let records = [];
-                for(let i=0;i<50;i++){
-                  let newItems = items.map((item,index)=>{
-                    let flag = (index+1)%2!=0;
-                    let line = flag ? index : (index-1)
-                    let f_code = '10000'+i+''+line;
-                    currentId++
-                    return {
-                      ...item,
-                      id:currentId,
-                      f_code
-                    };
-                  })
-                  records.push(...newItems)
-                }
-
-                let res = {
-                  "time": "2025-03-21 11:24:55",
-                  "type": "success",
-                  "content": "success",
-                  "objx": {
-                    "records": [],
-                    "total": 77,
-                    "size": 100,
-                    "current": 1,
-                    "orders": [],
-                    "optimizeCountSql": true,
-                    "hitCount": false,
-                    "countId": null,
-                    "maxLimit": null,
-                    "searchCount": true,
-                    "pages": 1
-                  },
-                  "rmid": null
-                };
-                res.objx.records = records
-                resolve(res);
-                return*/
                 let reqData = {
                   ...queryParams,
                 };
@@ -989,6 +862,7 @@ modules = {
                   let toDo = () => {
                     // let f = new Function("dataId", "formCode", "param", "done", accessScript);
                     let done = (res) => {
+                      this.clearRowWidgets();
                       resolve(res);
                       if (res.type == "success") {
                         let rows = res.objx
@@ -1398,6 +1272,7 @@ modules = {
       this.$nextTick(() => {
         this.handleWbs();
       });
+      this.deleteRowWidgets(row)
     },
     createNewTableData(isEdit) {
       let vailColumns = this.widget.options.tableColumns.filter(
@@ -1878,7 +1753,10 @@ modules = {
       }
       delIds.forEach((id) => {
         let index = tableRows.findIndex((item) => item.id === id);
+        let delRow = tableRows[index];
         tableRows.splice(index, 1);
+        this.deleteRowWidgets(delRow)
+
       });
       this.$nextTick(() => {
         this.handleWbs();
@@ -2191,6 +2069,58 @@ modules = {
         }
       }
     },
+
+    /**begin*/
+    /*initFieldSchemaData() {  //初始化fieldSchemaData！！！
+
+      let rowWidgetList = this.rowWidgetList
+      let rows = this.getValue();
+      let rowLength = rows.length
+      this.widgetMap = {}  //清除数组必须用splice，length=0不会响应式更新！！
+      if (rowLength > 0) {
+        for (let i = 0; i < rowLength; i++) {
+          let row = rows[i];
+          let fieldSchemas = []
+          rowWidgetList.forEach(swItem => {
+            fieldSchemas.push( this.cloneFieldSchema(swItem) )
+          })
+          let keyVal = row._X_ROW_KEY;
+          this.widgetMap[keyVal] = fieldSchemas;
+        }
+      }
+    },
+
+    addToFieldSchemaData(row) {
+      let fieldSchemas = []
+      this.rowWidgetList.forEach(swItem => {
+        fieldSchemas.push( this.cloneFieldSchema(swItem) )
+      })
+
+      let keyVal = row._X_ROW_KEY;
+      this.widgetMap[keyVal] = fieldSchemas;
+    },
+
+    deleteFromFieldSchemaData(row) {
+      let keyVal = row._X_ROW_KEY;
+      delete this.widgetMap[keyVal] ;
+    },
+
+    cloneFieldSchema(fieldWidget) {
+      let newFieldSchema = this.$baseLodash.cloneDeep(fieldWidget)
+      newFieldSchema.id = fieldWidget.type + generateId()
+      return newFieldSchema
+    },*/
+    clearRowWidgets(){
+      this.widgetMap = {};
+    },
+    deleteRowWidgets(row) {
+      this.rowWidgetList.forEach(widget=>{
+        let key = this.getRowRefKey(row, widget.options.name);
+        delete this.widgetMap[key];
+      })
+    }
+    /**end*/
+
   },
 };
 

package/src/components/xform/form-render/container-item/grid-col-item.vue

@@ -57,7 +57,11 @@
       tableParam: {
         type: Object,
         default: null,
-      }
+      },
+      formItemProp: {
+        type: String,
+        default: null,
+      },
     },
     inject: ['refList', 'globalModel', 'previewState'],
     data() {

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

@@ -46,7 +46,11 @@ export default {
     tableParam: {
       type: Object,
       default: null,
-    }
+    },
+    formItemProp: {
+      type: String,
+      default: null,
+    },
   },
   inject: ['refList', 'globalModel'],
   computed: {