cloud-web-corejs 1.0.54-dev.258 → 1.0.54-dev.259

package/package.json

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

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

@@ -70,7 +70,7 @@ export default {
     widgetClass() {
       let list = [];
       let optionModel = this.field.options
-      if (optionModel.coloClass) list.push(optionModel.coloClass);
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
       if (optionModel.underline) list.push('underLine');
       if (optionModel.disabled) list.push('is-disabled');
       return list

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

@@ -66,7 +66,7 @@ export default {
     widgetClass() {
       let list = [];
       let optionModel = this.field.options
-      if (optionModel.coloClass) list.push(optionModel.coloClass);
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
       if (optionModel.underline) list.push('underLine');
       if (optionModel.disabled) list.push('is-disabled');
       return list

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

@@ -6,7 +6,8 @@ import {
   runDataSourceRequest,
   getReportGlobalMap,
   getAccessUrl,
-  generateId
+  generateId,
+  trim
 } from "../../../../../components/xform/utils/util";
 import FormValidators, {getRegExp} from "../../../../../components/xform/utils/validators";
 import scriptHttpMixin from "../../../../../components/xform/mixins/scriptHttp";
@@ -1005,13 +1006,15 @@ modules = {
       if (this.hasVabsearchFlag()) {
         if (this.field.options.multipleChoices) {
           let fieldKeyName = this.fieldKeyName;
-          let valueField = this.field.options.valueField || fieldKeyName;
-          let vabSearchName = this.field.options.vabSearchName || fieldKeyName;
+          let valueField = trim(this.field.options.valueField || fieldKeyName);
+          let vabSearchName = trim(this.field.options.vabSearchName || fieldKeyName);
+          let valueSourceField = trim(searchDialogConfig.valueSourceField)
+          let labelSourceField = trim(searchDialogConfig.labelSourceField)
 
           rows = (this.fieldModel || []).map((row) => {
             return {
-              [searchDialogConfig.valueSourceField]: row[valueField],
-              [searchDialogConfig.labelSourceField]: row[vabSearchName],
+              [valueSourceField]: row[valueField],
+              [labelSourceField]: row[vabSearchName],
             };
           });
         }
@@ -1057,11 +1060,13 @@ modules = {
       let row = rows && rows.length ? rows[0] : null;
       let multipleChoices =
         optionModel.searchDialogConfig.multipleChoices || false;
+
+      let valueSourceField = trim(searchDialogConfig.valueSourceField)
+      let labelSourceField = trim(searchDialogConfig.labelSourceField)
       if (this.hasVabsearchFlag()) {
         let fieldKeyName = this.fieldKeyName;
-        let valueField = this.field.options.valueField || fieldKeyName;
-        let vabSearchName = this.field.options.vabSearchName || fieldKeyName;
-
+        let valueField = trim(this.field.options.valueField || fieldKeyName);
+        let vabSearchName = trim(this.field.options.vabSearchName || fieldKeyName);
         if (tableParam) {
           let rowData = tableParam.row;
           if (this.getMultipleChoices()) {
@@ -1071,28 +1076,30 @@ modules = {
               rowData[fieldKeyName] = rows.map((item) => {
                 let newData = {};
                 newData[valueField] =
-                  item[searchDialogConfig.valueSourceField] ?? null;
+                  item[valueSourceField] ?? null;
                 newData[vabSearchName] =
-                  item[searchDialogConfig.labelSourceField] ?? null;
+                  item[labelSourceField] ?? null;
                 tableData.forEach((item1) => {
-                  let targetFormField = item1.targetFormField || item1.targetField
-                  newData[targetFormField] = item[item1.sourceField];
+                  let targetFormField = trim(item1.targetFormField || item1.targetField)
+                  let sourceField = trim(item1.sourceField)
+                  newData[targetFormField] = item[sourceField];
                 });
                 return newData;
               });
             }
           } else {
             rowData[fieldKeyName] = !isClear
-              ? row[searchDialogConfig.valueSourceField]
+              ? row[valueSourceField]
               : null;
-            if (searchDialogConfig.labelSourceField)
+            if (labelSourceField)
               rowData[vabSearchName] = !isClear
-                ? row[searchDialogConfig.labelSourceField]
+                ? row[labelSourceField]
                 : null;
             tableData.forEach((item) => {
-              let targetFormField = item.targetFormField || item.targetField;
+              let targetFormField = trim(item.targetFormField || item.targetField);
+              let sourceField = trim(item.sourceField)
               if (!isClear) {
-                rowData[targetFormField] = row[item.sourceField];
+                rowData[targetFormField] = row[sourceField];
               } else {
                 rowData[targetFormField] = null;
               }
@@ -1107,12 +1114,13 @@ modules = {
               rowData = rows.map((item) => {
                 let newData = {};
                 newData[valueField] =
-                  item[searchDialogConfig.valueSourceField] ?? null;
+                  item[valueSourceField] ?? null;
                 newData[vabSearchName] =
-                  item[searchDialogConfig.labelSourceField] ?? null;
+                  item[labelSourceField] ?? null;
                 tableData.forEach((item1) => {
-                  let targetFormField = item1.targetFormField || item1.targetField
-                  newData[targetFormField] = item[item1.sourceField];
+                  let targetFormField = trim(item1.targetFormField || item1.targetField)
+                  let sourceField = trim(item1.sourceField)
+                  newData[targetFormField] = item[sourceField];
                 });
                 return newData;
               });
@@ -1120,20 +1128,22 @@ modules = {
             this.setValue(rowData);
           } else {
             this.fieldModel = !isClear
-              ? row[searchDialogConfig.valueSourceField]
+              ? row[valueSourceField]
               : null;
-            if (searchDialogConfig.labelSourceField) {
+            if (labelSourceField) {
               this.setShowValue(
-                !isClear ? row[searchDialogConfig.labelSourceField] : null
+                !isClear ? row[labelSourceField] : null
               );
             }
             tableData.forEach((item) => {
               // formModel[item.targetField] = row[item.sourceField]
               let value = !isClear ? row[item.sourceField] ?? null : null;
-              if (item.targetField) {
-                this.getWidgetRef(item.targetField).setValue(value);
-              } else if (item.targetFormField) {
-                formModel[item.targetFormField] = value;
+              let targetField = trim(item.targetField)
+              let targetFormField = trim(item.targetFormField)
+              if (targetField) {
+                this.getWidgetRef(targetField).setValue(value);
+              } else if (targetFormField) {
+                formModel[targetFormField] = value;
               }
             });
           }
@@ -1144,25 +1154,28 @@ modules = {
           let addRows = rows.map((rowData) => {
             let itemData = {};
             tableData.forEach((item) => {
-              let targetFormField = item.targetFormField || item.targetField;
-              itemData[targetFormField] = rowData[item.sourceField];
+              let targetFormField = trim(item.targetFormField || item.targetField);
+              let sourceField = trim(item.sourceField)
+              itemData[targetFormField] = rowData[sourceField];
             });
             return itemData;
           });
+          let tableUniqueKey = trim(searchDialogConfig.tableUniqueKey);
           this.getWidgetRef(searchDialogConfig.tableRef).addTableData(
             addRows,
-            searchDialogConfig.tableUniqueKey
+            tableUniqueKey
           );
         } else if (!multipleChoices) {
           tableData.forEach((item) => {
             let value = row[item.sourceField] ?? null;
             // formModel[item.targetField] = value
             // this.getWidgetRef(item.targetField).setValue(value);
-
-            if (item.targetField) {
-              this.getWidgetRef(item.targetField).setValue(value);
-            } else if (item.targetFormField) {
-              formModel[item.targetFormField] = value;
+            let targetField = trim(item.targetField)
+            let targetFormField = trim(item.targetFormField)
+            if (targetField) {
+              this.getWidgetRef(targetField).setValue(value);
+            } else if (targetFormField) {
+              formModel[targetFormField] = value;
             }
 
 

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

@@ -487,7 +487,7 @@ export default {
     getWidgetClass() {
       let list = [];
       let optionModel = this.field.options.widgetTextLinkConfig?.options || {};
-      if (optionModel.coloClass) list.push(optionModel.coloClass);
+      if (optionModel.colorClass) list.push(optionModel.colorClass);
       if (optionModel.underline) list.push('underLine');
       if (this.field.options.disabled) list.push('is-disabled');
       return list

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

@@ -11,7 +11,7 @@
     :sub-form-col-index="subFormColIndex"
     :sub-form-row-id="subFormRowId"
   >
-    <span>{{ showVaule }}</span>
+    <span :class="field.options.colorClass">{{ showVaule }}</span>
   </form-item-wrapper>
 </template>
 

package/src/components/xform/form-designer/setting-panel/property-editor/a-link-editor.vue

@@ -6,14 +6,14 @@
     <el-form-item :label="i18nt('表单值显示')" v-if="selectedWidget.type!=='a-link2'">
       <el-switch v-model="optionModel.isFormLabel"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('颜色')">
-      <el-select v-model="optionModel.coloClass" clearable>
+<!--    <el-form-item :label="i18nt('颜色')">
+      <el-select v-model="optionModel.colorClass" clearable>
         <el-option value="f-red" label="橙"></el-option>
         <el-option value="f-dred" label="红"></el-option>
         <el-option value="f-green" label="绿"></el-option>
         <el-option value="f-blue" label="蓝"></el-option>
       </el-select>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item :label="i18nt('超链接')">
       <el-input type="text" v-model="optionModel.href"></el-input>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/a-text-editor.vue

@@ -3,14 +3,14 @@
     <el-form-item :label="i18nt('显示下划线')">
       <el-switch v-model="optionModel.underline"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('颜色')">
-      <el-select v-model="optionModel.coloClass" clearable>
+<!--    <el-form-item :label="i18nt('颜色')">
+      <el-select v-model="optionModel.colorClass" clearable>
         <el-option value="f-red" label="橙"></el-option>
         <el-option value="f-dred" label="红"></el-option>
         <el-option value="f-green" label="绿"></el-option>
         <el-option value="f-blue" label="蓝"></el-option>
       </el-select>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item :label="i18nt('超链接')">
       <el-input type="text" v-model="optionModel.href"></el-input>
     </el-form-item>

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

@@ -0,0 +1,28 @@
+<template>
+  <el-form-item :label="i18nt('颜色')">
+    <el-select v-model="optionModel.colorClass" clearable>
+      <el-option value="f-red" label="橙"></el-option>
+      <el-option value="f-dred" label="红"></el-option>
+      <el-option value="f-green" label="绿"></el-option>
+      <el-option value="f-blue" label="蓝"></el-option>
+    </el-select>
+  </el-form-item>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n"
+
+  export default {
+    name: "colorClass-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -157,6 +157,7 @@ const COMMON_PROPERTIES = {
   "tagFormCode": "project-tag-editor",
   "autoValueEnabled": "autoValueEnabled-editor",
   // "commonAttributeEnabled": "commonAttributeEnabled-editor"
+  "colorClass": "colorClass-editor",
 }
 
 const ADVANCED_PROPERTIES = {

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -1918,6 +1918,7 @@ export const basicFields = [
       hidden: !1,
       required: !1,
       customClass: "",
+      colorClass: "",
       defaultValue: "",
       labelAlign: "",
       labelWidth: null,
@@ -1969,7 +1970,7 @@ export const basicFields = [
       aTextFlag: 1,
       underline: false,
       href: "",
-      coloClass: "f-red",
+      colorClass: "f-red",
 
       onCreated: "",
       onMounted: "",
@@ -2009,7 +2010,7 @@ export const basicFields = [
       aLinkFlag: 1,
       underline: false,
       href: "",
-      coloClass: "f-blue",
+      colorClass: "f-blue",
       isFormLabel: false,
       onCreated: "",
       onMounted: "",
@@ -2045,7 +2046,7 @@ export const basicFields = [
       aLinkFlag: 1,
       underline: false,
       href: "",
-      coloClass: "f-blue",
+      colorClass: "f-blue",
 
       onClick: "",
       clickBindEvent: null,