@steedos-labs/content-compliance 1.0.7 → 1.0.9

package/main/default/objects/pepsico_ch_tag_sync_log/pepsico_ch_tag_sync_log.object.yml

@@ -12,5 +12,5 @@ field_groups:
   - group_name: 通用
 icon: action_list_component
 is_enable: true
-label: Content Hub 标签同步明细
+label: CH 标签同步明细
 version: 2

package/main/default/objects/pepsico_ch_tag_sync_request/pepsico_ch_tag_sync_request.object.yml

@@ -12,5 +12,5 @@ field_groups:
   - group_name: 通用
 icon: action_list_component
 is_enable: true
-label: Content Hub 标签同步请求
+label: CH 标签同步请求
 version: 2

package/main/default/objects/pepsico_material_approval/fields/available_channels.field.yml

@@ -21,17 +21,38 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.available_channels) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "=", "223321001114944"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{ value }
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{ value }
           }
         }
       }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
           depth++;

package/main/default/objects/pepsico_material_approval/fields/ch_sync_enabled.field.yml

@@ -11,7 +11,7 @@ amis:
           componentId: 'u:ch_sync_manual'
           args:
             value: true
-description: 如需将素材推送至 Content Hub 请勾选，勾选后选择需要同步的素材组目录。
+description: 如需素材推送至 Content Hub 请勾选
 group: Content Hub同步与版权文件
 label: 素材需同步到 Content Hub
 required: false

package/main/default/objects/pepsico_material_approval/fields/classification.field.yml

@@ -22,18 +22,39 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.classification) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = {
         query: `
           query{
         picklists(filters: [["code", "=", "classification"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
         depth++;

package/main/default/objects/pepsico_material_approval/fields/content_rule.field.yml

@@ -18,17 +18,38 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.content_rule) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "=", "223321022150011"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{ value }
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{ value }
           }
         }
       }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
           depth++;

package/main/default/objects/pepsico_material_approval/fields/kol_classification.field.yml

@@ -20,18 +20,39 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.kol_classification) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = {
         query: `
           query{
         picklists(filters: [["code", "=", "kol_classification"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
         depth++;

package/main/default/objects/pepsico_material_approval/fields/material_editable.field.yml

@@ -1,5 +1,5 @@
 name: material_editable
-# 选项与素材授权规则(content_rule)相同, 动态读取 picklist 223321022150011 的启用选项
+# 选项与素材授权规则(content_rule)相同, 动态读取 picklist 223321022150011 的选项(停用的只在搜索框和当前值里显示)
 amis:
   id: 'u:material_editable'
   # 与「有无BGM」一样用按钮点选; 选项仍动态读取公共选项集的末级启用选项
@@ -10,18 +10,39 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.material_editable) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "=", "223321022150011"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{ value }
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{ value }
           }
         }
       }
       `}
     adaptor: |+
       // 只取末级选项作为按钮; 值沿用原树形下拉的节点路径(各级 value 用 - 连接), 存量单据和推送 Content Hub 不受影响
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       const options = [];
       let depth = 0;
       function walk(parentValue, path) {
@@ -42,7 +63,7 @@ amis:
               if (hasChildren) {
                   walk(item.value, itemPath);
               } else {
-                  options.push({ label: item.label, value: itemPath.join('-') });
+                  options.push({ label: item.label, value: itemPath.join('-'), disabled: item.disabled });
               }
           });
       }

package/main/default/objects/pepsico_material_approval/fields/material_type.field.yml

@@ -16,18 +16,39 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.material_type) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = {
           query: `
           query{
         picklists(filters: [["code", "=", "223321001114222"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
           depth++;

package/main/default/objects/pepsico_material_approval/fields/product.field.yml

@@ -23,13 +23,19 @@ amis:
       // 搜索框的数据上有 filterFormSearchableFields; 只认自身属性, 不认从列表页继承下来的
       const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
       const codes = isSearch ? ['223321001114213', '223321001114213-v3'] : [context && context.form_version === 'v3' ? '223321001114213-v3' : '223321001114213'];
-      api.url = api.url.split('?')[0] + '?product_picklist=' + (isSearch ? 'all' : codes[0]);
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 当前值放进 url, 缓存才会按单据区分
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.product) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?product_picklist=' + (isSearch ? 'all' : codes[0])
+        + '&tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "in", ${JSON.stringify(codes)}]]){
           code,
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
@@ -38,9 +44,23 @@ amis:
     adaptor: |+
       // 选项集还没建好时下拉为空, 不报错。两套一起列出时(搜索框), 新选项集的顶级品牌标「[新]」
       const picklists = (payload.data && payload.data.picklists) || [];
-      const pOptions = _.flatMap(picklists, (picklist) => picklists.length > 1 && picklist.code === '223321001114213-v3'
+      const allOptions = _.flatMap(picklists, (picklist) => picklists.length > 1 && picklist.code === '223321001114213-v3'
         ? _.map(picklist.options, (op) => op.parent == null ? { ...op, label: '[新] ' + op.label } : op)
         : picklist.options);
+      // 停用的选项: 搜索框全部列出并标「已停用」, 用来筛选历史单据(原选项集冻结后旧品牌都停用了也要能搜);
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
         depth++;

package/main/default/objects/pepsico_material_approval/fields/social_media.field.yml

@@ -16,17 +16,38 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.social_media) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "=", "social_media"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
         depth++;

package/main/default/objects/space_users/fields/agency_contract_expiry_date.field.yml

@@ -1,9 +1,9 @@
 name: agency_contract_expiry_date
 amis:
   id: 'u:agency_contract_expiry_date'
-group: 系统信息
+group: 个人信息
 label: Agency合同截止日期
 required: false
-sort_no: 1710
+sort_no: 10000
 type: date
-visible_on: '{{global.user.is_space_admin}}'
+visible_on: '{{global.user.is_space_admin === true && formData.is_collaborator === true}}'

package/main/default/objects/space_users/fields/agency_pepsico_contact.field.yml

@@ -2,13 +2,13 @@ name: agency_pepsico_contact
 amis:
   id: 'u:agency_pepsico_contact'
 filters: []
-group: 系统信息
+group: 个人信息
 is_wide: false
 label: Agency百事内部对接人
 multiple: false
 reference_to: space_users
 reference_to_field: user
 required: false
-sort_no: 1720
+sort_no: 10010
 type: lookup
-visible_on: '{{global.user.is_space_admin}}'
+visible_on: '{{global.user.is_space_admin === true && formData.is_collaborator === true}}'

package/main/default/objects/space_users/fields/avatar.field.yml

@@ -7,4 +7,4 @@ inlineHelpText: ''
 label: 头像
 sort_no: 99998
 type: avatar
-is_wide: false
+is_wide: true

package/main/default/objects/space_users/fields/created.field.yml

@@ -7,6 +7,6 @@ index: true
 inlineHelpText: ''
 label: 创建时间
 readonly: true
-sort_no: 1750
+sort_no: 1151
 sortable: true
 type: datetime

package/main/default/objects/space_users/fields/email_notification.field.yml

@@ -6,6 +6,6 @@ enable_thousands: true
 group: 个人信息
 inlineHelpText: ''
 label: 接收邮件通知
-sort_no: 9999
+sort_no: 845
 is_wide: false
 type: boolean

package/main/default/objects/space_users/fields/is_collaborator.field.yml

@@ -6,5 +6,6 @@ enable_thousands: true
 group: 个人信息
 inlineHelpText: ''
 label: 是否协作者
-sort_no: 845
+sort_no: 999
 type: boolean
+is_wide: true

package/main/default/objects/space_users/fields/last_logon.field.yml

@@ -5,11 +5,11 @@ description: ''
 enable_thousands: true
 group: 系统信息
 inlineHelpText: ''
-label: 最近登陆
+label: 最近登录
 sort_no: 1700
 type: date
-visible_on: '{{global.user.is_space_admin}}'
+visible_on: '{{global.user.is_space_admin === true && global.mode === "read"}}'
 hidden: false
 omit: false
 static: true
-is_wide: false
+is_wide: false

package/main/default/objects/space_users/fields/login_expired.field.yml

@@ -9,7 +9,7 @@ hidden: false
 inlineHelpText: ''
 label: 超90天未登录
 omit: false
-sort_no: 1151
+sort_no: 1900
 type: boolean
-visible_on: '{{global.user.is_space_admin}}'
-static: true
+visible_on: '{{global.user.is_space_admin === true && global.mode === "read"}}'
+static: true

package/main/default/objects/space_users/fields/modified.field.yml

@@ -7,6 +7,6 @@ index: true
 inlineHelpText: ''
 label: 修改时间
 readonly: true
-sort_no: 1900
+sort_no: 1750
 sortable: true
 type: datetime

package/main/default/objects/space_users/fields/modified_by.field.yml

@@ -8,5 +8,5 @@ inlineHelpText: ''
 label: 修改人
 readonly: true
 reference_to: users
-sort_no: 1850
+sort_no: 1705
 type: lookup

package/main/default/objects/space_users/fields/password_expired.field.yml

@@ -9,7 +9,7 @@ hidden: false
 inlineHelpText: ''
 label: 密码已过期
 omit: false
-sort_no: 1705
+sort_no: 1850
 is_wide: false
 type: boolean
 visible_on: '{{global.user.is_space_admin}}'

package/main/default/tabs/object_pepesio_ch.tab.yml

@@ -1,7 +1,7 @@
 name: object_pepesio_ch
 desktop: true
 icon: account
-label: Content hub素材推送
+label: CH 素材推送
 mobile: true
 object: pepesio_ch__c
 permissions: []

package/main/default/tabs/object_pepsico_ch_material_group_rule.tab.yml

@@ -1,7 +1,7 @@
 name: object_pepsico_ch_material_group_rule
 desktop: true
 icon: hierarchy
-label: Content Hub 素材组查询规则
+label: CH 素材组查询规则
 mobile: false
 object: pepsico_ch_material_group_rule
 permissions: []

package/main/default/tabs/object_pepsico_ch_sync_rule.tab.yml

@@ -1,7 +1,7 @@
 name: object_pepsico_ch_sync_rule
 desktop: true
 icon: approval
-label: Content Hub 同步规则
+label: CH 同步规则
 mobile: false
 object: pepsico_ch_sync_rule
 permissions: []

package/main/default/tabs/object_pepsico_ch_tag_sync_log.tab.yml

@@ -1,7 +1,7 @@
 name: object_pepsico_ch_tag_sync_log
 desktop: true
 icon: action_list_component
-label: Content Hub 标签同步明细
+label: CH 标签同步明细
 mobile: false
 object: pepsico_ch_tag_sync_log
 permissions: []

package/main/default/tabs/object_pepsico_ch_tag_sync_request.tab.yml

@@ -1,7 +1,7 @@
 name: object_pepsico_ch_tag_sync_request
 desktop: true
 icon: action_list_component
-label: Content Hub 标签同步请求
+label: CH 标签同步请求
 mobile: false
 object: pepsico_ch_tag_sync_request
 permissions: []

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos-labs/content-compliance",
-    "version": "1.0.7",
+    "version": "1.0.9",
     "description": "内容审核系统改造：content hub&登录页增加申请表&跳过中止操作支持上传证明文件表单改造",
     "main": "package.service.js",
     "scripts": {

package/public/content-review/amis.css

@@ -701,3 +701,30 @@ tbody .color-priority-postponed *{
 .antd-Modal .pepsico-pls-files-field {
     border-bottom: 0 !important;
 }
+
+/* 文件上传字段的说明文字: amis 文件上传控件自己渲染说明, 字号用的是 14px,
+   比其它字段的说明(12px)大。统一成表单说明文字的字号和行高。 */
+.antd-FileControl-description {
+    font-size: var(--Form-description-fontSize);
+    line-height: var(--Form-description-lineHeight);
+}
+
+/* 表单字段的 placeholder 统一为 12px, 与字段说明文字一致。
+   输入框类用 ::placeholder; 下拉、树形下拉、日期、选人等控件的 placeholder 是单独的元素。
+   加 .amis-scope 前缀, 优先级不低于 amis 自带的 placeholder 样式。 */
+.amis-scope .antd-Form-item input::placeholder,
+.amis-scope .antd-Form-item textarea::placeholder,
+.amis-scope .antd-Form-item .antd-Select-placeholder,
+.amis-scope .antd-Form-item .antd-ResultBox-placeholder,
+.amis-scope .antd-Form-item .antd-Picker-placeholder,
+.amis-scope .antd-Form-item .antd-DatePicker-placeholder,
+.amis-scope .antd-Form-item .antd-DateRangePicker-placeholder,
+.amis-scope .antd-Form-item .antd-TextControl-placeholder {
+    font-size: var(--Form-description-fontSize);
+}
+
+/* 按钮点选字段(有无BGM、有无文字、是否可以进行素材编辑等)的选项文字统一为 12px,
+   与文件上传按钮「文件上传」的文字一致; amis 按钮默认是 14px。 */
+.amis-scope .antd-Form-item .antd-ButtonGroup .antd-Button {
+    font-size: var(--fontSizeSm);
+}