cloud-web-corejs 1.0.54-dev.798 → 1.0.54-dev.799

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

@@ -1,237 +1,237 @@
-<template>
-  <div>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider">选择弹框配置</el-divider>
-    </el-form-item>
-    <!-- 搜索类控件的多选是结构性的（决定字段值是数组还是标量），由控件自身的「是否多选」决定，
-         这里只做展示，避免两个开关各说各话 -->
-    <el-form-item label="是否多选">
-      <el-switch v-model="eventConfig.multipleChoices" v-if="!vabsearchFlag"></el-switch>
-      <template v-else>
-        <span>{{ optionModel.multipleChoices ? '是' : '否' }}</span>
-        <span class="tips">由控件自身的「是否多选」决定</span>
-      </template>
-    </el-form-item>
-    <el-form-item label="弹框表单编码">
-      <el-input type="text" v-model="eventConfig.formCode"></el-input>
-    </el-form-item>
-    <el-form-item label="弹框查询参数">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option2)">
-        <span>{{ eventConfig.dialogQueryParam }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-      <span class="tips">按业务字段过滤写
-        <code>return {'{'} condition: {'{'} status: 1 {'}'} {'}'}</code>（追加进查询区条件，同字段以脚本为准）</span>
-    </el-form-item>
-    <el-form-item label="弹框自定义参数">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('dialogCustomParam', ['dataId', 'formCode','rows'], option3)">
-        <span>{{ eventConfig.dialogCustomParam }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-    <template v-if="hasConfig('vabsearchFlag')">
-      <el-form-item label="关联来源字段">
-        <el-input type="text" v-model="eventConfig.valueSourceField"></el-input>
-      </el-form-item>
-
-      <el-form-item label="展示来源字段">
-        <el-input type="text" v-model="eventConfig.labelSourceField"></el-input>
-      </el-form-item>
-    </template>
-    <!--      <el-form-item label="多选">
-          <el-switch v-model="optionModel.multiple"></el-switch>
-        </el-form-item>-->
-    <template v-if="!hasConfig('vabsearchFlag')">
-      <el-form-item label="关联表格">
-        <el-switch v-model="eventConfig.tableEnabled"></el-switch>
-      </el-form-item>
-      <template v-if="eventConfig.tableEnabled">
-        <el-form-item label="关联表格ID">
-          <el-input type="text" v-model="eventConfig.tableRef"></el-input>
-        </el-form-item>
-        <el-form-item label="关联表格唯一字段">
-          <el-input type="text" v-model="eventConfig.tableUniqueKey"></el-input>
-        </el-form-item>
-      </template>
-    </template>
-    <el-form-item label="数据回填">
-      <el-button type="primary" plain="" round="" @click="openDialog">{{
-          i18nt('designer.setting.editAction')
-        }}
-      </el-button>
-    </el-form-item>
-    <el-form-item label="确认回调">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option1)">
-        <span>{{ eventConfig.confirmCallback }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-
-    <el-dialog
-      custom-class="dialog-style list-dialog"
-      title="数据回填"
-      :visible.sync="showDialog"
-      :modal="false"
-      :show-close="!0"
-      :close-on-click-modal="!1"
-      :close-on-press-escape="!1"
-      :destroy-on-close="!0"
-      top="5vh"
-      width="600px"
-      v-dialog-drag
-    >
-      <div class="cont">
-        <el-table
-          ref="singleTable"
-          width="100%"
-          height="500"
-          :data="tableData"
-          border=""
-          stripe=""
-          default-expand-all
-        >
-          <el-table-column label="目标字段" width="150" prop="targetField">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.targetField"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="目标数据属性名称" width="150" prop="targetField">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.targetFormField"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="来源字段" width="150" prop="sourceField">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.sourceField"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" min-width="50" fixed="right">
-            <template #header="{ row, $index }">
-              <el-tooltip
-                :hide-after="500"
-                class="item"
-                effect="dark"
-                content="添加"
-                placement="top"
-              >
-                <el-button
-                  size="mini" type="" circle=""
-                  icon="el-icon-plus"
-                  @click="tableData.push({})"
-                />
-              </el-tooltip>
-            </template>
-            <template #default="{ row, $index }">
-              <el-tooltip
-                effect="dark"
-                content="删除"
-                placement="top"
-              >
-                <el-button
-                  size="mini" type="" circle=""
-                  icon="el-icon-delete"
-                  @click="tableData.splice($index,1)"
-                />
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="dialog-footer" slot="footer">
-        <span class="fl tips">注：'目标字段'与'目标数据属性名称'只需要维护一个即可。</span>
-        <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
-          {{ i18nt('designer.hint.cancel') }}
-        </el-button>
-        <el-button type="primary" @click="confirmDialog" class="button-sty" icon="el-icon-check">
-          {{ i18nt('designer.hint.confirm') }}
-        </el-button>
-      </div>
-    </el-dialog>
-  </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 propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
-
-export default {
-  mixins: [i18n, eventMixin, propertyMixin],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  data() {
-    return {
-      showDialog: false,
-      tableData: [],
-      option1: {
-        customCode: () => {
-          return this.eventConfig.confirmCallback;
-        },
-        callback: (code) => {
-          this.eventConfig.confirmCallback = code;
-          this.$forceUpdate()
-        }
-      },
-      option2: {
-        customCode: () => {
-          return this.eventConfig.dialogQueryParam;
-        },
-        callback: (code) => {
-          this.eventConfig.dialogQueryParam = code;
-          this.$forceUpdate()
-        }
-      },
-      option3: {
-        customCode: () => {
-          return this.eventConfig.dialogCustomParam;
-        },
-        callback: (code) => {
-          this.eventConfig.dialogCustomParam = code;
-          this.$forceUpdate()
-        }
-      },
-    }
-  },
-  computed: {
-    eventConfig() {
-      return this.optionModel.searchDialogConfig || {};
-    },
-    vabsearchFlag() {
-      let type = this.selectedWidget.type;
-      return (
-        type === "vabsearch"
-        || type === "singerSearch"
-        || type === "multiSearch"
-      );
-    }
-  },
-  created() {
-
-  },
-  methods: {
-    openDialog() {
-      this.tableData = this.$baseLodash.cloneDeep(this.eventConfig.tableData);
-      this.showDialog = true;
-    },
-    confirmDialog() {
-      this.eventConfig.tableData = this.$baseLodash.cloneDeep(this.tableData);
-      this.showDialog = false;
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tips {
-  margin-left: 8px;
-  color: #909399;
-  font-size: 12px;
-}
-</style>
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">选择弹框配置</el-divider>
+    </el-form-item>
+    <!-- 搜索类控件的多选是结构性的（决定字段值是数组还是标量），由控件自身的「是否多选」决定，
+         这里只做展示，避免两个开关各说各话 -->
+    <el-form-item label="是否多选">
+      <el-switch v-model="eventConfig.multipleChoices" v-if="!vabsearchFlag"></el-switch>
+      <template v-else>
+        <span>{{ optionModel.multipleChoices ? '是' : '否' }}</span>
+        <span class="tips">由控件自身的「是否多选」决定</span>
+      </template>
+    </el-form-item>
+    <el-form-item class="form-item-label-top" label="弹框表单编码">
+      <el-input type="text" v-model="eventConfig.formCode"></el-input>
+    </el-form-item>
+    <el-form-item label="弹框查询参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option2)">
+        <span>{{ eventConfig.dialogQueryParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+      <span class="tips">按业务字段过滤写
+        <code>return {'{'} condition: {'{'} status: 1 {'}'} {'}'}</code>（追加进查询区条件，同字段以脚本为准）</span>
+    </el-form-item>
+    <el-form-item label="弹框自定义参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('dialogCustomParam', ['dataId', 'formCode','rows'], option3)">
+        <span>{{ eventConfig.dialogCustomParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <template v-if="hasConfig('vabsearchFlag')">
+      <el-form-item class="form-item-label-top" label="关联来源字段">
+        <el-input type="text" v-model="eventConfig.valueSourceField"></el-input>
+      </el-form-item>
+
+      <el-form-item class="form-item-label-top" label="展示来源字段">
+        <el-input type="text" v-model="eventConfig.labelSourceField"></el-input>
+      </el-form-item>
+    </template>
+    <!--      <el-form-item label="多选">
+          <el-switch v-model="optionModel.multiple"></el-switch>
+        </el-form-item>-->
+    <template v-if="!hasConfig('vabsearchFlag')">
+      <el-form-item label="关联表格">
+        <el-switch v-model="eventConfig.tableEnabled"></el-switch>
+      </el-form-item>
+      <template v-if="eventConfig.tableEnabled">
+        <el-form-item class="form-item-label-top" label="关联表格ID">
+          <el-input type="text" v-model="eventConfig.tableRef"></el-input>
+        </el-form-item>
+        <el-form-item class="form-item-label-top" label="关联表格唯一字段">
+          <el-input type="text" v-model="eventConfig.tableUniqueKey"></el-input>
+        </el-form-item>
+      </template>
+    </template>
+    <el-form-item label="数据回填">
+      <el-button type="primary" plain="" round="" @click="openDialog">{{
+          i18nt('designer.setting.editAction')
+        }}
+      </el-button>
+    </el-form-item>
+    <el-form-item label="确认回调">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('confirmCallback', ['dataId', 'formCode','rows'], option1)">
+        <span>{{ eventConfig.confirmCallback }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+
+    <el-dialog
+      custom-class="dialog-style list-dialog"
+      title="数据回填"
+      :visible.sync="showDialog"
+      :modal="false"
+      :show-close="!0"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      top="5vh"
+      width="600px"
+      v-dialog-drag
+    >
+      <div class="cont">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          height="500"
+          :data="tableData"
+          border=""
+          stripe=""
+          default-expand-all
+        >
+          <el-table-column label="目标字段" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetField"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="目标数据属性名称" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetFormField"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="来源字段" width="150" prop="sourceField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.sourceField"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="50" fixed="right">
+            <template #header="{ row, $index }">
+              <el-tooltip
+                :hide-after="500"
+                class="item"
+                effect="dark"
+                content="添加"
+                placement="top"
+              >
+                <el-button
+                  size="mini" type="" circle=""
+                  icon="el-icon-plus"
+                  @click="tableData.push({})"
+                />
+              </el-tooltip>
+            </template>
+            <template #default="{ row, $index }">
+              <el-tooltip
+                effect="dark"
+                content="删除"
+                placement="top"
+              >
+                <el-button
+                  size="mini" type="" circle=""
+                  icon="el-icon-delete"
+                  @click="tableData.splice($index,1)"
+                />
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <span class="fl tips">注：'目标字段'与'目标数据属性名称'只需要维护一个即可。</span>
+        <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="confirmDialog" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </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 propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+
+export default {
+  mixins: [i18n, eventMixin, propertyMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      showDialog: false,
+      tableData: [],
+      option1: {
+        customCode: () => {
+          return this.eventConfig.confirmCallback;
+        },
+        callback: (code) => {
+          this.eventConfig.confirmCallback = code;
+          this.$forceUpdate()
+        }
+      },
+      option2: {
+        customCode: () => {
+          return this.eventConfig.dialogQueryParam;
+        },
+        callback: (code) => {
+          this.eventConfig.dialogQueryParam = code;
+          this.$forceUpdate()
+        }
+      },
+      option3: {
+        customCode: () => {
+          return this.eventConfig.dialogCustomParam;
+        },
+        callback: (code) => {
+          this.eventConfig.dialogCustomParam = code;
+          this.$forceUpdate()
+        }
+      },
+    }
+  },
+  computed: {
+    eventConfig() {
+      return this.optionModel.searchDialogConfig || {};
+    },
+    vabsearchFlag() {
+      let type = this.selectedWidget.type;
+      return (
+        type === "vabsearch"
+        || type === "singerSearch"
+        || type === "multiSearch"
+      );
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    openDialog() {
+      this.tableData = this.$baseLodash.cloneDeep(this.eventConfig.tableData);
+      this.showDialog = true;
+    },
+    confirmDialog() {
+      this.eventConfig.tableData = this.$baseLodash.cloneDeep(this.tableData);
+      this.showDialog = false;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.tips {
+  margin-left: 8px;
+  color: #909399;
+  font-size: 12px;
+}
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-common/keyName-editor.vue

@@ -1,67 +1,74 @@
-<template>
-  <div>
-    <el-form-item prop="keyName" v-if="optionModel.keyNameEnabled">
-      <span slot="label">数据属性名称
-        <el-tooltip effect="light" content="数据属性名称是指form-data对象中字段组件所对应的属性名称">
-          <i class="el-icon-info"></i></el-tooltip>
-      </span>
-      <el-input type="text" v-model="optionModel.keyName" :disabled="hasConfig('keyNameSuffix')"></el-input>
-    </el-form-item>
-    <el-form-item prop="keyName" label="属性名称前缀" v-if="optionModel.keyNameEnabled && hasConfig('keyNameSuffix')">
-      <span>{{ keyNamePrefixMap[selectedWidget.type] }}</span>
-    </el-form-item>
-    <el-form-item prop="keyName" label="属性名称后缀" v-if="optionModel.keyNameEnabled && hasConfig('keyNameSuffix')">
-      <el-input
-        class="search-input"
-        max="200"
-        v-model="optionModel.keyNameSuffix"
-        @change="changeKeyNameSuffix"
-      >
-        <el-tooltip slot="suffix" :enterable="false" effect="dark" content="随机生成" placement="top">
-          <i class="el-input__icon el-icon-refresh-right" @click="createRandomName"></i>
-        </el-tooltip>
-      </el-input>
-    </el-form-item>
-  </div>
-</template>
-
-<script>
-import i18n from "../../../../../../components/xform/utils/i18n"
-import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
-import {keyNamePrefixMap} from "../../../../../../components/xform/form-designer/widget-panel/widgetsConfig";
-
-export default {
-  name: "keyName-editor",
-  mixins: [i18n, propertyMixin],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  data() {
-    return {
-      keyNamePrefixMap
-    }
-  },
-  methods: {
-    changeKeyNameSuffix(val) {
-      this.optionModel.keyName = this.designer.createKeyName(this.selectedWidget.type, val);//生成属性名称
-    },
-    createRandomName() {
-      this.$baseConfirm('您确定要生成属性名称后缀吗？').then(() => {
-        this.optionModel.keyNameSuffix = this.designer.createKeyNameSuffix(this.selectedWidget.type);//生成后缀
-        this.changeKeyNameSuffix(this.optionModel.keyNameSuffix)
-        this.$message({
-          type: "success",
-          message: "success",
-          duration: 1000
-        })
-      });
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
+<template>
+  <div>
+    <el-form-item class="form-item-label-top" prop="keyName" v-if="optionModel.keyNameEnabled">
+      <span slot="label">数据属性名称
+        <el-tooltip effect="light" content="数据属性名称是指form-data对象中字段组件所对应的属性名称">
+          <i class="el-icon-info"></i></el-tooltip>
+      </span>
+      <el-input type="text" v-model="optionModel.keyName" :disabled="prefixMode"></el-input>
+    </el-form-item>
+    <el-form-item prop="keyName" label="属性名称前缀" v-if="optionModel.keyNameEnabled && prefixMode">
+      <span>{{ keyNamePrefixMap[selectedWidget.type] }}</span>
+    </el-form-item>
+    <el-form-item prop="keyName" label="属性名称后缀" v-if="optionModel.keyNameEnabled && prefixMode" class="form-item-label-top">
+      <el-input
+        class="search-input"
+        max="200"
+        v-model="optionModel.keyNameSuffix"
+        @change="changeKeyNameSuffix"
+      >
+        <el-tooltip slot="suffix" :enterable="false" effect="dark" content="随机生成" placement="top">
+          <i class="el-input__icon el-icon-refresh-right" @click="createRandomName"></i>
+        </el-tooltip>
+      </el-input>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n"
+import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin"
+import {keyNamePrefixMap} from "../../../../../../components/xform/form-designer/widget-panel/widgetsConfig";
+
+export default {
+  name: "keyName-editor",
+  mixins: [i18n, propertyMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      keyNamePrefixMap
+    }
+  },
+  computed: {
+    /* 附件字段默认按「前缀 + 随机后缀」生成 keyName，输入框锁死；
+       开了「值存为URL」后它是主表普通列，要让实施改成后端表字段名 */
+    prefixMode() {
+      return this.hasConfig('keyNameSuffix') && !this.optionModel.urlValueEnabled;
+    }
+  },
+  methods: {
+    changeKeyNameSuffix(val) {
+      this.optionModel.keyName = this.designer.createKeyName(this.selectedWidget.type, val, this.optionModel);//生成属性名称
+    },
+    createRandomName() {
+      this.$baseConfirm('您确定要生成属性名称后缀吗？').then(() => {
+        this.optionModel.keyNameSuffix = this.designer.createKeyNameSuffix(this.selectedWidget.type);//生成后缀
+        this.changeKeyNameSuffix(this.optionModel.keyNameSuffix)
+        this.$message({
+          type: "success",
+          message: "success",
+          duration: 1000
+        })
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-date/date-dateLimit-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form-item label="关联开始字段">
+    <el-form-item label="关联开始字段" class="form-item-label-top">
       <el-select
         v-if="dateFieldOptions.length"
         v-model="optionModel.limitStartField"
@@ -22,7 +22,7 @@
         clearable
       ></el-input>
     </el-form-item>
-    <el-form-item label="关联结束字段">
+    <el-form-item label="关联结束字段" class="form-item-label-top">
       <el-select
         v-if="dateFieldOptions.length"
         v-model="optionModel.limitEndField"
@@ -44,7 +44,7 @@
         clearable
       ></el-input>
     </el-form-item>
-    <el-form-item label="最小日期">
+    <el-form-item label="最小日期" class="form-item-label-top">
       <el-checkbox v-model="nowMinDate">当前日期</el-checkbox>
       <el-date-picker
         v-if="!nowMinDate"
@@ -57,7 +57,7 @@
         placeholder="留空则不限制"
       ></el-date-picker>
     </el-form-item>
-    <el-form-item label="最大日期">
+    <el-form-item label="最大日期" class="form-item-label-top">
       <el-date-picker
         v-model="optionModel.maxDate"
         :type="pickerType"