cloud-web-corejs 1.0.54-dev.173 → 1.0.54-dev.175

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

@@ -798,6 +798,7 @@ export const basicFields = [
   {
     type: "input",
     icon: "text-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -860,6 +861,7 @@ export const basicFields = [
   {
     type: "input-batch",
     icon: "input-batch",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -921,6 +923,7 @@ export const basicFields = [
   {
     type: "textarea",
     icon: "textarea-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -973,6 +976,7 @@ export const basicFields = [
   {
     type: "number",
     icon: "number-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1028,6 +1032,7 @@ export const basicFields = [
   {
     type: "radio",
     icon: "radio-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1097,6 +1102,7 @@ export const basicFields = [
   {
     type: "checkbox",
     icon: "checkbox-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1167,6 +1173,7 @@ export const basicFields = [
   {
     type: "select",
     icon: "select-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1245,6 +1252,7 @@ export const basicFields = [
   {
     type: "time",
     icon: "time-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1297,6 +1305,7 @@ export const basicFields = [
   {
     type: "time-range",
     icon: "time-range-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1348,6 +1357,7 @@ export const basicFields = [
   {
     type: "date",
     icon: "date-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1402,6 +1412,7 @@ export const basicFields = [
   {
     type: "date-range",
     icon: "date-range-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1579,6 +1590,7 @@ export const basicFields = [
   {
     type: "static-text",
     icon: "static-text",
+    commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
     options: {
@@ -1604,6 +1616,7 @@ export const basicFields = [
   {
     type: "html-text",
     icon: "html-text",
+    commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
     options: {
@@ -1643,6 +1656,7 @@ export const basicFields = [
   {
     type: "button",
     icon: "button",
+    commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
     options: {
@@ -1682,6 +1696,7 @@ export const basicFields = [
   {
     type: "divider",
     icon: "divider",
+    commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
     options: {
@@ -1754,6 +1769,7 @@ export const basicFields = [
   {
     type: "text",
     icon: "text",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1790,6 +1806,7 @@ export const basicFields = [
   {
     type: "a-text",
     icon: "text-field",
+    commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
     tableField: null,
@@ -1837,6 +1854,7 @@ export const basicFields = [
   {
     type: "a-link",
     icon: "button",
+    commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
     options: {
@@ -1876,6 +1894,32 @@ export const basicFields = [
       ...defaultTextFlagConfig
     }
   },
+  {
+    type: "a-link2",
+    icon: "button",
+    commonFlag: !1,
+    formItemFlag: !1,
+    columnFlag: false,
+    options: {
+      prefixIcon: "",
+      suffixIcon: "",
+      customClass: "",
+      aLinkFlag: 1,
+      underline: false,
+      href: "",
+      coloClass: "f-blue",
+
+      onClick: "",
+      clickBindEvent: null,
+      searchDialogConfig: {
+        ...defaultSearchDialogConfig
+      },
+      addTableDataConfig: {
+        tableRef: null,
+        tableData: {}
+      },
+    }
+  },
 
 ]
 

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

@@ -3,7 +3,7 @@
             @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"
             @checkbox-change="handleCheckboxChange" @checkbox-all="handleCheckboxAll"
             @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel"
-            :span-method="mergeRowMethod">
+            >
     <template #form>
       <!--            <div v-if="widget.options.showSearchArea" class="clearfix screen-btns">
                     <div class="fl">
@@ -186,7 +186,7 @@
       <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">
+<!--    <template v-for="fieldWidget in widgets" v-slot:[fieldWidget.id]="obj">
       <component
         :is="getColumnWidgetName(fieldWidget)"
         :field="fieldWidget"
@@ -203,7 +203,7 @@
           <slot :name="slot" v-bind="scope"/>
         </template>
       </component>
-    </template>
+    </template>-->
     <template #widget="obj">
       <component
         :is="getColumnWidgetName(obj.column.params.widget)"
@@ -332,13 +332,13 @@ export default {
   },
   mixins: [dataTableMixin],
   computed: {
-    heightStyle() {
+    /*heightStyle() {
       let tableHeight = this.widget.options.tableHeight;
       if (tableHeight && (tableHeight == 'auto' || tableHeight.slice(-1) == '%')) {
         return 'height:100%';
       }
       return '';
-    }
+    }*/
   }
 };
 </script>