vue2-client 1.12.99 → 1.12.100

package/src/logic/plugins/common/VueTools.js

@@ -1,30 +1,30 @@
-/**
- * Vue工具类
- */
-export default class VueTools {
-  static instance = new VueTools()
-
-  constructor () {
-    if (VueTools.instance) {
-      return VueTools.instance
-    }
-    VueTools.instance = this
-  }
-
-  static getInstance () {
-    if (!VueTools.instance) {
-      VueTools.instance = new VueTools()
-    }
-    return VueTools.instance
-  }
-
-  /**
-   * 获取组件实例
-   * @param vueRef vue实例
-   * @param componentName 组件实例名（refName）
-   * @returns {VueComponent}
-   */
-  getComponent (vueRef, componentName) {
-    return vueRef.$refs[componentName]
-  }
-}
+/**
+ * Vue工具类
+ */
+export default class VueTools {
+  static instance = new VueTools()
+
+  constructor () {
+    if (VueTools.instance) {
+      return VueTools.instance
+    }
+    VueTools.instance = this
+  }
+
+  static getInstance () {
+    if (!VueTools.instance) {
+      VueTools.instance = new VueTools()
+    }
+    return VueTools.instance
+  }
+
+  /**
+   * 获取组件实例
+   * @param vueRef vue实例
+   * @param componentName 组件实例名（refName）
+   * @returns {VueComponent}
+   */
+  getComponent (vueRef, componentName) {
+    return vueRef.$refs[componentName]
+  }
+}

package/src/logic/ts/LogicRunner.ts

@@ -1,67 +1,67 @@
-import JSONObject from "../../expression/instances/JSONObject";
-import ServiceException from "../../expression/exception/ServiceException";
-import LogicConsole from "../../expression/instances/LogicConsole";
-import ExpressionRunner from "../../expression/ExpressionRunner";
-import { indexedDB } from '../../utils/indexedDB'
-
-export default class LogicRunner {
-
-  private static logicConsoleInstance: LogicConsole = new LogicConsole();
-
-  /**
-   * 是否存在指定名称的Logic资源
-   *
-   * @param logicName Logic名称
-   * @return 是否存在
-   */
-  public static has(logicName: string): boolean {
-    return LogicRunner.getLogic(logicName, false, (result: any) => {
-      return result != null;
-    });
-  }
-
-  /**
-   * 执行Logic
-   *
-   * @param logicName      Logic名称
-   * @param param          参数
-   * @return 执行结果
-   */
-  public static run(logicName: string, param: JSONObject | Object) : any {
-    // 获取Logic资源
-    const source = LogicRunner.getLogic(logicName, false, (result: any) => {
-      return result;
-    });
-    if (source == null) {
-      throw new ServiceException("Logic资源" + logicName + "未找到", 400)
-    }
-    LogicRunner.logicConsoleInstance.info("执行Logic[{}]，params: {}", logicName, param)
-    // 附加用户注册的对象到业务逻辑中
-    const plugins = new JSONObject();
-    plugins.put("data", param);
-    plugins.put("log", LogicRunner.logicConsoleInstance);
-    plugins.put("logic", LogicRunner.prototype);
-    return LogicRunner.runExpression(source, plugins);
-  }
-
-  /**
-   * 执行原生表达式
-   *
-   * @param source 表达式内容
-   * @param params 参数
-   * @return 执行结果
-   */
-  private static runExpression(source: string, params: JSONObject) : any {
-    return ExpressionRunner.run(source, params)
-  }
-
-  private static getLogic(logicName: string, isDev: boolean, callback: Function) : any {
-    let apiPre = '/api/'
-    if (isDev) {
-      apiPre = '/devApi/'
-    }
-    const serviceName = process.env.VUE_APP_SYSTEM_NAME
-    const getConfigUrl = apiPre + serviceName + '/logic/openapi/getLiuliConfiguration'
-    indexedDB.getByWeb(logicName, getConfigUrl, {configName: logicName}, callback)
-  }
-}
+import JSONObject from "../../expression/instances/JSONObject";
+import ServiceException from "../../expression/exception/ServiceException";
+import LogicConsole from "../../expression/instances/LogicConsole";
+import ExpressionRunner from "../../expression/ExpressionRunner";
+import { indexedDB } from '../../utils/indexedDB'
+
+export default class LogicRunner {
+
+  private static logicConsoleInstance: LogicConsole = new LogicConsole();
+
+  /**
+   * 是否存在指定名称的Logic资源
+   *
+   * @param logicName Logic名称
+   * @return 是否存在
+   */
+  public static has(logicName: string): boolean {
+    return LogicRunner.getLogic(logicName, false, (result: any) => {
+      return result != null;
+    });
+  }
+
+  /**
+   * 执行Logic
+   *
+   * @param logicName      Logic名称
+   * @param param          参数
+   * @return 执行结果
+   */
+  public static run(logicName: string, param: JSONObject | Object) : any {
+    // 获取Logic资源
+    const source = LogicRunner.getLogic(logicName, false, (result: any) => {
+      return result;
+    });
+    if (source == null) {
+      throw new ServiceException("Logic资源" + logicName + "未找到", 400)
+    }
+    LogicRunner.logicConsoleInstance.info("执行Logic[{}]，params: {}", logicName, param)
+    // 附加用户注册的对象到业务逻辑中
+    const plugins = new JSONObject();
+    plugins.put("data", param);
+    plugins.put("log", LogicRunner.logicConsoleInstance);
+    plugins.put("logic", LogicRunner.prototype);
+    return LogicRunner.runExpression(source, plugins);
+  }
+
+  /**
+   * 执行原生表达式
+   *
+   * @param source 表达式内容
+   * @param params 参数
+   * @return 执行结果
+   */
+  private static runExpression(source: string, params: JSONObject) : any {
+    return ExpressionRunner.run(source, params)
+  }
+
+  private static getLogic(logicName: string, isDev: boolean, callback: Function) : any {
+    let apiPre = '/api/'
+    if (isDev) {
+      apiPre = '/devApi/'
+    }
+    const serviceName = process.env.VUE_APP_SYSTEM_NAME
+    const getConfigUrl = apiPre + serviceName + '/logic/openapi/getLiuliConfiguration'
+    indexedDB.getByWeb(logicName, getConfigUrl, {configName: logicName}, callback)
+  }
+}

package/src/logic/ts/TestLogic.ts

@@ -1,13 +1,13 @@
-import LogicRunner from './LogicRunner'
-
-testLogicCall()
-
-/**
- * testLogicCall
- */
-function testLogicCall () {
-  const result = LogicRunner.run('testVueLogic', {
-    test: '1'
-  })
-  console.info(result)
-}
+import LogicRunner from './LogicRunner'
+
+testLogicCall()
+
+/**
+ * testLogicCall
+ */
+function testLogicCall () {
+  const result = LogicRunner.run('testVueLogic', {
+    test: '1'
+  })
+  console.info(result)
+}

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -1,50 +1,50 @@
-<template>
-  <div>
-    <a-list v-show="!loading" size="small" :data-source="data">
-      <a-list-item slot="renderItem" slot-scope="item">
-        <div>
-          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
-          <p>{{ item.date }}</p>
-        </div>
-        <a class="delete_item">
-          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
-        </a>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'FavoriteList',
-  data () {
-    return {
-      data: [],
-      loading: false
-    }
-  },
-  mounted () {
-    this.loadData()
-  },
-  methods: {
-    loadData () {
-      indexedDB.getAll((data) => {
-        const realData = data.filter(item => item.data && item.data.uuid)
-          .map(item => item.data)
-        this.data = realData
-      })
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-.delete_item {
-  margin-left: 8px;
-  color: #333;
-}
-p {
-  margin: 0
-}
-</style>
+<template>
+  <div>
+    <a-list v-show="!loading" size="small" :data-source="data">
+      <a-list-item slot="renderItem" slot-scope="item">
+        <div>
+          <p><a @click="$emit('openFavorites', item.uuid)">{{ item.question }} </a></p>
+          <p>{{ item.date }}</p>
+        </div>
+        <a class="delete_item">
+          <a-icon type="close" @click="$emit('saveToFavorites', item.uuid)"/>
+        </a>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'FavoriteList',
+  data () {
+    return {
+      data: [],
+      loading: false
+    }
+  },
+  mounted () {
+    this.loadData()
+  },
+  methods: {
+    loadData () {
+      indexedDB.getAll((data) => {
+        const realData = data.filter(item => item.data && item.data.uuid)
+          .map(item => item.data)
+        this.data = realData
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.delete_item {
+  margin-left: 8px;
+  color: #333;
+}
+p {
+  margin: 0
+}
+</style>

package/src/pages/userInfoDetailManage/uploadFilesHistory/index.vue

@@ -1,130 +1,130 @@
-<template>
-  <div>
-    <div class="filter-bar">
-      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
-      <a-select
-        style="width: 200px;"
-        v-model="fusetype"
-        :options="fusetypes"
-        placeholder="分类"
-        @change="selfSearch"
-        allow-clear />
-      <a-button type="primary" @click="selfSearch">查询</a-button>
-    </div>
-    <a-list bordered>
-      <a-list-item v-for="item in files" :key="item.days">
-        <div class="file-group">
-          <h4>{{ item.days }}</h4>
-          <div class="file-items">
-            <div v-for="file in item.arrays" :key="file.id" class="file-card">
-              <img :src="file.f_downloadpath" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" />
-              <p>上传时间: {{ file.f_uploaddate }}</p>
-              <p>操作员: {{ file.f_username }}</p>
-              <p>分类: {{ file.fusetype }}</p>
-              <p>说明: {{ file.fremarks }}</p>
-              <a :href="file.f_downloadpath" target="_blank">预览</a>
-              <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
-            </div>
-          </div>
-        </div>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-export default {
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  data () {
-    return {
-      upload_date: null,
-      fusetype: null,
-      files: [],
-      fusetypes: [],
-      isDelete: '0'
-    }
-  },
-  methods: {
-    async getfusetypes () {
-      this.fusetypes = [{ label: '全部', value: '' }]
-      const res = await post('/api/af-revenue/sql/singleTable_OrderBy', {
-        data: {
-          items: 'fusetype',
-          tablename: 't_files',
-          condition: `fusetype is not null GROUP BY fusetype`,
-          orderitem: 'fusetype'
-        }
-      })
-      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
-      console.log('123456', this.fusetypes)
-    },
-    async getFiles () {
-      console.log('999', this.currUserInfo)
-      if (!this.currUserInfo) return
-      this.files = []
-      let condition = `CONVERT(varchar(200),f_blobid) = '${this.currUserInfo.f_userinfo_id}'`
-      if (this.upload_date) {
-        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
-      }
-      if (this.fusetype) {
-        condition += ` and fusetype = '${this.fusetype}'`
-      }
-      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
-      console.log('7777', res)
-      console.log('7777', res.days)
-      this.files = res.days.map(day => ({
-        days: day.uploadday,
-        arrays: res.array.filter(file => file.uploadday === day.uploadday)
-      }))
-    },
-    async delet (fileId) {
-      await this.$resetdelete('rs/entity/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
-      this.getFiles()
-    },
-    selfSearch () {
-      this.getFiles()
-    }
-  },
-  mounted () {
-    if (this.$login.r.includes('上传附件删除')) {
-      this.isDelete = '1'
-    }
-    this.getFiles()
-    this.getfusetypes()
-  }
-}
-</script>
-
-<style scoped>
-.filter-bar {
-  display: flex;
-  gap: 10px;
-  margin-bottom: 15px;
-}
-.file-group {
-  margin-bottom: 15px;
-}
-.file-items {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-}
-.file-card {
-  border: 1px solid #ddd;
-  padding: 10px;
-  border-radius: 5px;
-  width: 200px;
-}
-.file-image {
-  width: 100%; /* 让图片填充整个容器 */
-  height: 150px; /* 调整高度 */
-  object-fit: cover; /* 保持图片比例，填充整个区域 */
-  border-radius: 5px; /* 圆角边框 */
-}
-</style>
+<template>
+  <div>
+    <div class="filter-bar">
+      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
+      <a-select
+        style="width: 200px;"
+        v-model="fusetype"
+        :options="fusetypes"
+        placeholder="分类"
+        @change="selfSearch"
+        allow-clear />
+      <a-button type="primary" @click="selfSearch">查询</a-button>
+    </div>
+    <a-list bordered>
+      <a-list-item v-for="item in files" :key="item.days">
+        <div class="file-group">
+          <h4>{{ item.days }}</h4>
+          <div class="file-items">
+            <div v-for="file in item.arrays" :key="file.id" class="file-card">
+              <img :src="file.f_downloadpath" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" />
+              <p>上传时间: {{ file.f_uploaddate }}</p>
+              <p>操作员: {{ file.f_username }}</p>
+              <p>分类: {{ file.fusetype }}</p>
+              <p>说明: {{ file.fremarks }}</p>
+              <a :href="file.f_downloadpath" target="_blank">预览</a>
+              <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
+            </div>
+          </div>
+        </div>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+export default {
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  data () {
+    return {
+      upload_date: null,
+      fusetype: null,
+      files: [],
+      fusetypes: [],
+      isDelete: '0'
+    }
+  },
+  methods: {
+    async getfusetypes () {
+      this.fusetypes = [{ label: '全部', value: '' }]
+      const res = await post('/api/af-revenue/sql/singleTable_OrderBy', {
+        data: {
+          items: 'fusetype',
+          tablename: 't_files',
+          condition: `fusetype is not null GROUP BY fusetype`,
+          orderitem: 'fusetype'
+        }
+      })
+      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
+      console.log('123456', this.fusetypes)
+    },
+    async getFiles () {
+      console.log('999', this.currUserInfo)
+      if (!this.currUserInfo) return
+      this.files = []
+      let condition = `CONVERT(varchar(200),f_blobid) = '${this.currUserInfo.f_userinfo_id}'`
+      if (this.upload_date) {
+        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
+      }
+      if (this.fusetype) {
+        condition += ` and fusetype = '${this.fusetype}'`
+      }
+      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
+      console.log('7777', res)
+      console.log('7777', res.days)
+      this.files = res.days.map(day => ({
+        days: day.uploadday,
+        arrays: res.array.filter(file => file.uploadday === day.uploadday)
+      }))
+    },
+    async delet (fileId) {
+      await this.$resetdelete('rs/entity/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
+      this.getFiles()
+    },
+    selfSearch () {
+      this.getFiles()
+    }
+  },
+  mounted () {
+    if (this.$login.r.includes('上传附件删除')) {
+      this.isDelete = '1'
+    }
+    this.getFiles()
+    this.getfusetypes()
+  }
+}
+</script>
+
+<style scoped>
+.filter-bar {
+  display: flex;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+.file-group {
+  margin-bottom: 15px;
+}
+.file-items {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.file-card {
+  border: 1px solid #ddd;
+  padding: 10px;
+  border-radius: 5px;
+  width: 200px;
+}
+.file-image {
+  width: 100%; /* 让图片填充整个容器 */
+  height: 150px; /* 调整高度 */
+  object-fit: cover; /* 保持图片比例，填充整个区域 */
+  border-radius: 5px; /* 圆角边框 */
+}
+</style>

package/src/services/api/entity.js

@@ -1,18 +1,18 @@
-import { post } from '@vue2-client/services/api/restTools'
-
-const entityApi = {
-  // 根据ID查询数据
-  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
-  },
-  // 根据ID集合查询所有数据
-  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
-  },
-  // 查询实体的总数量
-  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
-  }
-}
-
-export { entityApi }
+import { post } from '@vue2-client/services/api/restTools'
+
+const entityApi = {
+  // 根据ID查询数据
+  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
+  },
+  // 根据ID集合查询所有数据
+  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
+  },
+  // 查询实体的总数量
+  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
+  }
+}
+
+export { entityApi }