vue2-client 1.6.63-single → 1.7.1

package/.env

@@ -1,15 +1,15 @@
-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_API_BASE_URL=http://123.60.214.109:8405
+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_API_BASE_URL=http://123.60.214.109:8405

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.7.1 -2023-08-23 @江超**
+- 合并单页面修改
+
+**1.7.0 -2023-08-09 @江超**
+- 接入琉璃配置中心
+
 **1.6.62 - 1.6.63 -2023-08-09 @江超**
 - 修复查询配置编辑界面对自定义数据源的显示问题
 

package/Components.md

@@ -0,0 +1,60 @@
+# vue2基础组件库组件介绍
+
+## XAddForm
+
+基于XAddNativeForm二次封装的动态表单的Modal形式
+
+[使用文档](src/base-client/components/common/XAddForm/index.md)
+
+## XAddNativeForm
+
+通过JSON配置动态生成的数据保存表单
+
+[使用文档](src/base-client/components/common/XAddNativeForm/index.md)
+
+## XBadge
+
+对antdv的badge组件进行重封装
+
+[使用文档](src/base-client/components/common/XBadge/index.md)
+
+## XCard
+
+通用数据加载状态管理容器
+
+提供一个可以根据数据加载状态显示不同内容的通用容器
+当loadState为loading时，显示骨架屏（加载界面）
+当loadState为success时，显示容器内容
+当loadState为error时，显示点击重新加载数据的提示界面
+
+[使用文档](src/base-client/components/common/XCard/index.md)
+
+## XForm
+
+通过JSON配置动态生成的数据筛选查询表单
+
+[使用文档](src/base-client/components/common/XForm/index.md)
+
+## XTable
+
+通过JSON配置动态生成的数据表格
+
+[使用文档](src/base-client/components/common/XTable/index.md)
+
+## XFormCol
+
+适用于动态表单的可以自适应各种分辨率设备的栅格组件封装
+
+[使用文档](src/base-client/components/common/XFormCol/index.md)
+
+## XFormTable
+
+对XAddForm，XForm和XTable组件的二次封装，实现通过JSON配置动态生成一个完整的实体操作页面
+
+[使用文档](src/base-client/components/common/XFormTable/index.md)
+
+## XImportExcel
+
+通用的导入excel组件
+
+[使用文档](src/base-client/components/common/XImportExcel/index.md)

package/index.js

@@ -1,30 +1,39 @@
-import Vue from 'vue'
-import { initRouter } from '@vue2-client/router'
-import { initI18n } from '@vue2-client/utils/i18n'
-import bootstrap from '@vue2-client/bootstrap'
-import { modules } from '@vue2-client/store'
-import '@vue2-client/theme/index.less'
-import '@vue2-client/utils/filter'
-import 'animate.css/source/animate.css'
-import 'moment/locale/zh-cn'
-import Antd from 'ant-design-vue'
-import Viser from 'viser-vue'
-// 插件
-import Plugins from '@vue2-client/base-client/plugins'
-
-const routerOptions = initRouter()
-const i18n = initI18n('CN', 'US')
-
-Vue.use(Antd)
-Vue.use(Viser)
-Vue.use(Plugins)
-Vue.config.productionTip = false
-const message = Vue.prototype.$message
-
-export {
-  routerOptions,
-  modules,
-  i18n,
-  message,
-  bootstrap
-}
+import Vue from 'vue'
+import { initRouter } from '@vue2-client/router'
+import { initI18n } from '@vue2-client/utils/i18n'
+import bootstrap from '@vue2-client/bootstrap'
+import { modules } from '@vue2-client/store'
+import '@vue2-client/theme/index.less'
+import '@vue2-client/utils/filter'
+import 'animate.css/source/animate.css'
+import 'moment/locale/zh-cn'
+import Antd from 'ant-design-vue'
+import Viser from 'viser-vue'
+// 插件
+import Plugins from '@vue2-client/base-client/plugins'
+import VueCustomElement from 'vue-custom-element'
+
+// 引入组件
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm'
+
+const routerOptions = initRouter()
+const i18n = initI18n('CN', 'US')
+
+Vue.use(Antd)
+Vue.use(Viser)
+Vue.use(Plugins)
+Vue.use(VueCustomElement)
+
+// 把组件注册成web-component
+Vue.customElement('x-add-native-form', XAddNativeForm)
+
+Vue.config.productionTip = false
+const message = Vue.prototype.$message
+
+export {
+  routerOptions,
+  modules,
+  i18n,
+  message,
+  bootstrap
+}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "vue2-client",
-  "version": "1.6.63-single",
+  "version": "1.7.1",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
     "build:preview": "vue-cli-service build --mode preview",
@@ -56,6 +56,7 @@
     "babel-polyfill": "^6.26.0",
     "compression-webpack-plugin": "^4.0.1",
     "deepmerge": "^4.3.1",
+    "document-register-element": "^1.14.10",
     "eslint": "^6.8.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
@@ -67,6 +68,7 @@
     "script-loader": "^0.7.2",
     "style-resources-loader": "^1.5.0",
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-custom-element": "^3.3.0",
     "vue-template-compiler": "2.6.14",
     "vuepress": "^1.9.9",
     "webpack": "^4.46.0",

package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue

@@ -196,7 +196,7 @@ export default {
       if (value !== '') {
         const logicName = this.attr.keyName
         const logic = logicName.substring(6)
-        post('/api/af-system/logic/' + logic, value).then(res => {
+        post('/api/system/logic/' + logic, value).then(res => {
           callback(res)
         })
       }