cloud-web-corejs 1.0.54-dev.800 → 1.0.54-dev.801

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -165,7 +165,7 @@
         </el-tooltip>
       </div>
       <div class="data-table-editor-subsection">
-        <el-form-item label="列脚本">
+        <el-form-item label="列脚本" class="el-form-item-second">
           <a
             href="javascript:void(0);"
             class="a-link link-oneLind"
@@ -194,14 +194,14 @@
         </el-tooltip>
       </div>
       <div class="data-table-editor-subsection">
-        <el-form-item label="脚本编码"  class="form-item-label-top">
+        <el-form-item label="脚本编码"  class="form-item-label-top el-form-item-second">
           <el-input
             v-model="optionModel.dynamicColumnScriptCode"
             clearable
             placeholder="scriptCode 或 formCode/scriptCode"
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="el-form-item-second">
           <span slot="label">
             额外参数
             <el-tooltip effect="light" placement="top">
@@ -222,7 +222,7 @@
             <i class="el-icon-edit"></i>
           </a>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="el-form-item-second">
           <span slot="label">
             转换脚本
             <el-tooltip effect="light" placement="top">
@@ -249,7 +249,7 @@
       class="dynamic-column-block"
     >
       <div class="data-table-editor-subsection">
-        <el-form-item>
+        <el-form-item class="el-form-item-second">
           <span slot="label">
             加载条件
             <el-tooltip effect="light" placement="top">
@@ -273,7 +273,7 @@
         </el-form-item>
       </div>
     </div>
-    <el-form-item class="form-item-label-top" v-if="optionModel.dynamicColumnSourceType !== 'none'">
+    <el-form-item class="form-item-label-top el-form-item-second" v-if="optionModel.dynamicColumnSourceType !== 'none'">
       <span slot="label">
         动态列模式
         <el-tooltip effect="light" placement="top">
@@ -311,7 +311,7 @@
     <el-form-item :label="i18nt('启用WBS码')">
       <el-switch v-model="optionModel.wbsEnabled"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('排序脚本编码')" v-if="optionModel.isEditTable" class="form-item-label-top">
+    <el-form-item :label="i18nt('排序脚本编码')" v-if="optionModel.isEditTable" class="form-item-label-top el-form-item-second">
       <el-input v-model="optionModel.sortScriptCode"></el-input>
     </el-form-item>
     <el-form-item label-width="0">
@@ -1107,18 +1107,15 @@ export default {
 </style>
 
 <style scoped>
-.data-table-editor-subsection {
-  margin: 0 0 4px 8px;
-  padding-left: 12px;
-  border-left: 2px solid #ebeef5;
-}
-
-.form-section-label {
-  font-size: 13px;
-  font-weight: 500;
-  color: #303133;
-  line-height: 22px;
-  margin-bottom: 8px;
+.form-section-label {
+  margin: 16px 0 8px;
+  padding-left: 8px;
+  color: rgba(0, 0, 0, 0.65);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.3;
+  background: rgba(0, 0, 0, 0.04);
+  padding: 4px 0 4px 8px;
 }
 
 .label-tip-icon {

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid/gutter-editor.vue

@@ -6,18 +6,19 @@
     <el-form-item :label="i18nt('designer.setting.gutter')" class="form-item-label-top">
       <el-input-number v-model="optionModel.gutter" style="width: 100%"></el-input-number>
     </el-form-item>
-    <el-form-item :label="i18nt('designer.setting.colsOfGrid')"></el-form-item>
-    <el-form-item label-width="0">
-      <li v-for="(colItem, colIdx) in selectedWidget.cols" :key="colIdx" class="col-item">
-        <span class="col-span-title">{{i18nt('designer.setting.colSpanTitle')}}{{colIdx + 1}}</span>
-        <el-input-number v-model.number="colItem.options.span" :min="1" :max="24"
-                         @change="(newValue, oldValue) => spanChanged(selectedWidget, colItem, colIdx, newValue, oldValue)"
-                         class="cell-span-input"></el-input-number>
-        <el-button circle plain size="mini" type="danger" @click="deleteCol(selectedWidget, colIdx)"
-                   icon="el-icon-minus" class="col-delete-button"></el-button>
-      </li>
-      <div>
-        <el-button type="text" @click="addNewCol(selectedWidget)" icon="el-icon-circle-plus-outline" class="add-option">{{i18nt('designer.setting.addColumn')}}</el-button>
+    <el-form-item :label="i18nt('designer.setting.colsOfGrid')" class="form-item-label-top">
+      <div class="draggable-list">
+        <li v-for="(colItem, colIdx) in selectedWidget.cols" :key="colIdx" class="col-item">
+          <span class="col-span-title">{{i18nt('designer.setting.colSpanTitle')}}{{colIdx + 1}}</span>
+          <el-input-number v-model.number="colItem.options.span" :min="1" :max="24"
+                           @change="(newValue, oldValue) => spanChanged(selectedWidget, colItem, colIdx, newValue, oldValue)"
+                           class="cell-span-input"></el-input-number>
+          <el-button circle plain size="mini" type="danger" @click="deleteCol(selectedWidget, colIdx)"
+                     icon="el-icon-minus" class="col-delete-button"></el-button>
+        </li>
+        <div>
+          <el-button type="text" @click="addNewCol(selectedWidget)" icon="el-icon-circle-plus-outline" class="add-option">{{i18nt('designer.setting.addColumn')}}</el-button>
+        </div>
       </div>
     </el-form-item>
   </div>

package/src/components/xform/form-designer/setting-panel/property-editor/container-table/table-dynamicField-editor.vue

@@ -33,7 +33,7 @@
         </el-tooltip>
       </div>
       <div class="data-table-editor-subsection">
-        <el-form-item label="字段脚本">
+        <el-form-item label="字段脚本" class="el-form-item-second">
           <a
             href="javascript:void(0);"
             class="a-link link-oneLind"
@@ -60,14 +60,14 @@
         </el-tooltip>
       </div>
       <div class="data-table-editor-subsection">
-        <el-form-item class="form-item-label-top" label="脚本编码">
+        <el-form-item class="form-item-label-top el-form-item-second" label="脚本编码" >
           <el-input
             v-model="optionModel.dynamicSchemaScriptCode"
             clearable
             placeholder="scriptCode 或 formCode/scriptCode"
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item  class="el-form-item-second">
           <span slot="label">
             额外参数
             <el-tooltip effect="light" placement="top">
@@ -88,7 +88,7 @@
             <i class="el-icon-edit"></i>
           </a>
         </el-form-item>
-        <el-form-item>
+        <el-form-item  class="el-form-item-second">
           <span slot="label">
             转换脚本
             <el-tooltip effect="light" placement="top">
@@ -115,7 +115,7 @@
       class="dynamic-column-block"
     >
       <div class="data-table-editor-subsection">
-        <el-form-item>
+        <el-form-item  class="el-form-item-second">
           <span slot="label">
             加载条件
             <el-tooltip effect="light" placement="top">
@@ -139,7 +139,7 @@
         </el-form-item>
       </div>
     </div>
-    <el-form-item class="form-item-label-top" v-if="optionModel.dynamicSchemaSourceType !== 'none'">
+    <el-form-item class="form-item-label-top  el-form-item-second" v-if="optionModel.dynamicSchemaSourceType !== 'none'">
       <span slot="label">
         生成模式
         <el-tooltip effect="light" placement="top">
@@ -212,7 +212,8 @@
           optionModel.dynamicSchemaMode !== 'anchor' ||
           !optionModel.dynamicSchemaInheritLayout
         "
-        label="每行列数"
+        label="每行列数"
+        class="el-form-item-second"
       >
         <el-input-number
           v-model="optionModel.dynamicSchemaColumns"
@@ -307,18 +308,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.data-table-editor-subsection {
-  margin: 0 0 4px 8px;
-  padding-left: 12px;
-  border-left: 2px solid #ebeef5;
-}
-
 .form-section-label {
-  font-size: 13px;
-  font-weight: 500;
-  color: #303133;
-  line-height: 22px;
-  margin-bottom: 8px;
+  margin: 16px 0 8px;
+  padding-left: 8px;
+  color: rgba(0, 0, 0, 0.65);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.3;
+  background: rgba(0, 0, 0, 0.04);
+  padding: 4px 0 4px 8px;
 }
 
 .label-tip-icon {

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/afterColumnsCreated-editor.vue

@@ -0,0 +1,30 @@
+<template>
+  <el-form-item label="afterColumnsCreated" label-width="150px">
+    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('afterColumnsCreated', eventParams)">
+      <span>{{ optionModel.afterColumnsCreated }}</span>
+      <i class="el-icon-edit"></i>
+    </a>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+
+export default {
+  name: "afterColumnsCreated-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: ["columns", "$grid"],
+    };
+  },
+};
+</script>
+
+<style scoped></style>