cloud-web-corejs 1.0.280 → 1.1.0-dev.4

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

@@ -1,96 +1,96 @@
-<template>
-  <div>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider">前端导入设置</el-divider>
-    </el-form-item>
-    <el-form-item label="文件大小限制（M）" class="form-item-label-top">
-      <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
-    </el-form-item>
-    <el-form-item label="导入模板文件编码" class="form-item-label-top">
-      <el-input
-        class="search-input"
-        max="200"
-        :value="optionModel.importAttachCode"
-        clearable
-        @clear="optionModel.importAttachCode=null;optionModel.importAttachName=null;"
-      >
-        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
-      </el-input>
-    </el-form-item>
-    <el-form-item label="导入模板文件名称">
-      <span>{{ optionModel.importAttachName }}</span>
-    </el-form-item>
-
-    <el-form-item label="关联表格唯一名称" class="form-item-label-top">
-      <el-input v-model="optionModel.tableRef"></el-input>
-    </el-form-item>
-    <el-form-item label="点击前置事件" label-width="150px">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onBeforeClickButton', eventParams)">
-        <span>{{ optionModel.onBeforeClickButton }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-    <el-form-item label="启用确认回调">
-      <el-switch v-model="optionModel.onConfirmImportEnabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.onConfirmImportEnabled" class="el-form-item-second">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
-        <span>{{ optionModel.onConfirmImport }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-    <el-form-item label="导入完成回调" label-width="150px">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
-        <span>{{ optionModel.onSuccessImport }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-    <el-form-item label="隐藏取消按钮" label-width="150px">
-      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
-    </el-form-item>
-
-    <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
-                           @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
-  </div>
-</template>
-
-<script>
-import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin
-  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
-import bdAttachSettingDialog from "../../../../../../views/bd/setting/bd_attach_setting/dialog.vue";
-
-export default {
-  name: "import2-button-editor",
-  components: {bdAttachSettingDialog},
-  mixins: [i18n, eventMixin],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  data() {
-    return {
-      eventParams: ["dataId", "formCode", "done"],
-      showBdAttachSettingDialog: false,
-      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
-      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done', "close"],
-      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
-    };
-  },
-  methods: {
-    confirmBdAttachSettingDialog(rows) {
-      if (rows.length) {
-        let row = rows[0];
-        this.optionModel.importAttachName = row.name;
-        this.optionModel.importAttachCode = row.code;
-      }
-    }
-  }
-};
-</script>
-
-<style scoped></style>
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">前端导入设置</el-divider>
+    </el-form-item>
+    <el-form-item label="文件大小限制（M）" class="form-item-label-top">
+      <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
+    </el-form-item>
+    <el-form-item label="导入模板文件编码" class="form-item-label-top">
+      <el-input
+        class="search-input"
+        max="200"
+        :value="optionModel.importAttachCode"
+        clearable
+        @clear="optionModel.importAttachCode=null;optionModel.importAttachName=null;"
+      >
+        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
+      </el-input>
+    </el-form-item>
+    <el-form-item label="导入模板文件名称">
+      <span>{{ optionModel.importAttachName }}</span>
+    </el-form-item>
+
+    <el-form-item label="关联表格唯一名称" class="form-item-label-top">
+      <el-input v-model="optionModel.tableRef"></el-input>
+    </el-form-item>
+    <el-form-item label="点击前置事件" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onBeforeClickButton', eventParams)">
+        <span>{{ optionModel.onBeforeClickButton }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="启用确认回调">
+      <el-switch v-model="optionModel.onConfirmImportEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.onConfirmImportEnabled" class="el-form-item-second">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
+        <span>{{ optionModel.onConfirmImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="导入完成回调" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
+        <span>{{ optionModel.onSuccessImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="隐藏取消按钮" label-width="150px">
+      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
+    </el-form-item>
+
+    <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
+                           @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import bdAttachSettingDialog from "../../../../../../views/bd/setting/bd_attach_setting/dialog.vue";
+
+export default {
+  name: "import2-button-editor",
+  components: {bdAttachSettingDialog},
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: ["dataId", "formCode", "done"],
+      showBdAttachSettingDialog: false,
+      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done', "close"],
+      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
+    };
+  },
+  methods: {
+    confirmBdAttachSettingDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.optionModel.importAttachName = row.name;
+        this.optionModel.importAttachCode = row.code;
+      }
+    }
+  }
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/select-export-item-button-editor.vue

@@ -34,16 +34,59 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item label="明细导出脚本编码" class="form-item-label-top">
+      <el-input v-model="optionModel.exportItemScriptCode"></el-input>
+    </el-form-item>
+    <el-form-item label="明细导出查询参数">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('exportItemParam', tableConfigParams)"
+      >
+        <span>{{ optionModel.exportItemParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="明细导出列维护">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="showExportItemColumnsDialog = true"
+      >
+        <span>{{
+          optionModel.exportItemColumns && optionModel.exportItemColumns.length
+            ? "已维护"
+            : null
+        }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label-width="0">
+      <div class="export-item-columns-tip">
+        脚本编码、查询参数、导出列三项各自独立：留空的那项沿用数据表格属性上配的，维护了就以本按钮为准。
+      </div>
+    </el-form-item>
+    <exportItemColumnsDialog
+      v-if="showExportItemColumnsDialog"
+      :visiable.sync="showExportItemColumnsDialog"
+      :designer="designer"
+      :selectedWidget="selectedWidget"
+      :optionModel="optionModel"
+    />
   </div>
 </template>
 
 <script>
 import i18n from "../../../../utils/i18n";
 import eventMixin from "../event-handler/eventMixin";
+import exportItemColumnsDialog from "../container-data-table/exportItemColumns-dialog.vue";
 
 export default {
   name: "select-export-item-button-editor",
   mixins: [i18n, eventMixin],
+  components: {
+    exportItemColumnsDialog,
+  },
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -52,6 +95,9 @@ export default {
   data() {
     return {
       eventParams: [],
+      // 与数据表格属性面板同一套：脚本里可直接用 dataId / formCode
+      tableConfigParams: ["dataId", "formCode"],
+      showExportItemColumnsDialog: false,
     };
   },
   methods: {
@@ -71,4 +117,9 @@ export default {
 ::v-deep.export-divider .el-divider__text.is-center {
   width: 162px;
 }
+.export-item-columns-tip {
+  line-height: 18px;
+  color: #909399;
+  font-size: 12px;
+}
 </style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-defaultValue-editor.vue

@@ -1,42 +1,42 @@
-<template>
-  <el-form-item
-    :label="i18nt('designer.setting.defaultValue')"
-    class="form-item-label-top"
-  >
-    <relative-default-block
-      :option-model="optionModel"
-      widget-type="time"
-      @change="emitDefaultValueChange"
-    >
-      <el-time-picker
-        v-model="optionModel.defaultValue"
-        @change="emitDefaultValueChange"
-        :format="optionModel.format"
-        value-format="HH:mm:ss"
-        style="width: 100%"
-      >
-      </el-time-picker>
-    </relative-default-block>
-  </el-form-item>
-</template>
-
-<script>
-import i18n from "../../../../../../components/xform/utils/i18n";
-import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
-import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
-
-export default {
-  name: "time-defaultValue-editor",
-  mixins: [i18n, propertyMixin],
-  components: {
-    RelativeDefaultBlock,
-  },
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-};
-</script>
-
-<style scoped></style>
+<template>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="time"
+      @change="emitDefaultValueChange"
+    >
+      <el-time-picker
+        v-model="optionModel.defaultValue"
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        value-format="HH:mm:ss"
+        style="width: 100%"
+      >
+      </el-time-picker>
+    </relative-default-block>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
+
+export default {
+  name: "time-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-time-range/time-range-defaultValue-editor.vue

@@ -1,43 +1,43 @@
-<template>
-  <el-form-item
-    :label="i18nt('designer.setting.defaultValue')"
-    class="form-item-label-top"
-  >
-    <relative-default-block
-      :option-model="optionModel"
-      widget-type="time-range"
-      @change="emitDefaultValueChange"
-    >
-      <el-time-picker
-        v-model="optionModel.defaultValue"
-        is-range
-        @change="emitDefaultValueChange"
-        :format="optionModel.format"
-        value-format="HH:mm:ss"
-        style="width: 100%"
-      >
-      </el-time-picker>
-    </relative-default-block>
-  </el-form-item>
-</template>
-
-<script>
-import i18n from "../../../../../../components/xform/utils/i18n";
-import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
-import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
-
-export default {
-  name: "time-range-defaultValue-editor",
-  mixins: [i18n, propertyMixin],
-  components: {
-    RelativeDefaultBlock,
-  },
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-};
-</script>
-
-<style scoped></style>
+<template>
+  <el-form-item
+    :label="i18nt('designer.setting.defaultValue')"
+    class="form-item-label-top"
+  >
+    <relative-default-block
+      :option-model="optionModel"
+      widget-type="time-range"
+      @change="emitDefaultValueChange"
+    >
+      <el-time-picker
+        v-model="optionModel.defaultValue"
+        is-range
+        @change="emitDefaultValueChange"
+        :format="optionModel.format"
+        value-format="HH:mm:ss"
+        style="width: 100%"
+      >
+      </el-time-picker>
+    </relative-default-block>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+import RelativeDefaultBlock from "../../../../../../components/xform/form-designer/setting-panel/property-editor/relative-default-block";
+
+export default {
+  name: "time-range-defaultValue-editor",
+  mixins: [i18n, propertyMixin],
+  components: {
+    RelativeDefaultBlock,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>