cloud-web-corejs 1.0.54-dev.651 → 1.0.54-dev.652

package/package.json

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

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

@@ -22,20 +22,33 @@
           </template>
           <template
             v-else-if="
-              field.options.widgetTextFlag === 3 && field.options.widgetTextLinkConfig
+              field.options.widgetTextFlag === 3 &&
+              field.options.widgetTextLinkConfig
             "
           >
             <div class="ellipsis">
-              <a class="a-link" :class="getWidgetClass()" @click.native="handleClick">
+              <a
+                class="a-link"
+                :class="getWidgetClass()"
+                @click.native="handleClick"
+              >
                 <span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.prefixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.prefixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
                   ></i>
                   <span>{{ getWidgetValue() }}</span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.suffixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.suffixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
                   ></i>
                 </span>
               </a>
@@ -48,10 +61,12 @@
       </template>
       <template v-else>
         <el-form-item
-          v-if="!!field.formItemFlag && (!field.options.hidden || designState === true)"
+          v-if="
+            !!field.formItemFlag &&
+            (!field.options.hidden || designState === true)
+          "
           :label="label"
           :label-width="labelWidth"
-          :title="field.options.labelTooltip"
           :rules="getRules()"
           :prop="getPropName()"
           :class="[
@@ -66,31 +81,46 @@
             v-if="!!field.options.labelIconClass"
             slot="label"
             class="custom-label"
-            :style="{ color: field.options.labelColor }"
           >
             <template v-if="field.options.labelIconPosition === 'front'">
               <template v-if="!!field.options.labelTooltip">
-                <el-tooltip :content="field.options.labelTooltip" effect="light">
+                <el-tooltip
+                  :content="field.options.labelTooltip"
+                  effect="light"
+                >
                   <i :class="field.options.labelIconClass"></i></el-tooltip
-                >{{ label }}</template
+                ><span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span></template
               >
               <template v-else>
-                <i :class="field.options.labelIconClass"></i>{{ label }}</template
+                <i :class="field.options.labelIconClass"></i
+                ><span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span></template
               >
             </template>
             <template v-else-if="field.options.labelIconPosition === 'rear'">
               <template v-if="!!field.options.labelTooltip">
-                {{ label
-                }}<el-tooltip :content="field.options.labelTooltip" effect="light">
+                <span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span
+                ><el-tooltip
+                  :content="field.options.labelTooltip"
+                  effect="light"
+                >
                   <i :class="field.options.labelIconClass"></i></el-tooltip
               ></template>
               <template v-else>
-                {{ label }}<i :class="field.options.labelIconClass"></i
+                <span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span
+                ><i :class="field.options.labelIconClass"></i
               ></template>
             </template>
           </span>
           <span
-            v-if="!!field.options.labelColor"
+            v-else-if="!!field.options.labelColor"
             slot="label"
             :style="{ color: field.options.labelColor }"
           >
@@ -101,20 +131,29 @@
           </template>
           <template
             v-else-if="
-              field.options.widgetTextFlag === 3 && field.options.widgetTextLinkConfig
+              field.options.widgetTextFlag === 3 &&
+              field.options.widgetTextLinkConfig
             "
           >
             <div class="ellipsis">
               <a class="a-link" :class="getWidgetClass()" @click="handleClick">
                 <span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.prefixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.prefixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
                   ></i>
                   <span>{{ getWidgetValue() }}</span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.suffixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.suffixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
                   ></i>
                 </span>
               </a>
@@ -330,7 +369,10 @@ export default {
         }
 
         this.$nextTick(() => {
-          const l = getSubFormNameByFieldId(this.designer.widgetList, selectedId);
+          const l = getSubFormNameByFieldId(
+            this.designer.widgetList,
+            selectedId
+          );
           this.parentList.splice(this.indexOfParentList, 1);
           //if (!!nextSelected) {
           this.designer.setSelected(nextSelected);
@@ -342,7 +384,9 @@ export default {
       }
     },
     getIsFormItemUnabled() {
-      return this.field.type == "vabUpload" || this.field.type == "baseAttachment";
+      return (
+        this.field.type == "vabUpload" || this.field.type == "baseAttachment"
+      );
     },
     getRules() {
       if (this.getIsFormItemUnabled()) {
@@ -351,15 +395,26 @@ export default {
       return this.rules;
     },
     getPropName() {
-      if (this.getIsFormItemUnabled()) {
+      if (this.formItemProp === "false" || this.getIsFormItemUnabled()) {
         return null;
       }
-      if (this.formItemProp) {
-        return this.formItemProp;
+      // if (this.formItemProp) {
+      //   return this.formItemProp;
+      // }
+      if (this.tableParam && !this.tableParam.$table?.$parent?.$parent) {
+        if (this.formItemProp) {
+          return this.formItemProp;
+        }
+        return null;
+      }
+      if (this.tableParam && !!this.tableParam.$table?.$parent?.$parent) {
+        return this.getColumnProp(this.field, this.tableParam);
       }
       let o = this.field.options.name;
       let propName =
-        ((o = (this.field.options.keyNameEnabled && this.field.options.keyName) || o),
+        ((o =
+          (this.field.options.keyNameEnabled && this.field.options.keyName) ||
+          o),
         this.subFormItemFlag && !this.designState
           ? this.subFormName + "." + this.subFormRowIndex + "." + o
           : this.getObjectFieldFlag() && !this.designState
@@ -368,6 +423,46 @@ export default {
 
       return propName;
     },
+    getFieldKeyName(widget) {
+      let o = widget.options.name;
+      return (widget.options.keyNameEnabled && widget.options.keyName) || o;
+    },
+    isVabsearchFlagWidget(widget) {
+      let type = widget?.type;
+      return (
+        type === "vabsearch" ||
+        type === "singerSearch" ||
+        type === "multiSearch"
+      );
+    },
+    getColumnProp(rowWidget, obj) {
+      let required = rowWidget.options.required || false;
+
+      let tableRef = obj.$table.$parent.$parent;
+      let tableWidget = tableRef.widget;
+      let fieldKeyName = this.getFieldKeyName(tableWidget);
+      let property = this.getFieldKeyName(rowWidget);
+      if (this.isVabsearchFlagWidget(rowWidget)) {
+        property = rowWidget.options.vabSearchName || property;
+      }
+      let rowIndex = Math.max(obj.rowIndex, 0);
+
+      let isTreeTable = tableWidget.options.isTreeTable || false;
+      if (isTreeTable) {
+        rowIndex = tableRef
+          .getValue()
+          .findIndex((item) => item._X_ROW_KEY === obj.row._X_ROW_KEY);
+        if (rowIndex < 0) {
+          return "false";
+        }
+      }
+
+      let propName = fieldKeyName + "." + rowIndex + "." + property;
+      if (!required) {
+        propName = "false";
+      }
+      return propName;
+    },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;
     },
@@ -509,7 +604,8 @@ export default {
               : [];
 
             let flag1 = !item.serveName || item.serveName == bdService;
-            let flag2 = !companyCodes.length || companyCodes.includes(companyCode);
+            let flag2 =
+              !companyCodes.length || companyCodes.includes(companyCode);
             // let flag3 = !loginAccounts.length || loginAccounts.includes(loginAccount)
             // let flag4 = this.compareToList(saleOrgCodes, saleOrgCodeList)
             if (flag1 && flag2) {
@@ -543,13 +639,16 @@ export default {
     isShowWidget() {
       let widgetTextFlag = this.field.options.widgetTextFlag;
       return (
-        widgetTextFlag === undefined || widgetTextFlag === null || widgetTextFlag === 0
+        widgetTextFlag === undefined ||
+        widgetTextFlag === null ||
+        widgetTextFlag === 0
       );
     },
     getShowValue() {
       let widgetTextFlag = this.field.options.widgetTextFlag;
       let fieldModel = this.$parent.fieldModel;
-      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      if (this.$parent.fieldModelLabel)
+        fieldModel = this.$parent.fieldModelLabel();
       let showValue = fieldModel;
       if (widgetTextFlag == 2) {
         showValue = this.getProcessText(showValue, this.encryptFormula);
@@ -568,13 +667,17 @@ export default {
     handleClick(event) {
       if (this.field.options.disabled) return;
       this.$parent.handleButtonWidgetClick(event, true);
-      if (!this.designState && this.field.options.widgetTextLinkConfig?.options.href) {
+      if (
+        !this.designState &&
+        this.field.options.widgetTextLinkConfig?.options.href
+      ) {
         window.open(this.field.options.widgetTextLinkConfig?.options.href);
       }
     },
     getWidgetValue() {
       let fieldModel = this.$parent.fieldModel;
-      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      if (this.$parent.fieldModelLabel)
+        fieldModel = this.$parent.fieldModelLabel();
       return fieldModel;
     },
   },

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

@@ -1,23 +1,22 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.appendButtonIcon')">
-    <el-input type="text" v-model="optionModel.buttonIcon"></el-input>
+    <icon-picker v-model="optionModel.buttonIcon"></icon-picker>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
-
-  export default {
-    name: "buttonIcon-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "@base/components/xform/utils/i18n";
+import IconPicker from "@base/components/xform/icon-picker/index.vue";
+export default {
+  name: "buttonIcon-editor",
+  components: { IconPicker },
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,23 +1,22 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.buttonIcon')">
-    <el-input type="text" v-model="optionModel.icon"></el-input>
+    <icon-picker v-model="optionModel.icon"></icon-picker>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-
-  export default {
-    name: "icon-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "@base/components/xform/utils/i18n";
+import IconPicker from "@base/components/xform/icon-picker/index.vue";
+export default {
+  name: "icon-editor",
+  components: { IconPicker },
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,28 +1,29 @@
 <template>
-  <div v-show="false">
+  <div>
     <el-form-item label-width="0">
-      <el-divider class="custom-divider">{{i18nt('designer.setting.customLabelIcon')}}</el-divider>
+      <el-divider class="custom-divider">{{
+        i18nt("designer.setting.customLabelIcon")
+      }}</el-divider>
     </el-form-item>
     <el-form-item :label="i18nt('designer.setting.labelIconClass')">
-      <el-input type="text" v-model="optionModel.labelIconClass"></el-input>
+      <icon-picker v-model="optionModel.labelIconClass"></icon-picker>
     </el-form-item>
   </div>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
-
-  export default {
-    name: "labelIconClass-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "@base/components/xform/utils/i18n";
+import IconPicker from "@base/components/xform/icon-picker/index.vue";
+export default {
+  name: "labelIconClass-editor",
+  components: { IconPicker },
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,37 +1,37 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.labelIconPosition')" v-show="false">
+  <el-form-item :label="i18nt('designer.setting.labelIconPosition')">
     <el-select v-model="optionModel.labelIconPosition">
-      <el-option v-for="item in labelIconPosition" :key="item.value" :label="item.label"
-                 :value="item.value">
+      <el-option
+        v-for="item in labelIconPosition"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      >
       </el-option>
     </el-select>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n";
 
-  export default {
-    name: "labelIconPosition-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-    data() {
-      return {
-        labelIconPosition: [
-          {label: 'front', value: 'front'},
-          {label: 'rear', value: 'rear'},
-        ],
-
-      }
-    },
-
-  }
+export default {
+  name: "labelIconPosition-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      labelIconPosition: [
+        { label: "front", value: "front" },
+        { label: "rear", value: "rear" },
+      ],
+    };
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,23 +1,21 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.labelTooltip')" v-show="false">
+  <el-form-item :label="i18nt('designer.setting.labelTooltip')">
     <el-input type="text" v-model="optionModel.labelTooltip"></el-input>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n";
 
-  export default {
-    name: "labelTooltip-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+export default {
+  name: "labelTooltip-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,23 +1,22 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.prefixIcon')">
-    <el-input type="text" v-model="optionModel.prefixIcon"></el-input>
+    <icon-picker v-model="optionModel.prefixIcon"></icon-picker>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n";
-
-  export default {
-    name: "prefixIcon-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "@base/components/xform/utils/i18n";
+import IconPicker from "@base/components/xform/icon-picker/index.vue";
+export default {
+  name: "prefixIcon-editor",
+  components: { IconPicker },
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,23 +1,22 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.suffixIcon')">
-    <el-input type="text" v-model="optionModel.suffixIcon"></el-input>
+    <icon-picker v-model="optionModel.suffixIcon"></icon-picker>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n";
-
-  export default {
-    name: "suffixIcon-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "@base/components/xform/utils/i18n";
+import IconPicker from "@base/components/xform/icon-picker/index.vue";
+export default {
+  name: "suffixIcon-editor",
+  components: { IconPicker },
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>