cloud-web-corejs 1.0.46-dev.2 → 1.0.46

package/src/views/user/home/index.vue

@@ -11,7 +11,6 @@
 </template>
 
 <script>
-import corejsConfig from "@/corejsConfig";
 
 export default {
   name: 'home',
@@ -65,23 +64,22 @@ export default {
           let menus = res.objx || [];
           let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
           let menuUrl = homeMenu?.url;
-
-          let str1 = "@base/views";
-          let str2 = "@/views";
-          let url = null;
+          let defaultUrl = '/user/home/default';
           if (menuUrl) {
-            url = menuUrl + '.vue';
-          } else {
-            let homeConfig = corejsConfig.homeConfig || {}
-            url = homeConfig.url ? homeConfig.url : '/user/home/default.vue'
-          }
-          if (url.startsWith(str1)) {
-            let a = url.slice(str1.length);
-            this.homeContent = require('@base/views' + url.slice(str1.length)).default;
-          } else if (url.startsWith(str2)) {
-            this.homeContent = require('@/views' + url.slice(str2.length)).default;
+            let url = menuUrl + '.vue';
+            let str1 = "@base/views";
+            let str2 = "@/views";
+            if (url.startsWith(str1)) {
+              let a = url.slice(str1.length);
+              this.homeContent = require('@base/views' + url.slice(str1.length)).default;
+            } else if (url.startsWith(str2)) {
+              this.homeContent = require('@/views' + url.slice(str2.length)).default;
+            } else {
+              this.homeContent = require('@/views' + url).default;
+            }
           } else {
-            this.homeContent = require('@/views' + url).default;
+            let url = defaultUrl + '.vue';
+            this.homeContent = require('@base/views' + url).default;
           }
 
           this.showHomeContent = true;

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

@@ -1,146 +0,0 @@
-<template>
-  <div>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top">显隐规则设置</el-divider>
-    </el-form-item>
-    <el-form-item :label="i18nt('启用显隐规则')">
-      <el-switch v-model="optionModel.showRuleEnabled"></el-switch>
-    </el-form-item>
-    <el-form-item :label="i18nt('显隐规则')">
-      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
-        <span>{{ optionModel.showRules && optionModel.showRules.length ? "已维护" : "" }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top"></el-divider>
-    </el-form-item>
-    <el-dialog
-      v-if="dialogVisible"
-      custom-class="dialog-style list-dialog"
-      :title="i18nt('显隐规则')"
-      :visible.sync="dialogVisible"
-      :show-close="!0"
-      :append-to-body="false"
-      :modal="false"
-      :close-on-click-modal="!1"
-      :close-on-press-escape="!1"
-      :destroy-on-close="!0"
-      width="1220px"
-      top="5vh"
-      v-dialog-drag
-    >
-      <div class="cont">
-        <el-table
-          ref="singleTable"
-          width="100%"
-          :data="tableData"
-          height="500"
-          border=""
-          row-key="columnId"
-          stripe=""
-        >
-          <el-table-column type="index" width="35" fixed="left"></el-table-column>
-          <el-table-column :label="i18nt('匹配规则')" width="250" prop="label">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.ruleType">
-                <el-option :value="1" label="用户"></el-option>
-                <el-option :value="2" label="机构"></el-option>
-                <el-option :value="3" label="角色"></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column :label="i18nt('值')" width="300" prop="prop">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.value"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column :label="i18nt('是否可见')" width="150" prop="prop">
-            <template slot-scope="scope">
-              <el-switch v-model="scope.row.show"></el-switch>
-            </template>
-          </el-table-column>
-          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
-            <template #header>
-              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
-              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
-                         icon="el-icon-plus" @click="addItem"></el-button>
-            </template>
-            <template slot-scope="scope">
-              <el-button
-                :title="i18nt('designer.setting.deleteTableColumn')"
-                size="mini"
-                type=""
-                circle=""
-                icon="el-icon-minus"
-                @click="tableData.splice(scope.$index,1)"
-              ></el-button>
-            </template>
-          </el-table-column>
-
-        </el-table>
-      </div>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
-          {{ i18nt('designer.hint.cancel') }}
-        </el-button>
-        <el-button type="primary" @click="colSubmit" 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"
-
-export default {
-  name: "showRuleFlag-editor",
-  mixins: [i18n],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  inject: ["getReportTemplate"],
-  data() {
-    return {
-      dialogVisible: false,
-      tableData: [],
-      wfDefItems: [],
-      wfNodeMap: {}
-    }
-  },
-  computed: {
-    current_prefix() {
-      let reportTemplate = this.getReportTemplate();
-      return "/" + reportTemplate.serviceName;
-    }
-  },
-  methods: {
-    openDialog() {
-      let reportTemplate = this.getReportTemplate();
-      let showRules = this.optionModel.showRules || [];
-      this.dialogVisible = true;
-      this.tableData = this.$baseLodash.cloneDeep(showRules)
-    },
-
-    addItem() {
-      this.tableData.push({
-        ruleType: 1,
-        value: null,
-        show: true
-      });
-    },
-    colSubmit() {
-      this.dialogVisible = !1;
-      this.optionModel.showRules = this.tableData;
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

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

@@ -1,62 +0,0 @@
-<template>
-  <div>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top">文本显示设置</el-divider>
-    </el-form-item>
-    <el-form-item :label="i18nt('全部显示为*')">
-      <el-switch v-model="optionModel.textRule1" @change="changeTextRule1"></el-switch>
-    </el-form-item>
-    <el-form-item :label="i18nt('前面明文，其他为*')">
-      <el-switch v-model="optionModel.textRule2" @change="changeTextRule2"></el-switch>
-    </el-form-item>
-    <el-form-item :label="i18nt('前面明文位数')">
-      <base-input-number v-model="optionModel.textRule2Number" :scale="0"></base-input-number>
-    </el-form-item>
-    <el-form-item :label="i18nt('后面明文，其他为*')">
-      <el-switch v-model="optionModel.textRule3" @change="changeTextRule3"></el-switch>
-    </el-form-item>
-    <el-form-item :label="i18nt('后面明文位数')">
-      <base-input-number v-model="optionModel.textRule3Number" :scale="0"></base-input-number>
-    </el-form-item>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top"></el-divider>
-    </el-form-item>
-  </div>
-</template>
-
-<script>
-import i18n from "../../../../../components/xform/utils/i18n"
-
-export default {
-  name: "textFlag-editor",
-  mixins: [i18n],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-  data() {
-    return {
-
-    }
-  },
-  methods: {
-    changeTextRule1(val) {
-      this.optionModel.textRule2 = false;
-      this.optionModel.textRule3 = false;
-      this.optionModel.textRule2Number = null;
-      this.optionModel.textRule3Number = null;
-    },
-    changeTextRule2(val) {
-      this.optionModel.textRule1 = false;
-    },
-    changeTextRule3(val) {
-      this.optionModel.textRule1 = false;
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>