vue2-client 1.9.12 → 1.9.14

package/.env.revenue

@@ -0,0 +1,19 @@
+VUE_APP_PUBLIC_PATH=/
+VUE_APP_NAME=Admin
+VUE_APP_ROUTES_KEY=admin.routes
+VUE_APP_PERMISSIONS_KEY=admin.permissions
+VUE_APP_ROLES_KEY=admin.roles
+VUE_APP_USER_KEY=admin.user
+VUE_APP_LOGIN_KEY=admin.login
+VUE_APP_SETTING_KEY=admin.setting
+VUE_APP_TBAS_KEY=admin.tabs
+VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
+VUE_APP_DICTIONARY_KEY=admin.dictionary
+VUE_APP_BADGE_KEY=admin.badge
+VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
+VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
+VUE_APP_WEB_CONFIG_KEY=admin.webconfig
+VUE_APP_API_BASE_URL=http://123.60.214.109:8405
+VUE_APP_SYSTEM_NAME=af-revenue
+VUE_APP_LOGIN_VERSION=V4
+

package/docs/Logic/345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -22,11 +22,11 @@
   * entity.delete(实体名称 string,id Object)
   * entity.getById(表名 string, 主键值 Object) -> 根据主键查询数据  返回找到的 JSONObject
 - CommonTools 常用工具类
-  * CommonTools.getUUID() 获取一个UUID 字符串
-  * CommonTools.add(Obejct,Object) 加法运算
-  * CommonTools.sub(Obejct,Object) 减法运算
-  * CommonTools.mul(Obejct,Object) 乘法运算
-  * CommonTools.div(Obejct,Object) 除法运算
+  * commonTools.getUUID() 获取一个UUID 字符串
+  * commonTools.add(Obejct,Object) 加法运算
+  * commonTools.sub(Obejct,Object) 减法运算
+  * commonTools.mul(Obejct,Object) 乘法运算
+  * commonTools.div(Obejct,Object) 除法运算
 - redis，用于操作redis
   * redis.set(redis键, 值) -> 往redis存入数据
   * redis.get(redis键) -> 从redis获取数据

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "vue2-client",
-  "version": "1.9.12",
+  "version": "1.9.14",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
     "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
     "mac-serve": "vue-cli-service serve --no-eslint --mode mac",
     "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
@@ -19,7 +20,7 @@
     "@antv/g2plot": "^2.4.31",
     "@hufe921/canvas-editor": "^0.9.49",
     "@vue/babel-preset-jsx": "^1.4.0",
-    "@wchbrad/vue-easy-tree": "^1.0.12",
+    "@afwenming123/vue-easy-tree": "^1.0.1",
     "animate.css": "^4.1.1",
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
@@ -43,8 +44,6 @@
     "lodash.get": "^4.4.2",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
-    "node-sass": "^9.0.0",
-    "sass-loader": "^16.0.1",
     "qs": "^6.11.2",
     "regenerator-runtime": "^0.14.0",
     "videojs-contrib-hls": "^5.15.0",

package/src/base-client/components/common/XForm/XTreeSelect.vue

@@ -151,9 +151,9 @@ export default {
             treeDatas[name] = values
           }
           // 移除默认的表单项，将组织好后的表单项合并进表单
-          // this.form[this.model] = undefined
-          // Object.assign(this.form, treeDatas)
-          this.$emit('onChange', treeDatas)
+          this.form[this.model] = undefined
+          Object.assign(this.form, treeDatas)
+          // this.$emit('onChange', treeDatas)
         } else {
           // 从单一数据源组成的树可以直接赋值
           // this.form[this.model] = value

package/src/base-client/components/common/XFormTable/demo.vue

@@ -3,6 +3,7 @@
     <x-form-table
       title="示例表单查询"
       :queryParamsName="queryParamsName"
+      :x-tree-config-name="xTreeConfigName"
       :fixedAddForm="fixedAddForm"
       service-name="af-revenue"
       @action="action"
@@ -34,8 +35,10 @@ export default {
   },
   data () {
     return {
-      // 查询配置名称
-      queryParamsName: 'UserFilesListCRUD',
+      // 查询配置文件名
+      queryParamsName: 'address_management',
+      // 查询配置左侧tree
+      xTreeConfigName: 'addressType',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -85,11 +85,10 @@
 </template>
 
 <script>
-// https://github.com/wchbrad/vue-easy-tree
-// https://github.com/wchbrad/vue-easy-tree/blob/main/README.zh-CN.md
-import VueEasyTree from '@wchbrad/vue-easy-tree'
+// https://github.com/Junior125306/vue-easy-tree
+import VueEasyTree from '@afwenming123/vue-easy-tree'
 // 样式文件，可以根据需要自定义样式或主题
-import '@wchbrad/vue-easy-tree/src/assets/index.scss'
+import '@afwenming123/vue-easy-tree/src/assets/index.min.css'
 import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
 import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'

package/src/router/async/router.map.js

@@ -83,8 +83,8 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示